From 083651acef5aa2caf93521374582432acedc7957 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 28 Nov 2020 10:50:51 -0800 Subject: [PATCH] Update more config property names (#1786) --- .../javaconcurrent/AbstractExecutorInstrumentation.java | 2 +- .../javaagent/instrumentation/hystrix/HystrixTracer.java | 2 +- .../src/test/groovy/HystrixObservableChainTest.groovy | 2 +- .../src/test/groovy/HystrixObservableTest.groovy | 2 +- .../hystrix-1.4/src/test/groovy/HystrixTest.groovy | 2 +- .../kafkaclients/KafkaClientConfiguration.java | 2 +- .../src/test/groovy/KafkaClientTest.groovy | 8 ++++---- .../opentelemetry/javaagent/tooling/TracerInstaller.java | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/instrumentation/executors/src/main/java/io/opentelemetry/javaagent/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java b/instrumentation/executors/src/main/java/io/opentelemetry/javaagent/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java index e2473db2d684..f60b34344ad1 100644 --- a/instrumentation/executors/src/main/java/io/opentelemetry/javaagent/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java +++ b/instrumentation/executors/src/main/java/io/opentelemetry/javaagent/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java @@ -29,7 +29,7 @@ public abstract class AbstractExecutorInstrumentation implements TypeInstrumenta "otel.instrumentation.executors.include"; private static final String EXECUTORS_INCLUDE_ALL_PROPERTY_NAME = - "otel.instrumentation.executors.includeAll"; + "otel.instrumentation.executors.include-all"; // hopefully these configuration properties can be static after // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/1345 diff --git a/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java b/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java index 2dbab0a92245..2fee162dccc4 100644 --- a/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java +++ b/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java @@ -20,7 +20,7 @@ public static HystrixTracer tracer() { private final boolean extraTags; private HystrixTracer() { - extraTags = Config.get().getBooleanProperty("otel.hystrix.tags.enabled", false); + extraTags = Config.get().getBooleanProperty("otel.instrumentation.hystrix.tags", false); } @Override diff --git a/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy b/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy index e3878c968fdf..18e38d44bf1d 100644 --- a/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy +++ b/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy @@ -22,7 +22,7 @@ class HystrixObservableChainTest extends AgentTestRunner { } static final PREVIOUS_CONFIG = ConfigUtils.updateConfig { - it.setProperty("otel.hystrix.tags.enabled", "true") + it.setProperty("otel.instrumentation.hystrix.tags", "true") } def cleanupSpec() { diff --git a/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy b/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy index 773191ba7846..2c784ccb8864 100644 --- a/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy +++ b/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy @@ -26,7 +26,7 @@ class HystrixObservableTest extends AgentTestRunner { } static final PREVIOUS_CONFIG = ConfigUtils.updateConfig { - it.setProperty("otel.hystrix.tags.enabled", "true") + it.setProperty("otel.instrumentation.hystrix.tags", "true") } def cleanupSpec() { diff --git a/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy b/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy index a1bea00efc66..3e050937a6c0 100644 --- a/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy +++ b/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy @@ -24,7 +24,7 @@ class HystrixTest extends AgentTestRunner { } static final PREVIOUS_CONFIG = ConfigUtils.updateConfig { - it.setProperty("otel.hystrix.tags.enabled", "true") + it.setProperty("otel.instrumentation.hystrix.tags", "true") } def cleanupSpec() { diff --git a/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientConfiguration.java b/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientConfiguration.java index 317e13cc07dd..24f0c7b4c5b4 100644 --- a/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientConfiguration.java +++ b/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientConfiguration.java @@ -10,7 +10,7 @@ public final class KafkaClientConfiguration { public static boolean isPropagationEnabled() { - return Config.get().getBooleanProperty("otel.kafka.client.propagation.enabled", true); + return Config.get().getBooleanProperty("otel.instrumentation.kafka.client-propagation", true); } private KafkaClientConfiguration() {} diff --git a/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy b/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy index bacae96da5e7..36629e6436ff 100644 --- a/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy +++ b/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ +import static io.opentelemetry.api.trace.Span.Kind.CONSUMER +import static io.opentelemetry.api.trace.Span.Kind.PRODUCER import static io.opentelemetry.instrumentation.test.utils.ConfigUtils.setConfig import static io.opentelemetry.instrumentation.test.utils.ConfigUtils.updateConfig import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace -import static io.opentelemetry.api.trace.Span.Kind.CONSUMER -import static io.opentelemetry.api.trace.Span.Kind.PRODUCER +import io.opentelemetry.api.trace.attributes.SemanticAttributes import io.opentelemetry.instrumentation.api.config.Config import io.opentelemetry.instrumentation.test.AgentTestRunner -import io.opentelemetry.api.trace.attributes.SemanticAttributes import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.TimeUnit import org.apache.kafka.clients.consumer.ConsumerConfig @@ -613,7 +613,7 @@ class KafkaClientTest extends AgentTestRunner { private static Config setPropagation(boolean propagationEnabled) { return updateConfig { - it.setProperty("otel.kafka.client.propagation.enabled", Boolean.toString(propagationEnabled)) + it.setProperty("otel.instrumentation.kafka.client-propagation", Boolean.toString(propagationEnabled)) } } } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java index e988875b8f3d..5a0bd5f66e84 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java @@ -33,8 +33,8 @@ public class TracerInstaller { private static final Logger log = LoggerFactory.getLogger(TracerInstaller.class); private static final String EXPORTER_JAR_CONFIG = "otel.exporter.jar"; - private static final String EXPORTERS_CONFIG = "otel.exporter"; - private static final String PROPAGATORS_CONFIG = "otel.propagators"; + private static final String EXPORTERS_CONFIG = "otel.exporter"; // this name is from spec + private static final String PROPAGATORS_CONFIG = "otel.propagators"; // this name is from spec private static final String JAVAAGENT_ENABLED_CONFIG = "otel.javaagent.enabled"; private static final List DEFAULT_EXPORTERS = Collections.singletonList("otlp");