open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Trace Search + Analytics integration config key

This commit is contained in:
Tyler Benson 2019-03-14 10:23:52 -07:00
parent e5d9507636
commit 192eb894a4
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/BaseDecorator.java
View File

@ -29,9 +29,7 @@ public abstract class BaseDecorator {
new TreeSet<>(Arrays.asList(instrumentationNames)), traceAnalyticsDefault()); new TreeSet<>(Arrays.asList(instrumentationNames)), traceAnalyticsDefault());
float rate = 1.0f; float rate = 1.0f;
for (final String name : instrumentationNames) { for (final String name : instrumentationNames) {
rate = rate = Config.getFloatSettingFromEnvironment(name + ".analytics.sample-rate", rate);
Config.getFloatSettingFromEnvironment(
"integration." + name + ".analytics.sample-rate", rate);
} }
traceAnalyticsSampleRate = rate; traceAnalyticsSampleRate = rate;
} }

4
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/BaseDecoratorTest.groovy
View File

@ -164,8 +164,8 @@ class BaseDecoratorTest extends Specification {
def "test analytics rate enabled"() { def "test analytics rate enabled"() {
when: when:
BaseDecorator dec = withSystemProperty("dd.integration.${integName}.analytics.enabled", "true") { BaseDecorator dec = withSystemProperty("dd.${integName}.analytics.enabled", "true") {
withSystemProperty("dd.integration.${integName}.analytics.sample-rate", "$sampleRate") { withSystemProperty("dd.${integName}.analytics.sample-rate", "$sampleRate") {
newDecorator(enabled) newDecorator(enabled)
} }
} }

3
dd-trace-api/src/main/java/datadog/trace/api/Config.java
View File

@ -284,8 +284,7 @@ public class Config {
boolean anyEnabled = defaultEnabled; boolean anyEnabled = defaultEnabled;
for (final String name : integrationNames) { for (final String name : integrationNames) {
final boolean configEnabled = final boolean configEnabled =
getBooleanSettingFromEnvironment( getBooleanSettingFromEnvironment(name + ".analytics.enabled", defaultEnabled);
"integration." + name + ".analytics.enabled", defaultEnabled);
if (defaultEnabled) { if (defaultEnabled) {
anyEnabled &= configEnabled; anyEnabled &= configEnabled;
} else { } else {

12
dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View File

@ -347,13 +347,13 @@ class ConfigTest extends Specification {
def "verify integration trace analytics config"() { def "verify integration trace analytics config"() {
setup: setup:
environmentVariables.set("DD_INTEGRATION_ORDER_ANALYTICS_ENABLED", "false") environmentVariables.set("DD_ORDER_ANALYTICS_ENABLED", "false")
environmentVariables.set("DD_INTEGRATION_TEST_ENV_ANALYTICS_ENABLED", "true") environmentVariables.set("DD_TEST_ENV_ANALYTICS_ENABLED", "true")
environmentVariables.set("DD_INTEGRATION_DISABLED_ENV_ANALYTICS_ENABLED", "false") environmentVariables.set("DD_DISABLED_ENV_ANALYTICS_ENABLED", "false")
System.setProperty("dd.integration.order.analytics.enabled", "true") System.setProperty("dd.order.analytics.enabled", "true")
System.setProperty("dd.integration.test-prop.analytics.enabled", "true") System.setProperty("dd.test-prop.analytics.enabled", "true")
System.setProperty("dd.integration.disabled-prop.analytics.enabled", "false") System.setProperty("dd.disabled-prop.analytics.enabled", "false")
expect: expect:
Config.traceAnalyticsIntegrationEnabled(integrationNames, defaultEnabled) == expected Config.traceAnalyticsIntegrationEnabled(integrationNames, defaultEnabled) == expected