Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lps 197325 glowroot plugin trace level configuration #5681

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Lps 197325 glowroot plugin trace level configuration #5681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3e8c35f
LPS-197325 glowroot proxy and freemarker plugin
fabian-bouche-liferay Sep 26, 2023
f5e348e
LPS-197325 Fix deps
sammonsjl Sep 28, 2023
6e9a97a
LPS-197325 Include in build
sammonsjl Sep 28, 2023
8dfcc39
LPS-197325 Simplify permission check
sammonsjl Sep 28, 2023
bfea844
LPS-197325 Cleanup
sammonsjl Sep 28, 2023
d46a19f
LPS-197325 Refactor
sammonsjl Sep 28, 2023
729ee26
LPS-197325 SF
sammonsjl Sep 28, 2023
355de2f
LPS-197325 Configure Glowroot contextPath
sammonsjl Sep 28, 2023
99ec3fb
LPS-197325 SF
shuyangzhou Sep 28, 2023
c5d9e02
LPS-197325 Use StringUtil.equalsIgnoreCase()
shuyangzhou Sep 28, 2023
33427fd
LPS-197325 SF
brianchandotcom Sep 29, 2023
e4246d3
LPS-197325 Rename
brianchandotcom Sep 29, 2023
995a9c6
LPS-197325 Wordsmith
brianchandotcom Sep 29, 2023
fe96b50
Merge pull request #1 from brianchandotcom/pull-request-141521-LPS-19…
fabian-bouche-liferay Oct 2, 2023
3156a6a
LPS-197325 glowroot plugin trace level configuration
fabian-bouche-liferay Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
LPS-197325 Rename
  • Loading branch information
@brianchandotcom
brianchandotcom committed Sep 29, 2023
commit e4246d3537c679a237ffed659665dbc428b3728f
12 changes: 9 additions & 3 deletions ...ugin-freemarker/src/main/java/com/liferay/glowroot/plugin/freemarker/TemplatesAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ public static TraceEntry onBefore(
sb.append(siteGroupId);
sb.append("]");

if (TemplatesPluginProperties.captureAsOuterTransaction()) {
if (TemplatesPluginProperties.
captureTemplateTransformationsInOuterTransaction()) {

optionalThreadContext.setTransactionOuter();

if (TemplatesPluginProperties.
Expand Down Expand Up @@ -135,7 +137,9 @@ public static TraceEntry onBefore(
sb.append(siteGroupId);
sb.append("]");

if (TemplatesPluginProperties.captureAsOuterTransaction()) {
if (TemplatesPluginProperties.
captureTemplateTransformationsInOuterTransaction()) {

optionalThreadContext.setTransactionOuter();

if (TemplatesPluginProperties.
Expand Down Expand Up @@ -209,7 +213,9 @@ public static TraceEntry onBefore(
sb.append(siteGroupId);
sb.append("]");

if (TemplatesPluginProperties.captureAsOuterTransaction()) {
if (TemplatesPluginProperties.
captureTemplateTransformationsInOuterTransaction()) {

optionalThreadContext.setTransactionOuter();

if (TemplatesPluginProperties.
Expand Down
18 changes: 9 additions & 9 deletions ...arker/src/main/java/com/liferay/glowroot/plugin/freemarker/TemplatesPluginProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
*/
public class TemplatesPluginProperties {

public static boolean captureAsOuterTransaction() {
return _captureAsOuterTransaction;
}

public static boolean captureTemplateScriptInTransaction() {
return _captureTemplateScriptInTransaction;
}

private static boolean _captureAsOuterTransaction;
public static boolean captureTemplateTransformationsInOuterTransaction() {
return _captureTemplateTransformationsInOuterTransaction;
}

private static boolean _captureTemplateScriptInTransaction;
private static boolean _captureTemplateTransformationsInOuterTransaction;
private static final ConfigService _configService = Agent.getConfigService(
"liferay-templates-plugin");

Expand All @@ -36,10 +36,10 @@ public void onChange() {
}

private void _recalculateProperties() {
_captureAsOuterTransaction = _configService.getBooleanProperty(
"captureAsOuterTransaction"
).value();

_captureTemplateTransformationsInOuterTransaction =
_configService.getBooleanProperty(
"captureTemplateTransformationsInOuterTransaction"
).value();
_captureTemplateScriptInTransaction =
_configService.getBooleanProperty(
"captureTemplateScriptInTransaction"
Expand Down
10 changes: 5 additions & 5 deletions ...apps/glowroot/glowroot-plugin-freemarker/src/main/resources/META-INF/glowroot.plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"name": "Liferay Templates Plugin",
"properties": [
{
"checkboxLabel": "Capture Template transformations as an outer transaction",
"label": "Capture Template transformations as an outer transaction",
"name": "captureAsOuterTransaction",
"checkboxLabel": "Capture template transformations in outer transaction",
"label": "Capture template transformations in outer transaction",
"name": "captureTemplateTransformationsInOuterTransaction",
"type": "boolean"
},
{
"checkboxLabel": "Capture Template script when captured as an outer transaction",
"label": "Capture Template script when captured as an outer transaction",
"checkboxLabel": "Capture template script in transaction",
"label": "Capture template script in transaction",
"name": "captureTemplateScriptInTransaction",
"type": "boolean"
}
Expand Down