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

NR-57169 - Enable CLM by default #1037

Merged
merged 3 commits into from
Oct 17, 2022
Merged

NR-57169 - Enable CLM by default #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52848c9
NR-57169 - Enable CLM on default
meiao Oct 14, 2022
3204df2
Disabling CLM for existing tests.
meiao Oct 14, 2022
3941b4f
Fixing TransactionTest
meiao Oct 14, 2022
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
2 changes: 1 addition & 1 deletion newrelic-agent/src/main/java/com/newrelic/agent/config/CodeLevelMetricsConfigImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class CodeLevelMetricsConfigImpl extends BaseConfig implements CodeLevelMetricsConfig {
public static final String SYSTEM_PROPERTY_ROOT = "newrelic.config." + AgentConfigImpl.CODE_LEVEL_METRICS + ".";

public static final boolean DEFAULT_ENABLED = false;
public static final boolean DEFAULT_ENABLED = true;
public static final String ENABLED = "enabled";

private final boolean clmEnabled;
Expand Down
2 changes: 1 addition & 1 deletion newrelic-agent/src/main/resources/newrelic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ common: &default_settings

# When true the agent will capture namespace and function information
# on spans to enable code level metrics in CodeStream.
enabled: false
enabled: true

# Proxy settings for connecting to the New Relic server:
# If a proxy is used, the host setting is required. Other settings
Expand Down
25 changes: 16 additions & 9 deletions newrelic-agent/src/test/java/com/newrelic/agent/config/CodeLevelMetricsConfigImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,30 @@ public void setup() {
}

@Test
public void disabledByDefault() {
public void enabledByDefault() {
CodeLevelMetricsConfigImpl config = new CodeLevelMetricsConfigImpl(localProps);
assertFalse(config.isEnabled());
assertTrue(config.isEnabled());
}

@Test
public void enabled() {
localProps.put("code_level_metrics.enabled", true);
localProps.put("enabled", true);
CodeLevelMetricsConfigImpl config = new CodeLevelMetricsConfigImpl(localProps);
assertTrue(config.isEnabled());
}

@Test
public void disabled() {
localProps.put("enabled", false);
CodeLevelMetricsConfigImpl config = new CodeLevelMetricsConfigImpl(localProps);
assertFalse(config.isEnabled());
}

@Test
public void canConfigureViaSystemProperty() {
Properties properties = new Properties();
//default CLM is false
properties.put("newrelic.config.code_level_metrics.enabled", "true");
//default CLM is true
properties.put("newrelic.config.code_level_metrics.enabled", "false");

SystemPropertyFactory.setSystemPropertyProvider(new SystemPropertyProvider(
new SaveSystemPropertyProviderRule.TestSystemProps(properties),
Expand All @@ -51,22 +58,22 @@ public void canConfigureViaSystemProperty() {
));

CodeLevelMetricsConfigImpl config = new CodeLevelMetricsConfigImpl(Collections.emptyMap());
assertTrue(config.isEnabled());
assertFalse(config.isEnabled());

}

@Test
public void canConfigureViaEnvironmentVariables() {

//default CLM is false
//default CLM is true
SystemPropertyFactory.setSystemPropertyProvider(new SystemPropertyProvider(
new SaveSystemPropertyProviderRule.TestSystemProps(), //use default configs except for CLM
new SaveSystemPropertyProviderRule.TestEnvironmentFacade(Collections.singletonMap("NEW_RELIC_CODE_LEVEL_METRICS_ENABLED", "true"))
new SaveSystemPropertyProviderRule.TestEnvironmentFacade(Collections.singletonMap("NEW_RELIC_CODE_LEVEL_METRICS_ENABLED", "false"))
));

CodeLevelMetricsConfigImpl config = new CodeLevelMetricsConfigImpl(Collections.emptyMap());

assertTrue(config.isEnabled());
assertFalse(config.isEnabled());

}
}
3 changes: 3 additions & 0 deletions newrelic-agent/src/test/java/com/newrelic/agent/metrics/JsonTraceSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public static JsonTraceSegment createTraceSegment(JSONArray segmentArray, String
}
seg.className = (String) segmentArray.get(5);
seg.methodName = (String) segmentArray.get(6);

seg.requestParams.put("code.namespace", seg.className);
seg.requestParams.put("code.function", seg.methodName);
return seg;
}

Expand Down
2 changes: 2 additions & 0 deletions newrelic-agent/src/test/resources/com/newrelic/agent/config/span_events.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ common: &default_settings
- !exception_handler [ "test/newrelic/test/agent/ExceptionHandlerTest$ExceptionHandler", "handleSpecialException", "(Ljava/lang/RuntimeException;Ljava/lang/String;)V" ]
- test/newrelic/test/agent/ExceptionHandlerTest$ExceptionHandler.handleException2(Ljava/lang/String;Ljava/lang/Throwable;)V

code_level_metrics:
enabled: false
class_transformer:
includes: com/newrelic/.*Test, java.util.TreeMap, javax/activation/MimeType, com/newrelic/.*Object, java/awt/Shape, java/awt/geom/Line2D*, java/awt/geom/Path2D*, com/sun/grizzly/tcp/Request, com/sun/grizzly/util/http/Cookies, org/objectweb/asm/ClassWriter
excludes: org/junit/.*
Expand Down