Update more config property names
MODIFY
instrumentation/executors/src/main/java/io/opentelemetry/javaagent/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java
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

MODIFY
instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java
instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java
@@ -20,7 +20,7 @@ public class HystrixTracer extends BaseTracer {
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

MODIFY
instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy
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() {

MODIFY
instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy
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() {

MODIFY
instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
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() {

MODIFY
instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientConfiguration.java
instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientConfiguration.java
@@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.api.config.Config;
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() {}

MODIFY
instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
* 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))
}
}
}

MODIFY
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java
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<String> DEFAULT_EXPORTERS = Collections.singletonList("otlp");

Update more config property names (#1786)