diff --git a/.github/scripts/check-javaagent-suppression-keys.sh b/.github/scripts/check-javaagent-suppression-keys.sh index 5dce5f2dbdfa..84fd7a6c3344 100755 --- a/.github/scripts/check-javaagent-suppression-keys.sh +++ b/.github/scripts/check-javaagent-suppression-keys.sh @@ -10,8 +10,8 @@ for file in $(find instrumentation -name "*Module.java"); do continue fi - module_name=$(echo "$file" | sed 's#.*/\([^/]*\)/javaagent/src/.*#\1#') - simple_module_name=$(echo "$module_name" | sed 's/-[0-9.]*$//') + module_name=$(echo "$file" | sed 's#.*/\([^/]*\)/javaagent/src/.*#\1#' | tr '-' '_') + simple_module_name=$(echo "$module_name" | sed 's/_[0-9.]*$//') if [[ "$simple_module_name" == *jaxrs* ]]; then # TODO these need some work still @@ -25,17 +25,17 @@ for file in $(find instrumentation -name "*Module.java"); do # TODO split jdbc-datasource out into separate instrumentation? continue fi - if [[ "$simple_module_name" == kafka-clients ]]; then + if [[ "$simple_module_name" == kafka_clients ]]; then # TODO split kafka client metrics out into separate instrumentation? continue fi - if [[ "$simple_module_name" == quarkus-resteasy-reactive ]]; then + if [[ "$simple_module_name" == quarkus_resteasy_reactive ]]; then # TODO module is missing a base version continue fi - if [[ "$simple_module_name" == spring-cloud-gateway-webmvc ]]; then + if [[ "$simple_module_name" == spring_cloud_gateway_webmvc ]]; then # webmvc variant uses spring-cloud-gateway as base name - simple_module_name="spring-cloud-gateway" + simple_module_name="spring_cloud_gateway" fi if [ "$module_name" == "$simple_module_name" ]; then diff --git a/declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java b/declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java index 778704a02f03..10cefde0462b 100644 --- a/declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java +++ b/declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java @@ -30,12 +30,6 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties private static final String GENERAL_PEER_SERVICE_MAPPING = "general.peer.service_mapping"; - private static final String AGENT_INSTRUMENTATION_MODE = "java.agent.instrumentation_mode"; - private static final String SPRING_STARTER_INSTRUMENTATION_MODE = - "java.spring_starter.instrumentation_mode"; - private static final String COMMON_DEFAULT_ENABLED = - "otel.instrumentation.common.default-enabled"; - private static final Map SPECIAL_MAPPINGS; static { @@ -115,17 +109,6 @@ private ConfigPropertiesBackedDeclarativeConfigProperties( @Nullable @Override public String getString(String name) { - String fullPath = pathWithName(name); - - if (fullPath.equals(AGENT_INSTRUMENTATION_MODE) - || fullPath.equals(SPRING_STARTER_INSTRUMENTATION_MODE)) { - Boolean value = configProperties.getBoolean(COMMON_DEFAULT_ENABLED); - if (value != null) { - return value ? "default" : "none"; - } - return null; - } - return configProperties.getString(resolvePropertyKey(name)); } @@ -243,9 +226,10 @@ private String resolvePropertyKey(String name) { String translated = translatedPath.toString(); - // Handle agent prefix: java.agent.* → otel.javaagent.* - if (translated.startsWith("agent.")) { - return "otel.java" + translated; + // Handle agent prefix: java.javaagent.* → otel.javaagent.* + // is only called from OpenTelemetryInstaller + if (translated.startsWith("javaagent.")) { + return "otel." + translated; } // Standard mapping diff --git a/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java b/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java index 18c3a907fa27..7dd615d05512 100644 --- a/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java +++ b/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java @@ -77,9 +77,11 @@ void testTranslateName_withExperimentalInMiddle() { @Test void testAgentPrefix() { - DeclarativeConfigProperties config = createConfig("otel.javaagent.experimental.indy", "true"); + DeclarativeConfigProperties config = createConfig("otel.javaagent.experimental.foo", "true"); - assertThat(config.getStructured("java").getStructured("agent").getBoolean("indy/development")) + // only called from OpenTelemetryInstaller + assertThat( + config.getStructured("java").getStructured("javaagent").getBoolean("foo/development")) .isNotNull() .isTrue(); } @@ -238,61 +240,6 @@ void testWithoutJavaPrefix_doesNotMatch() { .isNull(); } - @Test - void testAgentInstrumentationMode_getString_booleanTrue() { - DeclarativeConfigProperties config = - createConfig("otel.instrumentation.common.default-enabled", "true"); - - assertThat( - config.getStructured("java").getStructured("agent").getString("instrumentation_mode")) - .isEqualTo("default"); - } - - @Test - void testAgentInstrumentationMode_getString_booleanFalse() { - DeclarativeConfigProperties config = - createConfig("otel.instrumentation.common.default-enabled", "false"); - - assertThat( - config.getStructured("java").getStructured("agent").getString("instrumentation_mode")) - .isEqualTo("none"); - } - - @Test - void testSpringStarterInstrumentationMode_getString_booleanTrue() { - DeclarativeConfigProperties config = - createConfig("otel.instrumentation.common.default-enabled", "true"); - - assertThat( - config - .getStructured("java") - .getStructured("spring_starter") - .getString("instrumentation_mode")) - .isEqualTo("default"); - } - - @Test - void testSpringStarterInstrumentationMode_getString_booleanFalse() { - DeclarativeConfigProperties config = - createConfig("otel.instrumentation.common.default-enabled", "false"); - - assertThat( - config - .getStructured("java") - .getStructured("spring_starter") - .getString("instrumentation_mode")) - .isEqualTo("none"); - } - - @Test - void testAgentInstrumentationMode_notSet() { - DeclarativeConfigProperties config = createConfig("some.other.property", "value"); - - assertThat( - config.getStructured("java").getStructured("agent").getString("instrumentation_mode")) - .isNull(); - } - private static DeclarativeConfigProperties createConfig(String key, String value) { Map properties = new HashMap<>(); properties.put(key, value); diff --git a/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java b/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java index 29f9d424cd9d..1b37f31a315c 100644 --- a/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java +++ b/declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java @@ -10,33 +10,21 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; import java.time.Duration; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class DeclarativeConfigPropertiesBridgeTest { private ConfigProperties bridge; - private ConfigProperties emptyBridge; @BeforeEach void setup() { bridge = create(new DeclarativeConfigPropertiesBridgeBuilder()); - - OpenTelemetryConfigurationModel emptyModel = - new OpenTelemetryConfigurationModel() - .withAdditionalProperty("instrumentation/development", new InstrumentationModel()); - SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel); - emptyBridge = - new DeclarativeConfigPropertiesBridgeBuilder() - .buildFromInstrumentationConfig( - Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig())); } private static ConfigProperties create(DeclarativeConfigPropertiesBridgeBuilder builder) { @@ -55,9 +43,6 @@ void getProperties() { // asking for properties which don't exist or inaccessible shouldn't result in an error assertThat(bridge.getString("file_format")).isNull(); assertThat(bridge.getString("file_format", "foo")).isEqualTo("foo"); - assertThat(emptyBridge.getBoolean("otel.instrumentation.common.default-enabled")).isNull(); - assertThat(emptyBridge.getBoolean("otel.instrumentation.common.default-enabled", true)) - .isTrue(); // common cases assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isFalse(); diff --git a/examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java b/examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java index e2f50fc77f8b..af1f1181a3ec 100644 --- a/examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java +++ b/examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java @@ -21,7 +21,7 @@ @AutoService(InstrumentationModule.class) public final class DemoServlet3InstrumentationModule extends InstrumentationModule { public DemoServlet3InstrumentationModule() { - super("servlet-demo", "servlet-3"); + super("servlet_demo", "servlet_3"); } /* diff --git a/examples/extension/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java b/examples/extension/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java index fb657077a782..ff75537b84ea 100644 --- a/examples/extension/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java +++ b/examples/extension/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java @@ -21,7 +21,7 @@ @AutoService(InstrumentationModule.class) public final class DemoServlet3InstrumentationModule extends InstrumentationModule { public DemoServlet3InstrumentationModule() { - super("servlet-demo", "servlet-3"); + super("servlet_demo", "servlet_3"); } /* diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/EnabledInstrumentations.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/EnabledInstrumentations.java new file mode 100644 index 000000000000..1481798f6979 --- /dev/null +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/EnabledInstrumentations.java @@ -0,0 +1,54 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.api.incubator.config; + +import javax.annotation.Nullable; + +/** Provides information about which instrumentations are enabled. */ +public interface EnabledInstrumentations { + /** + * Returns whether the given instrumentation is enabled. + * + * @param instrumentationName the name of the instrumentation + * @return {@code Boolean.TRUE} if the instrumentation is enabled, {@code Boolean.FALSE} if it is + * disabled, or {@code null} if the default setting should be used + */ + @Nullable + Boolean getEnabled(String instrumentationName); + + /** + * Returns whether instrumentations are enabled by default. + * + * @return {@code true} if instrumentations are enabled by default, {@code false} otherwise + */ + boolean isDefaultEnabled(); + + /** + * Returns whether the given instrumentation is explicitly enabled (i.e., not relying on the + * default setting). + * + * @param instrumentationName the name of the instrumentation + * @return {@code true} if the instrumentation is explicitly enabled, {@code false} otherwise + */ + default boolean isEnabledExplicitly(String instrumentationName) { + return Boolean.TRUE.equals(getEnabled(instrumentationName)); + } + + /** + * Returns whether the given instrumentation is enabled, falling back to the default setting if + * not explicitly configured. + * + * @param instrumentationName the name of the instrumentation + * @return {@code true} if the instrumentation is enabled, {@code false} otherwise + */ + default boolean isEnabled(String instrumentationName) { + Boolean enabled = getEnabled(instrumentationName); + if (enabled != null) { + return enabled; + } + return isDefaultEnabled(); + } +} diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/ExtendedDeclarativeConfigProperties.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/ExtendedDeclarativeConfigProperties.java index 74604a21902a..d7b8f7cb6916 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/ExtendedDeclarativeConfigProperties.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/ExtendedDeclarativeConfigProperties.java @@ -21,7 +21,8 @@ public final class ExtendedDeclarativeConfigProperties implements DeclarativeCon private final DeclarativeConfigProperties delegate; - ExtendedDeclarativeConfigProperties(DeclarativeConfigProperties delegate) { + // will be deleted soon + public ExtendedDeclarativeConfigProperties(DeclarativeConfigProperties delegate) { this.delegate = delegate; } diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java index a9106a458120..3128eae8008d 100644 --- a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java +++ b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java @@ -20,7 +20,7 @@ public class ActivejHttpServerInstrumentationModule extends InstrumentationModul implements ExperimentalInstrumentationModule { public ActivejHttpServerInstrumentationModule() { - super("activej-http", "activej-http-6.0"); + super("activej_http", "activej_http_6.0"); } @Override diff --git a/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java b/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java index 7a172e8344d3..0b16ed14a862 100644 --- a/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java +++ b/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java @@ -17,7 +17,7 @@ public class AkkaActorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AkkaActorInstrumentationModule() { - super("akka-actor", "akka-actor-2.3"); + super("akka_actor", "akka_actor_2.3"); } @Override diff --git a/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java index a5e44c94a8f0..5b50a6912e35 100644 --- a/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java +++ b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java @@ -17,7 +17,7 @@ public class AkkaActorForkJoinInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AkkaActorForkJoinInstrumentationModule() { - super("akka-actor-fork-join", "akka-actor-fork-join-2.5", "akka-actor"); + super("akka_actor_fork_join", "akka_actor_fork_join_2.5", "akka_actor"); } @Override diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java index 536a92d0bc08..17cf8ca5328c 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class AkkaHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AkkaHttpClientInstrumentationModule() { - super("akka-http", "akka-http-10.0", "akka-http-client"); + super("akka_http", "akka_http_10.0", "akka_http_client"); } @Override diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java index 019b8c95f568..ec0a087c3f19 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java @@ -19,7 +19,7 @@ public class AkkaHttpServerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AkkaHttpServerInstrumentationModule() { - super("akka-http", "akka-http-10.0", "akka-http-server"); + super("akka_http", "akka_http_10.0", "akka_http_server"); } @Override diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java index c85299f320b9..198d98bba472 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java @@ -21,7 +21,7 @@ public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AkkaHttpServerRouteInstrumentationModule() { - super("akka-http", "akka-http-10.0", "akka-http-server", "akka-http-server-route"); + super("akka_http", "akka_http_10.0", "akka_http_server", "akka_http_server_route"); } @Override diff --git a/instrumentation/alibaba-druid-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/alibabadruid/v1_0/DruidInstrumentationModule.java b/instrumentation/alibaba-druid-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/alibabadruid/v1_0/DruidInstrumentationModule.java index 9304a50a436e..11a15f821fe5 100644 --- a/instrumentation/alibaba-druid-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/alibabadruid/v1_0/DruidInstrumentationModule.java +++ b/instrumentation/alibaba-druid-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/alibabadruid/v1_0/DruidInstrumentationModule.java @@ -18,7 +18,7 @@ public class DruidInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public DruidInstrumentationModule() { - super("alibaba-druid", "alibaba-druid-1.0"); + super("alibaba_druid", "alibaba_druid_1.0"); } @Override diff --git a/instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationModule.java b/instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationModule.java index 168f8518d81a..5cdb89355b41 100644 --- a/instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationModule.java +++ b/instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class ApacheDbcpInstrumentationModule extends InstrumentationModule { public ApacheDbcpInstrumentationModule() { - super("apache-dbcp", "apache-dbcp-2.0"); + super("apache_dbcp", "apache_dbcp_2.0"); } @Override diff --git a/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java index b353997ea93b..c9944de45335 100644 --- a/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java +++ b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java @@ -25,7 +25,7 @@ public class DubboInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public DubboInstrumentationModule() { - super("apache-dubbo", "apache-dubbo-2.7"); + super("apache_dubbo", "apache_dubbo_2.7"); } @Override diff --git a/instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobInstrumentationModule.java b/instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobInstrumentationModule.java index 0677de49fc60..21548734d6a0 100644 --- a/instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobInstrumentationModule.java +++ b/instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobInstrumentationModule.java @@ -18,7 +18,7 @@ public class ElasticJobInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ElasticJobInstrumentationModule() { - super("apache-elasticjob", "apache-elasticjob-3.0"); + super("apache_elasticjob", "apache_elasticjob_3.0"); } @Override diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java index 696cdd8a4e4d..852b47d64002 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class ApacheHttpAsyncClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ApacheHttpAsyncClientInstrumentationModule() { - super("apache-httpasyncclient", "apache-httpasyncclient-4.1"); + super("apache_httpasyncclient", "apache_httpasyncclient_4.1"); } @Override diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java index ef649105013d..e304c25e8e0f 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ApacheHttpClientInstrumentationModule() { - super("apache-httpclient", "apache-httpclient-2.0"); + super("apache_httpclient", "apache_httpclient_2.0"); } @Override diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java index c89fc473d45c..b5dbb130390c 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ApacheHttpClientInstrumentationModule() { - super("apache-httpclient", "apache-httpclient-4.0"); + super("apache_httpclient", "apache_httpclient_4.0"); } @Override diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientInstrumentationModule.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientInstrumentationModule.java index 43febca4b4eb..a6a5297ae028 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientInstrumentationModule.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ApacheHttpClientInstrumentationModule() { - super("apache-httpclient", "apache-httpclient-5.0"); + super("apache_httpclient", "apache_httpclient_5.0"); } @Override diff --git a/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ApacheShenYuInstrumentationModule.java b/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ApacheShenYuInstrumentationModule.java index 75e4f2d9c40e..e205a243b951 100644 --- a/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ApacheShenYuInstrumentationModule.java +++ b/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/ApacheShenYuInstrumentationModule.java @@ -14,7 +14,7 @@ @AutoService(InstrumentationModule.class) public class ApacheShenYuInstrumentationModule extends InstrumentationModule { public ApacheShenYuInstrumentationModule() { - super("apache-shenyu", "apache-shenyu-2.4"); + super("apache_shenyu", "apache_shenyu_2.4"); } @Override diff --git a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java index f64c9e4d3e94..9be5367dd744 100644 --- a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java +++ b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java @@ -19,7 +19,7 @@ public class ArmeriaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ArmeriaInstrumentationModule() { - super("armeria", "armeria-1.3"); + super("armeria", "armeria_1.3"); } @Override diff --git a/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcInstrumentationModule.java b/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcInstrumentationModule.java index 82d7d9361c26..eebabd441741 100644 --- a/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcInstrumentationModule.java +++ b/instrumentation/armeria/armeria-grpc-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class ArmeriaGrpcInstrumentationModule extends InstrumentationModule { public ArmeriaGrpcInstrumentationModule() { - super("armeria-grpc", "armeria-grpc-1.14", "armeria", "armeria-1.14"); + super("armeria_grpc", "armeria_grpc_1.14", "armeria", "armeria_1.14"); } @Override diff --git a/instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClientInstrumentationModule.java b/instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClientInstrumentationModule.java index 48559dd8e652..b83ac7387a5f 100644 --- a/instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClientInstrumentationModule.java +++ b/instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class AsyncHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AsyncHttpClientInstrumentationModule() { - super("async-http-client", "async-http-client-1.8"); + super("async_http_client", "async_http_client_1.8"); } @Override diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientInstrumentationModule.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientInstrumentationModule.java index 2120d9e6ebde..03fab6276aa4 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientInstrumentationModule.java +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class AsyncHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AsyncHttpClientInstrumentationModule() { - super("async-http-client", "async-http-client-1.9"); + super("async_http_client", "async_http_client_1.9"); } @Override diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentationModule.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentationModule.java index 756f19fde8dc..ee315ab118d8 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentationModule.java +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class AsyncHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AsyncHttpClientInstrumentationModule() { - super("async-http-client", "async-http-client-2.0"); + super("async_http_client", "async_http_client_2.0"); } @Override diff --git a/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java b/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java index 037f5d0b3caa..c4f79c030ceb 100644 --- a/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java +++ b/instrumentation/avaje-jex-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexInstrumentationModule.java @@ -17,7 +17,7 @@ public class JexInstrumentationModule extends InstrumentationModule { public JexInstrumentationModule() { - super("avaje-jex", "avaje-jex-3.0"); + super("avaje_jex", "avaje_jex_3.0"); } @Override diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java index ba6caf18163a..7baa297872d3 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java @@ -21,7 +21,7 @@ public class AwsLambdaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AwsLambdaInstrumentationModule() { - super("aws-lambda-core", "aws-lambda-core-1.0", "aws-lambda"); + super("aws_lambda_core", "aws_lambda_core_1.0", "aws_lambda"); } @Override diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationModule.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationModule.java index e7465f84e2d1..6e055ca0a328 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationModule.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationModule.java @@ -19,7 +19,7 @@ public class AwsLambdaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AwsLambdaInstrumentationModule() { - super("aws-lambda-events", "aws-lambda-events-2.2", "aws-lambda"); + super("aws_lambda_events", "aws_lambda_events_2.2", "aws_lambda"); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts index c2e3939596b5..a3942eb5c891 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts @@ -16,7 +16,7 @@ muzzle { versions.set("[1.10.33,)") assertInverse.set(true) - excludeInstrumentationName("aws-sdk-1.11-sqs") + excludeInstrumentationName("aws_sdk_1.11_sqs") } fail { @@ -24,7 +24,7 @@ muzzle { module.set("aws-java-sdk-core") versions.set("[1.10.33,)") - excludeInstrumentationName("aws-sdk-1.11-core") + excludeInstrumentationName("aws_sdk_1.11_core") } pass { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java index fd542f89b090..2ef7f783c136 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java @@ -22,7 +22,7 @@ abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) { - super("aws-sdk", "aws-sdk-1.11", additionalInstrumentationName); + super("aws_sdk", "aws_sdk_1.11", additionalInstrumentationName); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java index cc1e12af1a9c..5cc9dd4c07d9 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java @@ -17,7 +17,7 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AwsSdkInstrumentationModule() { - super("aws-sdk", "aws-sdk-1.11", "aws-sdk-1.11-core"); + super("aws_sdk", "aws_sdk_1.11", "aws_sdk_1.11_core"); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsInstrumentationModule.java index cc61cf6d9cc0..f8dad8f598f0 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsInstrumentationModule.java @@ -17,7 +17,7 @@ public class SqsInstrumentationModule extends AbstractAwsSdkInstrumentationModule { public SqsInstrumentationModule() { - super("aws-sdk-1.11-sqs"); + super("aws_sdk_1.11_sqs"); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts index b1d6d70f5747..449c29897331 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts @@ -13,10 +13,10 @@ muzzle { // client, which is not target of instrumentation anyways. extraDependency("software.amazon.awssdk:protocol-core") - excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime") - excludeInstrumentationName("aws-sdk-2.2-sqs") - excludeInstrumentationName("aws-sdk-2.2-sns") - excludeInstrumentationName("aws-sdk-2.2-lambda") + excludeInstrumentationName("aws_sdk_2.2_bedrock_runtime") + excludeInstrumentationName("aws_sdk_2.2_sqs") + excludeInstrumentationName("aws_sdk_2.2_sns") + excludeInstrumentationName("aws_sdk_2.2_lambda") // several software.amazon.awssdk artifacts are missing for this version skip("2.17.200") @@ -32,7 +32,7 @@ muzzle { // "fail" asserts that *all* the instrumentation modules fail to load, but the core one is // actually expected to succeed, so exclude it from checks. - excludeInstrumentationName("aws-sdk-2.2-core") + excludeInstrumentationName("aws_sdk_2.2_core") // several software.amazon.awssdk artifacts are missing for this version skip("2.17.200") @@ -46,9 +46,9 @@ muzzle { // client, which is not target of instrumentation anyways. extraDependency("software.amazon.awssdk:protocol-core") - excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime") - excludeInstrumentationName("aws-sdk-2.2-sns") - excludeInstrumentationName("aws-sdk-2.2-lambda") + excludeInstrumentationName("aws_sdk_2.2_bedrock_runtime") + excludeInstrumentationName("aws_sdk_2.2_sns") + excludeInstrumentationName("aws_sdk_2.2_lambda") // several software.amazon.awssdk artifacts are missing for this version skip("2.17.200") @@ -62,9 +62,9 @@ muzzle { // client, which is not target of instrumentation anyways. extraDependency("software.amazon.awssdk:protocol-core") - excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime") - excludeInstrumentationName("aws-sdk-2.2-sqs") - excludeInstrumentationName("aws-sdk-2.2-lambda") + excludeInstrumentationName("aws_sdk_2.2_bedrock_runtime") + excludeInstrumentationName("aws_sdk_2.2_sqs") + excludeInstrumentationName("aws_sdk_2.2_lambda") // several software.amazon.awssdk artifacts are missing for this version skip("2.17.200") @@ -77,9 +77,9 @@ muzzle { // client, which is not target of instrumentation anyways. extraDependency("software.amazon.awssdk:protocol-core") - excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime") - excludeInstrumentationName("aws-sdk-2.2-sqs") - excludeInstrumentationName("aws-sdk-2.2-sns") + excludeInstrumentationName("aws_sdk_2.2_bedrock_runtime") + excludeInstrumentationName("aws_sdk_2.2_sqs") + excludeInstrumentationName("aws_sdk_2.2_sns") // several software.amazon.awssdk artifacts are missing for this version skip("2.17.200") @@ -92,9 +92,9 @@ muzzle { // client, which is not target of instrumentation anyways. extraDependency("software.amazon.awssdk:protocol-core") - excludeInstrumentationName("aws-sdk-2.2-lambda") - excludeInstrumentationName("aws-sdk-2.2-sqs") - excludeInstrumentationName("aws-sdk-2.2-sns") + excludeInstrumentationName("aws_sdk_2.2_lambda") + excludeInstrumentationName("aws_sdk_2.2_sqs") + excludeInstrumentationName("aws_sdk_2.2_sns") } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java index b1c315e5e6bc..ef1f0865d01b 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java @@ -21,7 +21,7 @@ abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) { - super("aws-sdk", "aws-sdk-2.2", additionalInstrumentationName); + super("aws_sdk", "aws_sdk_2.2", additionalInstrumentationName); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java index 26cc30baf2c6..efacf9e1d7dc 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java @@ -19,7 +19,7 @@ @AutoService(InstrumentationModule.class) public class AwsSdkInstrumentationModule extends AbstractAwsSdkInstrumentationModule { public AwsSdkInstrumentationModule() { - super("aws-sdk-2.2-core"); + super("aws_sdk_2.2_core"); } /** diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java index ad5c6a307bca..4dbc19b07493 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java @@ -22,7 +22,7 @@ public class BedrockRuntimeInstrumentationModule extends AbstractAwsSdkInstrumentationModule { public BedrockRuntimeInstrumentationModule() { - super("aws-sdk-2.2-bedrock-runtime"); + super("aws_sdk_2.2_bedrock_runtime"); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java index 0c2004cafbe3..9d6453d1dff4 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java @@ -19,7 +19,7 @@ public class LambdaInstrumentationModule extends AbstractAwsSdkInstrumentationModule { public LambdaInstrumentationModule() { - super("aws-sdk-2.2-lambda"); + super("aws_sdk_2.2_lambda"); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java index 8a026407cee5..749a008b1594 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java @@ -19,7 +19,7 @@ public class SnsInstrumentationModule extends AbstractAwsSdkInstrumentationModule { public SnsInstrumentationModule() { - super("aws-sdk-2.2-sns"); + super("aws_sdk_2.2_sns"); } @Override diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java index e3c54161c4c4..ca5067b53682 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java @@ -22,7 +22,7 @@ public class SqsInstrumentationModule extends AbstractAwsSdkInstrumentationModule { public SqsInstrumentationModule() { - super("aws-sdk-2.2-sqs"); + super("aws_sdk_2.2_sqs"); } @Override diff --git a/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java b/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java index 05ae6a5015ad..07fad180ccaf 100644 --- a/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java +++ b/instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java @@ -26,7 +26,7 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AzureSdkInstrumentationModule() { - super("azure-core", "azure-core-1.14"); + super("azure_core", "azure_core_1.14"); } @Override diff --git a/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java b/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java index 01d95c5e4229..46a5f42ff26e 100644 --- a/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java +++ b/instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java @@ -26,7 +26,7 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AzureSdkInstrumentationModule() { - super("azure-core", "azure-core-1.19"); + super("azure_core", "azure_core_1.19"); } @Override diff --git a/instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java b/instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java index 9cae6ccab444..53cc3afcb735 100644 --- a/instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java +++ b/instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java @@ -26,7 +26,7 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AzureSdkInstrumentationModule() { - super("azure-core", "azure-core-1.36"); + super("azure_core", "azure_core_1.36"); } @Override diff --git a/instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkInstrumentationModule.java b/instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkInstrumentationModule.java index cd0348f2b6e4..fb9334c03b95 100644 --- a/instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkInstrumentationModule.java +++ b/instrumentation/azure-core/azure-core-1.53/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkInstrumentationModule.java @@ -26,7 +26,7 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public AzureSdkInstrumentationModule() { - super("azure-core", "azure-core-1.53"); + super("azure_core", "azure_core_1.53"); } @Override diff --git a/instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0InstrumentationModule.java b/instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0InstrumentationModule.java index 5d08f3f9ade9..4ebe6e1ea928 100644 --- a/instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0InstrumentationModule.java +++ b/instrumentation/c3p0-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/c3p0/v0_9/C3p0InstrumentationModule.java @@ -15,7 +15,7 @@ public class C3p0InstrumentationModule extends InstrumentationModule { public C3p0InstrumentationModule() { - super("c3p0", "c3p0-0.9"); + super("c3p0", "c3p0_0.9"); } @Override diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java index 4eda502235b9..344253cf4c14 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java @@ -16,7 +16,7 @@ public class ApacheCamelInstrumentationModule extends InstrumentationModule { public ApacheCamelInstrumentationModule() { - super("camel", "camel-2.20"); + super("camel", "camel_2.20"); } @Override diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumentationModule.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumentationModule.java index 1cde2894e737..d89718557be4 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumentationModule.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumentationModule.java @@ -17,7 +17,7 @@ public class CassandraInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CassandraInstrumentationModule() { - super("cassandra", "cassandra-3.0"); + super("cassandra", "cassandra_3.0"); } @Override diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java index eec8da4dd0b9..a088fe6e6be3 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java @@ -21,7 +21,7 @@ public class CassandraClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CassandraClientInstrumentationModule() { - super("cassandra", "cassandra-4.0"); + super("cassandra", "cassandra_4.0"); } @Override diff --git a/instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/CassandraClientInstrumentationModule.java b/instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/CassandraClientInstrumentationModule.java index 685994dbe291..c48b09f890c2 100644 --- a/instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/CassandraClientInstrumentationModule.java +++ b/instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/CassandraClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class CassandraClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CassandraClientInstrumentationModule() { - super("cassandra", "cassandra-4.4"); + super("cassandra", "cassandra_4.4"); } @Override diff --git a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1InstrumentationModule.java b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1InstrumentationModule.java index 1b3648d98087..8812445ceaf9 100644 --- a/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1InstrumentationModule.java +++ b/instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1InstrumentationModule.java @@ -18,7 +18,7 @@ public class ClickHouseClientV1InstrumentationModule extends InstrumentationModu implements ExperimentalInstrumentationModule { public ClickHouseClientV1InstrumentationModule() { - super("clickhouse-client-v1", "clickhouse-client-v1-0.5", "clickhouse", "clickhouse-client"); + super("clickhouse_client_v1", "clickhouse_client_v1_0.5", "clickhouse", "clickhouse_client"); } @Override diff --git a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2InstrumentationModule.java b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2InstrumentationModule.java index e2705c152166..2cbc78c20bf8 100644 --- a/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2InstrumentationModule.java +++ b/instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2InstrumentationModule.java @@ -18,7 +18,7 @@ public class ClickHouseClientV2InstrumentationModule extends InstrumentationModu implements ExperimentalInstrumentationModule { public ClickHouseClientV2InstrumentationModule() { - super("clickhouse-client-v2", "clickhouse-client-v2-0.8", "clickhouse", "clickhouse-client"); + super("clickhouse_client_v2", "clickhouse_client_v2_0.8", "clickhouse", "clickhouse_client"); } @Override diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java index 8c42a82f0711..fca74b8ea548 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java @@ -21,7 +21,7 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CouchbaseInstrumentationModule() { - super("couchbase", "couchbase-2.0"); + super("couchbase", "couchbase_2.0"); } @Override diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java index a9d40b5e7d06..bcdcc18291b2 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java @@ -20,7 +20,7 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CouchbaseInstrumentationModule() { - super("couchbase", "couchbase-2.6"); + super("couchbase", "couchbase_2.6"); } @Override diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseInstrumentationModule.java index a8cafea70aed..6330f06604bb 100644 --- a/instrumentation/couchbase/couchbase-3.1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-3.1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseInstrumentationModule.java @@ -20,7 +20,7 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CouchbaseInstrumentationModule() { - super("couchbase", "couchbase-3.1.6"); + super("couchbase", "couchbase_3.1.6"); } @Override diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java index 62b6a26b883d..003a3da85bff 100644 --- a/instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java @@ -20,7 +20,7 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CouchbaseInstrumentationModule() { - super("couchbase", "couchbase-3.1"); + super("couchbase", "couchbase_3.1"); } @Override diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java index 2d0ef86a82cc..812ef38bb527 100644 --- a/instrumentation/couchbase/couchbase-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java @@ -20,7 +20,7 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CouchbaseInstrumentationModule() { - super("couchbase", "couchbase-3.2"); + super("couchbase", "couchbase_3.2"); } @Override diff --git a/instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java index e6ece8646e96..eafd751ad283 100644 --- a/instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java @@ -19,7 +19,7 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CouchbaseInstrumentationModule() { - super("couchbase", "couchbase-3.4"); + super("couchbase", "couchbase_3.4"); } @Override diff --git a/instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/DropwizardMetricsInstrumentationModule.java b/instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/DropwizardMetricsInstrumentationModule.java index 8724eab94b70..2634e9c2155a 100644 --- a/instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/DropwizardMetricsInstrumentationModule.java +++ b/instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/DropwizardMetricsInstrumentationModule.java @@ -21,7 +21,7 @@ public class DropwizardMetricsInstrumentationModule extends InstrumentationModul implements ExperimentalInstrumentationModule { public DropwizardMetricsInstrumentationModule() { - super("dropwizard-metrics", "dropwizard-metrics-4.0"); + super("dropwizard_metrics", "dropwizard_metrics_4.0"); } @Override diff --git a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java index 3c876b2f21f4..ee9c9f1f36eb 100644 --- a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java +++ b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java @@ -17,7 +17,7 @@ public class DropwizardInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public DropwizardInstrumentationModule() { - super("dropwizard-views", "dropwizard-views-0.7"); + super("dropwizard_views", "dropwizard_views_0.7"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchApiClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchApiClientInstrumentationModule.java index 860895ec7a18..2a2d791e4e1f 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchApiClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchApiClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class ElasticsearchApiClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ElasticsearchApiClientInstrumentationModule() { - super("elasticsearch-api-client", "elasticsearch-api-client-7.16", "elasticsearch"); + super("elasticsearch_api_client", "elasticsearch_api_client_7.16", "elasticsearch"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5InstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5InstrumentationModule.java index 37cf332840d9..c9e1cf2a3f03 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5InstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5InstrumentationModule.java @@ -17,7 +17,7 @@ public class ElasticsearchRest5InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ElasticsearchRest5InstrumentationModule() { - super("elasticsearch-rest", "elasticsearch-rest-5.0", "elasticsearch"); + super("elasticsearch_rest", "elasticsearch_rest_5.0", "elasticsearch"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6InstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6InstrumentationModule.java index f9b5701abd63..be49a77a03fd 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6InstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6InstrumentationModule.java @@ -20,7 +20,7 @@ public class ElasticsearchRest6InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ElasticsearchRest6InstrumentationModule() { - super("elasticsearch-rest", "elasticsearch-rest-6.4", "elasticsearch"); + super("elasticsearch_rest", "elasticsearch_rest_6.4", "elasticsearch"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java index bb4dd49432ba..e0f323479633 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java @@ -20,7 +20,7 @@ public class ElasticsearchRest7InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ElasticsearchRest7InstrumentationModule() { - super("elasticsearch-rest", "elasticsearch-rest-7.0", "elasticsearch"); + super("elasticsearch_rest", "elasticsearch_rest_7.0", "elasticsearch"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java index 016283cf369d..aadb1e479f64 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class Elasticsearch5TransportClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Elasticsearch5TransportClientInstrumentationModule() { - super("elasticsearch-transport", "elasticsearch-transport-5.0", "elasticsearch"); + super("elasticsearch_transport", "elasticsearch_transport_5.0", "elasticsearch"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java index dc5d5e6a609f..85019f932860 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class Elasticsearch53TransportClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Elasticsearch53TransportClientInstrumentationModule() { - super("elasticsearch-transport", "elasticsearch-transport-5.3", "elasticsearch"); + super("elasticsearch_transport", "elasticsearch_transport_5.3", "elasticsearch"); } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java index d53efeb125c1..4e0d47f4b64e 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java @@ -21,7 +21,7 @@ public class Elasticsearch6TransportClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Elasticsearch6TransportClientInstrumentationModule() { - super("elasticsearch-transport", "elasticsearch-transport-6.0", "elasticsearch"); + super("elasticsearch_transport", "elasticsearch_transport_6.0", "elasticsearch"); } @Override diff --git a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java index 9f1a1ed0429c..8d994137a1a6 100644 --- a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java +++ b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java @@ -18,7 +18,7 @@ public class ExternalAnnotationInstrumentationModule extends InstrumentationModu implements ExperimentalInstrumentationModule { public ExternalAnnotationInstrumentationModule() { - super("external-annotations"); + super("external_annotations"); } @Override diff --git a/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java b/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java index 3938e762bfa4..e7b256909309 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java @@ -17,7 +17,7 @@ public class FinagleHttpInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public FinagleHttpInstrumentationModule() { - super("finagle-http", "finagle-http-23.11"); + super("finagle_http", "finagle_http_23.11"); } @Override diff --git a/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreInstrumentationModule.java b/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreInstrumentationModule.java index 14d77bad8925..ac2c2bbd89f7 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreInstrumentationModule.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreInstrumentationModule.java @@ -18,7 +18,7 @@ public class TwitterUtilCoreInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public TwitterUtilCoreInstrumentationModule() { - super("finagle-http", "finagle-http-23.11", "twitter-util-core"); + super("finagle_http", "finagle_http_23.11", "twitter_util_core"); } @Override diff --git a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java index 6f8febef19db..26df8cefd010 100644 --- a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java +++ b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java @@ -17,7 +17,7 @@ public class FinatraInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public FinatraInstrumentationModule() { - super("finatra", "finatra-2.9"); + super("finatra", "finatra_2.9"); } @Override diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java index 32377314ff6f..375e782b592e 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class GeodeInstrumentationModule extends InstrumentationModule { public GeodeInstrumentationModule() { - super("geode", "geode-1.4"); + super("geode", "geode_1.4"); } @Override diff --git a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java index 75c00b4f007e..ccfd465041e3 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class GoogleHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GoogleHttpClientInstrumentationModule() { - super("google-http-client", "google-http-client-1.19"); + super("google_http_client", "google_http_client_1.19"); } @Override diff --git a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsInstrumentationModule.java b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsInstrumentationModule.java index c53954b78714..6cba4907738c 100644 --- a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsInstrumentationModule.java +++ b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsInstrumentationModule.java @@ -17,7 +17,7 @@ public class GrailsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GrailsInstrumentationModule() { - super("grails", "grails-3.0"); + super("grails", "grails_3.0"); } @Override diff --git a/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentationModule.java b/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentationModule.java index 7c8ab4c4b3af..9de4b5995439 100644 --- a/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentationModule.java +++ b/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentationModule.java @@ -22,7 +22,7 @@ public class GraphqlInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GraphqlInstrumentationModule() { - super("graphql-java", "graphql-java-12.0"); + super("graphql_java", "graphql_java_12.0"); } @Override diff --git a/instrumentation/graphql-java/graphql-java-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlInstrumentationModule.java b/instrumentation/graphql-java/graphql-java-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlInstrumentationModule.java index 492ad7f1cd2b..88c1fff595ec 100644 --- a/instrumentation/graphql-java/graphql-java-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlInstrumentationModule.java +++ b/instrumentation/graphql-java/graphql-java-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlInstrumentationModule.java @@ -23,7 +23,7 @@ public class GraphqlInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GraphqlInstrumentationModule() { - super("graphql-java", "graphql-java-20.0"); + super("graphql_java", "graphql_java_20.0"); } @Override diff --git a/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java b/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java index eba6ffc5de6f..1c4e94f32170 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java +++ b/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java @@ -19,7 +19,7 @@ public class GrizzlyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GrizzlyInstrumentationModule() { - super("grizzly", "grizzly-2.3"); + super("grizzly", "grizzly_2.3"); } @Override diff --git a/instrumentation/grpc-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcInstrumentationModule.java b/instrumentation/grpc-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcInstrumentationModule.java index 4e4564694d2f..7b2878d54272 100644 --- a/instrumentation/grpc-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcInstrumentationModule.java +++ b/instrumentation/grpc-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcInstrumentationModule.java @@ -17,7 +17,7 @@ public class GrpcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GrpcInstrumentationModule() { - super("grpc", "grpc-1.6"); + super("grpc", "grpc_1.6"); } @Override diff --git a/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/GuavaInstrumentationModule.java b/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/GuavaInstrumentationModule.java index 4212ce015219..4ef5cff6587f 100644 --- a/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/GuavaInstrumentationModule.java +++ b/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/GuavaInstrumentationModule.java @@ -16,7 +16,7 @@ public class GuavaInstrumentationModule extends InstrumentationModule { public GuavaInstrumentationModule() { - super("guava", "guava-10.0"); + super("guava", "guava_10.0"); } @Override diff --git a/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtInstrumentationModule.java b/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtInstrumentationModule.java index 3227edbc3feb..33dfa65ac1a2 100644 --- a/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtInstrumentationModule.java +++ b/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtInstrumentationModule.java @@ -20,7 +20,7 @@ public class GwtInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GwtInstrumentationModule() { - super("gwt", "gwt-2.0"); + super("gwt", "gwt_2.0"); } @Override diff --git a/instrumentation/helidon-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/v4_3/HelidonInstrumentationModule.java b/instrumentation/helidon-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/v4_3/HelidonInstrumentationModule.java index 756282b5bcf3..dd078d326992 100644 --- a/instrumentation/helidon-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/v4_3/HelidonInstrumentationModule.java +++ b/instrumentation/helidon-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/v4_3/HelidonInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class HelidonInstrumentationModule extends InstrumentationModule { public HelidonInstrumentationModule() { - super("helidon", "helidon-4.3"); + super("helidon", "helidon_4.3"); } @Override diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java index 8a9dd3a82040..dd8c2087a1ec 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java @@ -20,7 +20,7 @@ public class HibernateInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HibernateInstrumentationModule() { - super("hibernate", "hibernate-3.3"); + super("hibernate", "hibernate_3.3"); } @Override diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java index e8a919d13c37..0d71fef3b786 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java @@ -20,7 +20,7 @@ public class HibernateInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HibernateInstrumentationModule() { - super("hibernate", "hibernate-4.0"); + super("hibernate", "hibernate_4.0"); } @Override diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java index 83af9e7b0f90..ef1a18c1f4cf 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java @@ -20,7 +20,7 @@ public class HibernateInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HibernateInstrumentationModule() { - super("hibernate", "hibernate-6.0"); + super("hibernate", "hibernate_6.0"); } @Override diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java index 3e914808d004..6d452e1180d8 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java @@ -19,7 +19,7 @@ public class HibernateInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HibernateInstrumentationModule() { - super("hibernate-procedure-call", "hibernate-procedure-call-4.3", "hibernate"); + super("hibernate_procedure_call", "hibernate_procedure_call_4.3", "hibernate"); } @Override diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/mutiny/HibernateReactiveMutinyInstrumentationModule.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/mutiny/HibernateReactiveMutinyInstrumentationModule.java index ceb2a9db6bcb..17fdb3f79225 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/mutiny/HibernateReactiveMutinyInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/mutiny/HibernateReactiveMutinyInstrumentationModule.java @@ -18,7 +18,7 @@ public class HibernateReactiveMutinyInstrumentationModule extends Instrumentatio implements ExperimentalInstrumentationModule { public HibernateReactiveMutinyInstrumentationModule() { - super("hibernate-reactive", "hibernate-reactive-1.0", "hibernate-reactive-mutiny"); + super("hibernate_reactive", "hibernate_reactive_1.0", "hibernate_reactive_mutiny"); } @Override diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/stage/HibernateReactiveStageInstrumentationModule.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/stage/HibernateReactiveStageInstrumentationModule.java index 4fa2366b906a..e53f42ea984e 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/stage/HibernateReactiveStageInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/stage/HibernateReactiveStageInstrumentationModule.java @@ -16,7 +16,7 @@ public class HibernateReactiveStageInstrumentationModule extends InstrumentationModule { public HibernateReactiveStageInstrumentationModule() { - super("hibernate-reactive", "hibernate-reactive-1.0", "hibernate-reactive-stage"); + super("hibernate_reactive", "hibernate_reactive_1.0", "hibernate_reactive_stage"); } @Override diff --git a/instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariCpInstrumentationModule.java b/instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariCpInstrumentationModule.java index 99f69a11962d..05127ce7cd58 100644 --- a/instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariCpInstrumentationModule.java +++ b/instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariCpInstrumentationModule.java @@ -18,7 +18,7 @@ public class HikariCpInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HikariCpInstrumentationModule() { - super("hikaricp", "hikaricp-3.0"); + super("hikaricp", "hikaricp_3.0"); } @Override diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java index 681b80c4d5a9..66f9a4a52822 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java @@ -18,7 +18,7 @@ public class HttpUrlConnectionInstrumentationModule extends InstrumentationModul implements ExperimentalInstrumentationModule { public HttpUrlConnectionInstrumentationModule() { - super("http-url-connection"); + super("http_url_connection"); } @Override diff --git a/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java b/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java index 262d4f7842bb..91f6470be2a3 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java +++ b/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java @@ -18,7 +18,7 @@ public class HystrixInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HystrixInstrumentationModule() { - super("hystrix", "hystrix-1.4"); + super("hystrix", "hystrix_1.4"); } @Override diff --git a/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbInstrumentationModule.java b/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbInstrumentationModule.java index 3aba153fc408..2ba7a750b666 100644 --- a/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbInstrumentationModule.java +++ b/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbInstrumentationModule.java @@ -16,7 +16,7 @@ public class InfluxDbInstrumentationModule extends InstrumentationModule { public InfluxDbInstrumentationModule() { - super("influxdb", "influxdb-2.4"); + super("influxdb", "influxdb_2.4"); } @Override diff --git a/instrumentation/internal/internal-application-logger/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/logging/ApplicationLoggingInstrumentationModule.java b/instrumentation/internal/internal-application-logger/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/logging/ApplicationLoggingInstrumentationModule.java index 931a90870040..3e5cb2595431 100644 --- a/instrumentation/internal/internal-application-logger/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/logging/ApplicationLoggingInstrumentationModule.java +++ b/instrumentation/internal/internal-application-logger/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/logging/ApplicationLoggingInstrumentationModule.java @@ -17,7 +17,7 @@ public class ApplicationLoggingInstrumentationModule extends InstrumentationModule { public ApplicationLoggingInstrumentationModule() { - super("internal-application-logger"); + super("internal_application_logger"); } @Override diff --git a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java index c8126cf78bb5..7ae9b5afaaa5 100644 --- a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java +++ b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java @@ -21,7 +21,7 @@ @AutoService(InstrumentationModule.class) public class TestInstrumentationModule extends InstrumentationModule { public TestInstrumentationModule() { - super("test-instrumentation"); + super("test_instrumentation"); } @Override diff --git a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java index bdc22c0ac5bb..4f4bf0fc337e 100644 --- a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java +++ b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java @@ -17,7 +17,7 @@ public class ClassLoaderInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ClassLoaderInstrumentationModule() { - super("internal-class-loader"); + super("internal_class_loader"); } @Override diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java index 2ad4cd966fc6..e4f44d8d71a2 100644 --- a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java +++ b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java @@ -17,7 +17,7 @@ public class EclipseOsgiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public EclipseOsgiInstrumentationModule() { - super("internal-eclipse-osgi", "internal-eclipse-osgi-3.6"); + super("internal_eclipse_osgi", "internal_eclipse_osgi_3.6"); } @Override diff --git a/instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationModule.java b/instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationModule.java index 980916d37c2d..6a8b8cbfa1d7 100644 --- a/instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationModule.java +++ b/instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationModule.java @@ -18,7 +18,7 @@ public class LambdaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LambdaInstrumentationModule() { - super("internal-lambda"); + super("internal_lambda"); } @Override diff --git a/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java index 586cac6f9eb5..9b4d825735ce 100644 --- a/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java +++ b/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java @@ -20,7 +20,7 @@ public class TestInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public TestInstrumentationModule() { - super("test-instrumentation"); + super("test_instrumentation"); } @Override diff --git a/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentationModule.java b/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentationModule.java index 5725dc1e8a48..198b37160484 100644 --- a/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentationModule.java +++ b/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentationModule.java @@ -19,7 +19,7 @@ public class ReflectionInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ReflectionInstrumentationModule() { - super("internal-reflection"); + super("internal_reflection"); } @Override diff --git a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java index 27e405e5766a..8a58dde4394c 100644 --- a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java +++ b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java @@ -17,7 +17,7 @@ public class TestInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public TestInstrumentationModule() { - super("test-instrumentation"); + super("test_instrumentation"); } @Override diff --git a/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java index 03f92be72deb..298d549daf23 100644 --- a/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java +++ b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class UrlClassLoaderInstrumentationModule extends InstrumentationModule { public UrlClassLoaderInstrumentationModule() { - super("internal-url-class-loader"); + super("internal_url_class_loader"); } @Override diff --git a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentationModule.java b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentationModule.java index f40040459100..72b0fec03d64 100644 --- a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentationModule.java +++ b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpclient/HttpClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class HttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public HttpClientInstrumentationModule() { - super("java-http-client"); + super("java_http_client"); } @Override diff --git a/instrumentation/java-http-server/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpserver/JavaHttpServerInstrumentationModule.java b/instrumentation/java-http-server/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpserver/JavaHttpServerInstrumentationModule.java index 9d25ca807c3a..3078b3335366 100644 --- a/instrumentation/java-http-server/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpserver/JavaHttpServerInstrumentationModule.java +++ b/instrumentation/java-http-server/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpserver/JavaHttpServerInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class JavaHttpServerInstrumentationModule extends InstrumentationModule { public JavaHttpServerInstrumentationModule() { - super("java-http-server"); + super("java_http_server"); } @Override diff --git a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentationModule.java b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentationModule.java index 9eeba3dcfea5..a1b06f83cba7 100644 --- a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentationModule.java +++ b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentationModule.java @@ -18,7 +18,7 @@ public class JavaUtilLoggingInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JavaUtilLoggingInstrumentationModule() { - super("java-util-logging"); + super("java_util_logging"); } @Override diff --git a/instrumentation/javalin-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javalin/v5_0/JavalinInstrumentationModule.java b/instrumentation/javalin-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javalin/v5_0/JavalinInstrumentationModule.java index d67a7843e90a..56b9dfebb6e9 100644 --- a/instrumentation/javalin-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javalin/v5_0/JavalinInstrumentationModule.java +++ b/instrumentation/javalin-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javalin/v5_0/JavalinInstrumentationModule.java @@ -19,7 +19,7 @@ public class JavalinInstrumentationModule extends InstrumentationModule { public JavalinInstrumentationModule() { - super("javalin", "javalin-5.0"); + super("javalin", "javalin_5.0"); } @Override diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsInstrumentationModule.java index eda5ed7f241d..3a34799d3f23 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsInstrumentationModule.java @@ -21,7 +21,7 @@ public class JaxrsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JaxrsInstrumentationModule() { - super("jaxrs", "jaxrs-1.0"); + super("jaxrs", "jaxrs_1.0"); } // this is required to make sure instrumentation won't apply to jax-rs 2 diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentationModule.java index 54ccbba4d782..dd62cde26a00 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentationModule.java @@ -20,7 +20,7 @@ public class JaxrsAnnotationsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JaxrsAnnotationsInstrumentationModule() { - super("jaxrs", "jaxrs-2.0", "jaxrs-annotations", "jaxrs-2.0-annotations"); + super("jaxrs", "jaxrs_2.0", "jaxrs_annotations", "jaxrs_2.0_annotations"); } // require jax-rs 2 diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfInstrumentationModule.java index 1b055672bc96..f43d163ffb29 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfInstrumentationModule.java @@ -17,7 +17,7 @@ public class CxfInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CxfInstrumentationModule() { - super("jaxrs", "jaxrs-2.0", "cxf", "cxf-3.2"); + super("jaxrs", "jaxrs_2.0", "cxf", "cxf_3.2"); } @Override diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java index a33c40e9256f..35dcba757f15 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java @@ -19,7 +19,7 @@ public class JerseyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JerseyInstrumentationModule() { - super("jaxrs", "jaxrs-2.0", "jersey", "jersey-2.0"); + super("jaxrs", "jaxrs_2.0", "jersey", "jersey_2.0"); } @Override diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java index 1e8f412a7b10..22d33b911f7a 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class Resteasy30InstrumentationModule extends InstrumentationModule { public Resteasy30InstrumentationModule() { - super("jaxrs", "jaxrs-2.0", "resteasy", "resteasy-3.0"); + super("jaxrs", "jaxrs_2.0", "resteasy", "resteasy_3.0"); } @Override diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java index 521aecdcd78a..a1584ab6ac04 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class Resteasy31InstrumentationModule extends InstrumentationModule { public Resteasy31InstrumentationModule() { - super("jaxrs", "jaxrs-2.0", "resteasy", "resteasy-3.1"); + super("jaxrs", "jaxrs_2.0", "resteasy", "resteasy_3.1"); } @Override diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java index 2d22563825f4..74204e5c65f4 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java @@ -20,7 +20,7 @@ public class JaxrsAnnotationsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JaxrsAnnotationsInstrumentationModule() { - super("jaxrs", "jaxrs-3.0", "jaxrs-annotations", "jaxrs-3.0-annotations"); + super("jaxrs", "jaxrs_3.0", "jaxrs_annotations", "jaxrs_3.0_annotations"); } // require jax-rs 3 diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyInstrumentationModule.java index 74fd9eb000c3..181c9369f469 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyInstrumentationModule.java @@ -19,7 +19,7 @@ public class JerseyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JerseyInstrumentationModule() { - super("jaxrs", "jaxrs-3.0", "jersey", "jersey-3.0"); + super("jaxrs", "jaxrs_3.0", "jersey", "jersey_3.0"); } @Override diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyInstrumentationModule.java index 7cf016e54dd3..ba2148030444 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ResteasyInstrumentationModule.java @@ -19,7 +19,7 @@ public class ResteasyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ResteasyInstrumentationModule() { - super("jaxrs", "jaxrs-3.0", "resteasy", "resteasy-6.0"); + super("jaxrs", "jaxrs_3.0", "resteasy", "resteasy_6.0"); } @Override diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2InstrumentationModule.java b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2InstrumentationModule.java index ac86b988b3c0..cc1f460d1842 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2InstrumentationModule.java +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2InstrumentationModule.java @@ -19,7 +19,7 @@ public class Axis2InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Axis2InstrumentationModule() { - super("axis2", "axis2-1.6", "jaxws"); + super("axis2", "axis2_1.6", "jaxws"); } @Override diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsInstrumentationModule.java b/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsInstrumentationModule.java index 8985708a74aa..45dc80086966 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsInstrumentationModule.java +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsInstrumentationModule.java @@ -17,7 +17,7 @@ public class JaxWsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JaxWsInstrumentationModule() { - super("jaxws", "jaxws-2.0"); + super("jaxws", "jaxws_2.0"); } @Override diff --git a/instrumentation/jaxws/jaxws-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfInstrumentationModule.java b/instrumentation/jaxws/jaxws-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfInstrumentationModule.java index 4800d99acb0a..e5af7f0a09d0 100644 --- a/instrumentation/jaxws/jaxws-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfInstrumentationModule.java +++ b/instrumentation/jaxws/jaxws-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfInstrumentationModule.java @@ -16,7 +16,7 @@ public class CxfInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public CxfInstrumentationModule() { - super("cxf", "cxf-3.0", "jaxws"); + super("cxf", "cxf_3.0", "jaxws"); } @Override diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java index 0afe1826ae94..23097ffcfb79 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java @@ -18,7 +18,7 @@ public class JwsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JwsInstrumentationModule() { - super("jaxws-jws-api", "jaxws-jws-api-1.1", "jaxws"); + super("jaxws_jws_api", "jaxws_jws_api_1.1", "jaxws"); } @Override diff --git a/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroInstrumentationModule.java b/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroInstrumentationModule.java index 77b14221e579..27447717e6f8 100644 --- a/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroInstrumentationModule.java +++ b/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroInstrumentationModule.java @@ -19,7 +19,7 @@ public class MetroInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MetroInstrumentationModule() { - super("metro", "metro-2.2", "jaxws"); + super("metro", "metro_2.2", "jaxws"); } @Override diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerInstrumentationModule.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerInstrumentationModule.java index 10391a48cb8c..a497cdd0e367 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerInstrumentationModule.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerInstrumentationModule.java @@ -18,7 +18,7 @@ public class JbossLogmanagerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JbossLogmanagerInstrumentationModule() { - super("jboss-logmanager-appender", "jboss-logmanager-appender-1.1"); + super("jboss_logmanager_appender", "jboss_logmanager_appender_1.1"); } @Override diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerInstrumentationModule.java b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerInstrumentationModule.java index 60179758417c..5e096bbc9d08 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerInstrumentationModule.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerInstrumentationModule.java @@ -18,7 +18,7 @@ public class JbossLogmanagerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JbossLogmanagerInstrumentationModule() { - super("jboss-logmanager-mdc", "jboss-logmanager-mdc-1.1"); + super("jboss_logmanager_mdc", "jboss_logmanager_mdc_1.1"); } @Override diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceInstrumentationModule.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceInstrumentationModule.java index 36f012ad2d83..e026159dbd77 100644 --- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceInstrumentationModule.java +++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceInstrumentationModule.java @@ -17,7 +17,7 @@ public class DataSourceInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public DataSourceInstrumentationModule() { - super("jdbc-datasource"); + super("jdbc_datasource"); } @Override diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java index 6167c1409bd2..13d0211d9905 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java @@ -21,7 +21,7 @@ public class JedisInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JedisInstrumentationModule() { - super("jedis", "jedis-1.4"); + super("jedis", "jedis_1.4"); } @Override diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java index 468d1ab9a896..326deffe0c06 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java @@ -21,7 +21,7 @@ public class JedisInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JedisInstrumentationModule() { - super("jedis", "jedis-3.0"); + super("jedis", "jedis_3.0"); } @Override diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisInstrumentationModule.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisInstrumentationModule.java index dcf3418ebfca..63a7d9af5f74 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisInstrumentationModule.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisInstrumentationModule.java @@ -20,7 +20,7 @@ public class JedisInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JedisInstrumentationModule() { - super("jedis", "jedis-4.0"); + super("jedis", "jedis_4.0"); } @Override diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12InstrumentationModule.java b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12InstrumentationModule.java index b6b6235c7313..a25eff3875a6 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12InstrumentationModule.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12InstrumentationModule.java @@ -17,7 +17,7 @@ public class JettyHttpClient12InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JettyHttpClient12InstrumentationModule() { - super("jetty-httpclient", "jetty-httpclient-12.0"); + super("jetty_httpclient", "jetty_httpclient_12.0"); } @Override diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9InstrumentationModule.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9InstrumentationModule.java index 8a30279e8194..d258fc465fa3 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9InstrumentationModule.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9InstrumentationModule.java @@ -20,7 +20,7 @@ public class JettyHttpClient9InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JettyHttpClient9InstrumentationModule() { - super("jetty-httpclient", "jetty-httpclient-9.2"); + super("jetty_httpclient", "jetty_httpclient_9.2"); } @Override diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java index 13b1bb3b5903..6f8210e3ab21 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java @@ -21,7 +21,7 @@ public class Jetty11InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Jetty11InstrumentationModule() { - super("jetty", "jetty-11.0"); + super("jetty", "jetty_11.0"); } @Override diff --git a/instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12InstrumentationModule.java b/instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12InstrumentationModule.java index a73b33d7accb..bfa3b076e6e8 100644 --- a/instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12InstrumentationModule.java +++ b/instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12InstrumentationModule.java @@ -20,7 +20,7 @@ public class Jetty12InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Jetty12InstrumentationModule() { - super("jetty", "jetty-12.0"); + super("jetty", "jetty_12.0"); } @Override diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java index 5e0e4c46c67c..c094fae7fc57 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java @@ -21,7 +21,7 @@ public class Jetty8InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Jetty8InstrumentationModule() { - super("jetty", "jetty-8.0"); + super("jetty", "jetty_8.0"); } @Override diff --git a/instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/JFinalInstrumentationModule.java b/instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/JFinalInstrumentationModule.java index 5375ffb40f30..5fed6dcb5631 100644 --- a/instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/JFinalInstrumentationModule.java +++ b/instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/JFinalInstrumentationModule.java @@ -21,7 +21,7 @@ public class JFinalInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JFinalInstrumentationModule() { - super("jfinal", "jfinal-3.2"); + super("jfinal", "jfinal_3.2"); } @Override diff --git a/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsInstrumentationModule.java b/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsInstrumentationModule.java index e49385490998..12a5c9cb25f7 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsInstrumentationModule.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsInstrumentationModule.java @@ -17,7 +17,7 @@ public class JmsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JmsInstrumentationModule() { - super("jms", "jms-1.1"); + super("jms", "jms_1.1"); } @Override diff --git a/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsInstrumentationModule.java b/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsInstrumentationModule.java index e668706f786c..72efe4dfb79b 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsInstrumentationModule.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsInstrumentationModule.java @@ -17,7 +17,7 @@ public class JmsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JmsInstrumentationModule() { - super("jms", "jms-3.0"); + super("jms", "jms_3.0"); } @Override diff --git a/instrumentation/jodd-http-4.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpInstrumentationModule.java b/instrumentation/jodd-http-4.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpInstrumentationModule.java index 7f6ee31c0727..70f11fe6d821 100644 --- a/instrumentation/jodd-http-4.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpInstrumentationModule.java +++ b/instrumentation/jodd-http-4.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpInstrumentationModule.java @@ -17,7 +17,7 @@ public class JoddHttpInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JoddHttpInstrumentationModule() { - super("jodd-http", "jodd-http-4.2"); + super("jodd_http", "jodd_http_4.2"); } @Override diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java index 145fabd391fa..5d75064c7931 100644 --- a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java +++ b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java @@ -17,7 +17,7 @@ public class MojarraInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MojarraInstrumentationModule() { - super("jsf-mojarra", "jsf-mojarra-1.2"); + super("jsf_mojarra", "jsf_mojarra_1.2"); } @Override diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java index 22f97da5ca45..c4c950dbcdb8 100644 --- a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java +++ b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java @@ -17,7 +17,7 @@ public class MojarraInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MojarraInstrumentationModule() { - super("jsf-mojarra", "jsf-mojarra-3.0"); + super("jsf_mojarra", "jsf_mojarra_3.0"); } @Override diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java index 28abaf8ebc89..6a11eded8951 100644 --- a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java +++ b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java @@ -17,7 +17,7 @@ public class MyFacesInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MyFacesInstrumentationModule() { - super("jsf-myfaces", "jsf-myfaces-1.2"); + super("jsf_myfaces", "jsf_myfaces_1.2"); } @Override diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.java b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.java index d7ede291c5d3..f362cec217aa 100644 --- a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.java +++ b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.java @@ -17,7 +17,7 @@ public class MyFacesInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MyFacesInstrumentationModule() { - super("jsf-myfaces", "jsf-myfaces-3.0"); + super("jsf_myfaces", "jsf_myfaces_3.0"); } @Override diff --git a/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java b/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java index 8328f55a6761..2cc6e5b25bae 100644 --- a/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java +++ b/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java @@ -17,7 +17,7 @@ public class JspInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public JspInstrumentationModule() { - super("jsp", "jsp-2.3"); + super("jsp", "jsp_2.3"); } @Override diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts index 82df1bfccf66..597a1a8a57f4 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts @@ -8,7 +8,7 @@ muzzle { module.set("kafka-clients") versions.set("[0.11.0.0,)") assertInverse.set(true) - excludeInstrumentationName("kafka-clients-metrics") + excludeInstrumentationName("kafka_clients_metrics") } } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientsInstrumentationModule.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientsInstrumentationModule.java index 895cc6324a84..6c621b259f0d 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientsInstrumentationModule.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientsInstrumentationModule.java @@ -17,7 +17,7 @@ public class KafkaClientsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public KafkaClientsInstrumentationModule() { - super("kafka-clients", "kafka-clients-0.11", "kafka"); + super("kafka_clients", "kafka_clients_0.11", "kafka"); } @Override diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/metrics/KafkaMetricsInstrumentationModule.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/metrics/KafkaMetricsInstrumentationModule.java index ef64d13dad29..f7917b4b8897 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/metrics/KafkaMetricsInstrumentationModule.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/metrics/KafkaMetricsInstrumentationModule.java @@ -20,10 +20,10 @@ public class KafkaMetricsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public KafkaMetricsInstrumentationModule() { super( - "kafka-clients-metrics", - "kafka-clients", - "kafka-clients-metrics-0.11", - "kafka-clients-0.11", + "kafka_clients_metrics", + "kafka_clients", + "kafka_clients_metrics-0.11", + "kafka_clients-0.11", "kafka"); } diff --git a/instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/KafkaConnectInstrumentationModule.java b/instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/KafkaConnectInstrumentationModule.java index c846930c2b92..66f8093dc672 100644 --- a/instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/KafkaConnectInstrumentationModule.java +++ b/instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/KafkaConnectInstrumentationModule.java @@ -20,7 +20,7 @@ public class KafkaConnectInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public KafkaConnectInstrumentationModule() { - super("kafka-connect", "kafka-connect-2.6"); + super("kafka_connect", "kafka_connect_2.6"); } @Override diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java index 033448076a8a..916d9b060be9 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java @@ -17,7 +17,7 @@ public class KafkaStreamsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public KafkaStreamsInstrumentationModule() { - super("kafka-streams", "kafka-streams-0.11", "kafka"); + super("kafka_streams", "kafka_streams_0.11", "kafka"); } @Override diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java index 0e1a446c559f..96d386811bc8 100644 --- a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java +++ b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java @@ -18,7 +18,7 @@ public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public KotlinCoroutinesInstrumentationModule() { - super("kotlinx-coroutines", "kotlinx-coroutines-1.0"); + super("kotlinx_coroutines", "kotlinx_coroutines_1.0"); } @Override diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/instrumentationannotations/AnnotationInstrumentationModule.java b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/instrumentationannotations/AnnotationInstrumentationModule.java index 058049d812eb..e3773ebccd03 100644 --- a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/instrumentationannotations/AnnotationInstrumentationModule.java +++ b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/instrumentationannotations/AnnotationInstrumentationModule.java @@ -24,10 +24,10 @@ public class AnnotationInstrumentationModule extends InstrumentationModule public AnnotationInstrumentationModule() { super( - "kotlinx-coroutines", - "kotlinx-coroutines-1.0", - "kotlinx-coroutines-opentelemetry-instrumentation-annotations", - "opentelemetry-instrumentation-annotations"); + "kotlinx_coroutines", + "kotlinx_coroutines_1.0", + "kotlinx_coroutines_opentelemetry_instrumentation_annotations", + "opentelemetry_instrumentation_annotations"); } @Override diff --git a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/flow/KotlinCoroutinesFlowInstrumentationModule.java b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/flow/KotlinCoroutinesFlowInstrumentationModule.java index 2b7fa337068f..9dde74584e7e 100644 --- a/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/flow/KotlinCoroutinesFlowInstrumentationModule.java +++ b/instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/flow/KotlinCoroutinesFlowInstrumentationModule.java @@ -16,7 +16,7 @@ public class KotlinCoroutinesFlowInstrumentationModule extends InstrumentationModule { public KotlinCoroutinesFlowInstrumentationModule() { - super("kotlinx-coroutines-flow", "kotlinx-coroutines-flow-1.3", "kotlinx-coroutines"); + super("kotlinx_coroutines_flow", "kotlinx_coroutines_flow_1.3", "kotlinx_coroutines"); } @Override diff --git a/instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts b/instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts index e58f1115b8d2..439e086815a8 100644 --- a/instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts +++ b/instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts @@ -11,7 +11,7 @@ muzzle { module.set("ktor-client-core") versions.set("[2.0.0,3.0.0)") assertInverse.set(true) - excludeInstrumentationName("ktor-server") + excludeInstrumentationName("ktor_server") // missing dependencies skip("1.1.0", "1.1.1", "1.1.5") } @@ -20,7 +20,7 @@ muzzle { module.set("ktor-server-core") versions.set("[2.0.0,3.0.0)") assertInverse.set(true) - excludeInstrumentationName("ktor-client") + excludeInstrumentationName("ktor_client") // missing dependencies skip("1.1.0", "1.1.1") } diff --git a/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorClientInstrumentationModule.java b/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorClientInstrumentationModule.java index 4fd4564ecc6f..73e9c7490bd8 100644 --- a/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorClientInstrumentationModule.java +++ b/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class KtorClientInstrumentationModule extends InstrumentationModule { public KtorClientInstrumentationModule() { - super("ktor", "ktor-2.0", "ktor-client", "ktor-client-2.0"); + super("ktor", "ktor_2.0", "ktor_client", "ktor_client_2.0"); } @Override diff --git a/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorServerInstrumentationModule.java b/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorServerInstrumentationModule.java index 40b1950248d3..0eb4adbf953d 100644 --- a/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorServerInstrumentationModule.java +++ b/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/KtorServerInstrumentationModule.java @@ -16,7 +16,7 @@ public class KtorServerInstrumentationModule extends InstrumentationModule { public KtorServerInstrumentationModule() { - super("ktor", "ktor-2.0", "ktor-server", "ktor-server-2.0"); + super("ktor", "ktor_2.0", "ktor_server", "ktor_server_2.0"); } @Override diff --git a/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts b/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts index dff4f52da502..7d858e09e149 100644 --- a/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts +++ b/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts @@ -11,7 +11,7 @@ muzzle { module.set("ktor-client-core") versions.set("[3.0.0,)") assertInverse.set(true) - excludeInstrumentationName("ktor-server") + excludeInstrumentationName("ktor_server") // missing dependencies skip("1.1.0", "1.1.1", "1.1.5") } @@ -20,7 +20,7 @@ muzzle { module.set("ktor-server-core") versions.set("[3.0.0,)") assertInverse.set(true) - excludeInstrumentationName("ktor-client") + excludeInstrumentationName("ktor_client") // missing dependencies skip("1.1.0", "1.1.1") } diff --git a/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorClientInstrumentationModule.java b/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorClientInstrumentationModule.java index 3eacf35581cd..6b163116702a 100644 --- a/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorClientInstrumentationModule.java +++ b/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class KtorClientInstrumentationModule extends InstrumentationModule { public KtorClientInstrumentationModule() { - super("ktor", "ktor-3.0", "ktor-client", "ktor-client-3.0"); + super("ktor", "ktor_3.0", "ktor_client", "ktor_client_3.0"); } @Override diff --git a/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorServerInstrumentationModule.java b/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorServerInstrumentationModule.java index 27b2b9f627c8..a70924d58ca6 100644 --- a/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorServerInstrumentationModule.java +++ b/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/KtorServerInstrumentationModule.java @@ -16,7 +16,7 @@ public class KtorServerInstrumentationModule extends InstrumentationModule { public KtorServerInstrumentationModule() { - super("ktor", "ktor-3.0", "ktor-server", "ktor-server-3.0"); + super("ktor", "ktor_3.0", "ktor_server", "ktor_server_3.0"); } @Override diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java index 4de706a674ca..08063cb29054 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class KubernetesClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public KubernetesClientInstrumentationModule() { - super("kubernetes-client", "kubernetes-client-7.0"); + super("kubernetes_client", "kubernetes_client_7.0"); } @Override diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java index 1540b8ba5fd6..752a0e2714e4 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java @@ -17,7 +17,7 @@ public class LettuceInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LettuceInstrumentationModule() { - super("lettuce", "lettuce-4.0"); + super("lettuce", "lettuce_4.0"); } @Override diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java index 15f438baee15..ee04653489f2 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java @@ -21,7 +21,7 @@ public class LettuceInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LettuceInstrumentationModule() { - super("lettuce", "lettuce-5.0"); + super("lettuce", "lettuce_5.0"); } @Override diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java index 7bd4dc7c954c..3b080a37df0d 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java @@ -20,7 +20,7 @@ public class LettuceInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LettuceInstrumentationModule() { - super("lettuce", "lettuce-5.1"); + super("lettuce", "lettuce_5.1"); } @Override diff --git a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java index 93bc79622b59..032665510b9f 100644 --- a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java +++ b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java @@ -31,7 +31,7 @@ public class LibertyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LibertyInstrumentationModule() { - super("liberty", "liberty-20.0"); + super("liberty", "liberty_20.0"); } @Override diff --git a/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java index de1d20cb935e..c923d6a56f14 100644 --- a/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java +++ b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java @@ -18,7 +18,7 @@ public class LibertyDispatcherInstrumentationModule extends InstrumentationModul implements ExperimentalInstrumentationModule { public LibertyDispatcherInstrumentationModule() { - super("liberty-dispatcher", "liberty-dispatcher-20.0", "liberty"); + super("liberty_dispatcher", "liberty_dispatcher_20.0", "liberty"); } @Override diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/Log4jAppenderInstrumentationModule.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/Log4jAppenderInstrumentationModule.java index 58e89b4e0e83..dd475cec043a 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/Log4jAppenderInstrumentationModule.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/Log4jAppenderInstrumentationModule.java @@ -18,7 +18,7 @@ public class Log4jAppenderInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Log4jAppenderInstrumentationModule() { - super("log4j-appender", "log4j-appender-1.2"); + super("log4j_appender", "log4j_appender_1.2"); } @Override diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jAppenderInstrumentationModule.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jAppenderInstrumentationModule.java index c752d76ba8fb..eaca2caea722 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jAppenderInstrumentationModule.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jAppenderInstrumentationModule.java @@ -18,7 +18,7 @@ public class Log4jAppenderInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Log4jAppenderInstrumentationModule() { - super("log4j-appender", "log4j-appender-2.17"); + super("log4j_appender", "log4j_appender_2.17"); } @Override diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_17/Log4j2InstrumentationModule.java b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_17/Log4j2InstrumentationModule.java index 238122e7fd7c..7ad9c348ed5b 100644 --- a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_17/Log4j2InstrumentationModule.java +++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_17/Log4j2InstrumentationModule.java @@ -25,7 +25,7 @@ public class Log4j2InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Log4j2InstrumentationModule() { - super("log4j-context-data", "log4j-context-data-2.17"); + super("log4j_context_data", "log4j_context_data_2.17"); } @Override diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_7/Log4j27InstrumentationModule.java b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_7/Log4j27InstrumentationModule.java index a650069442ed..18cfd1b60089 100644 --- a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_7/Log4j27InstrumentationModule.java +++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/contextdata/v2_7/Log4j27InstrumentationModule.java @@ -20,7 +20,7 @@ public class Log4j27InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Log4j27InstrumentationModule() { - super("log4j-context-data", "log4j-context-data-2.7"); + super("log4j_context_data", "log4j_context_data_2.7"); } @Override diff --git a/instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java b/instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java index bcee3329e97e..912e101a1a81 100644 --- a/instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java +++ b/instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java @@ -19,7 +19,7 @@ public class Log4j1InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Log4j1InstrumentationModule() { - super("log4j-mdc", "log4j-mdc-1.2"); + super("log4j_mdc", "log4j_mdc_1.2"); } @Override diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/appender/v1_0/LogbackInstrumentationModule.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/appender/v1_0/LogbackInstrumentationModule.java index cb5339494ba9..45fe2090cd07 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/appender/v1_0/LogbackInstrumentationModule.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/appender/v1_0/LogbackInstrumentationModule.java @@ -18,7 +18,7 @@ public class LogbackInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LogbackInstrumentationModule() { - super("logback-appender", "logback-appender-1.0"); + super("logback_appender", "logback_appender_1.0"); } @Override diff --git a/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java b/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java index 88b58a0246fb..30374dada3bc 100644 --- a/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java +++ b/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java @@ -17,7 +17,7 @@ public class LogbackMdcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public LogbackMdcInstrumentationModule() { - super("logback-mdc", "logback-mdc-1.0"); + super("logback_mdc", "logback_mdc_1.0"); } @Override diff --git a/instrumentation/micrometer/micrometer-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/MicrometerInstrumentationModule.java b/instrumentation/micrometer/micrometer-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/MicrometerInstrumentationModule.java index e908a26d4018..bc7b1843cd91 100644 --- a/instrumentation/micrometer/micrometer-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/MicrometerInstrumentationModule.java +++ b/instrumentation/micrometer/micrometer-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/MicrometerInstrumentationModule.java @@ -22,7 +22,7 @@ public class MicrometerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MicrometerInstrumentationModule() { - super("micrometer", "micrometer-1.5"); + super("micrometer", "micrometer_1.5"); } @Override diff --git a/instrumentation/mongo/mongo-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java b/instrumentation/mongo/mongo-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java index 297dc69a4d2f..407d0e15b496 100644 --- a/instrumentation/mongo/mongo-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java @@ -28,7 +28,7 @@ public class MongoClientInstrumentationModule extends InstrumentationModule { public MongoClientInstrumentationModule() { - super("mongo", "mongo-3.1"); + super("mongo", "mongo_3.1"); } @Override diff --git a/instrumentation/mongo/mongo-3.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java b/instrumentation/mongo/mongo-3.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java index 7d518ff712a4..1b05a514b0a7 100644 --- a/instrumentation/mongo/mongo-3.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-3.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class MongoClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MongoClientInstrumentationModule() { - super("mongo", "mongo-3.7"); + super("mongo", "mongo_3.7"); } @Override diff --git a/instrumentation/mongo/mongo-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientInstrumentationModule.java b/instrumentation/mongo/mongo-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientInstrumentationModule.java index 4975340cf949..2ac485042c81 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class MongoClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MongoClientInstrumentationModule() { - super("mongo", "mongo-4.0"); + super("mongo", "mongo_4.0"); } @Override diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java b/instrumentation/mongo/mongo-async-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java index c53607f91b1c..9abacaa9b7f2 100644 --- a/instrumentation/mongo/mongo-async-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-async-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class MongoAsyncClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MongoAsyncClientInstrumentationModule() { - super("mongo-async", "mongo-async-3.3", "mongo"); + super("mongo_async", "mongo_async_3.3", "mongo"); } @Override diff --git a/instrumentation/mybatis-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisInstrumentationModule.java b/instrumentation/mybatis-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisInstrumentationModule.java index 00d89d76ba40..6405361341e4 100644 --- a/instrumentation/mybatis-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisInstrumentationModule.java +++ b/instrumentation/mybatis-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisInstrumentationModule.java @@ -18,7 +18,7 @@ public class MyBatisInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public MyBatisInstrumentationModule() { - super("mybatis", "mybatis-3.2"); + super("mybatis", "mybatis_3.2"); } @Override diff --git a/instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationModule.java b/instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationModule.java index 3c48286120d2..1c1b5c3070f2 100644 --- a/instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationModule.java +++ b/instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationModule.java @@ -18,7 +18,7 @@ public class NatsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public NatsInstrumentationModule() { - super("nats", "nats-2.17"); + super("nats", "nats_2.17"); } @Override diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java index e9682487f601..55b56ec504b4 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java @@ -19,7 +19,7 @@ public class NettyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public NettyInstrumentationModule() { - super("netty", "netty-3.8"); + super("netty", "netty_3.8"); } @Override diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java index 644797fb54d1..126d8828c2e6 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java @@ -21,7 +21,7 @@ public class NettyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public NettyInstrumentationModule() { - super("netty", "netty-4.0"); + super("netty", "netty_4.0"); } @Override diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java index e792306fe64b..76d2aafda834 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java @@ -20,7 +20,7 @@ public class NettyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public NettyInstrumentationModule() { - super("netty", "netty-4.1"); + super("netty", "netty_4.1"); } @Override diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java index 5de8705041fe..b6ddf9825108 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class OkHttp2InstrumentationModule extends InstrumentationModule { public OkHttp2InstrumentationModule() { - super("okhttp", "okhttp-2.2"); + super("okhttp", "okhttp_2.2"); } @Override diff --git a/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java b/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java index f27f0d56ef13..5c27fc39f97e 100644 --- a/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java +++ b/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java @@ -18,7 +18,7 @@ public class OkHttp3InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OkHttp3InstrumentationModule() { - super("okhttp", "okhttp-3.0"); + super("okhttp", "okhttp_3.0"); } @Override diff --git a/instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAiInstrumentationModule.java b/instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAiInstrumentationModule.java index c2af04e5e730..cba9f83a0a6e 100644 --- a/instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAiInstrumentationModule.java +++ b/instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAiInstrumentationModule.java @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class OpenAiInstrumentationModule extends InstrumentationModule { public OpenAiInstrumentationModule() { - super("openai-java", "openai-java-1.1", "openai"); + super("openai_java", "openai_java_1.1", "openai"); } @Override diff --git a/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchInstrumentationModule.java b/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchInstrumentationModule.java index d0be098bc245..870e1dcda79f 100644 --- a/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchInstrumentationModule.java +++ b/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchInstrumentationModule.java @@ -17,7 +17,7 @@ public class OpenSearchInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenSearchInstrumentationModule() { - super("opensearch-java", "opensearch-java-3.0", "opensearch"); + super("opensearch_java", "opensearch_java_3.0", "opensearch"); } @Override diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestInstrumentationModule.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestInstrumentationModule.java index be87c28103c6..2f7454efa70d 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestInstrumentationModule.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenSearchRestInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenSearchRestInstrumentationModule() { - super("opensearch-rest", "opensearch-rest-1.0", "opensearch"); + super("opensearch_rest", "opensearch_rest_1.0", "opensearch"); } @Override diff --git a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestInstrumentationModule.java b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestInstrumentationModule.java index c040e3b042d3..3f1869f0620e 100644 --- a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestInstrumentationModule.java +++ b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenSearchRestInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenSearchRestInstrumentationModule() { - super("opensearch-rest", "opensearch-rest-3.0", "opensearch"); + super("opensearch_rest", "opensearch_rest_3.0", "opensearch"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java index d07f92724571..c2dc315e53f4 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java @@ -18,7 +18,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.0"); + super("opentelemetry_api", "opentelemetry_api_1.0"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java index 00338f637562..64019618f26c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.10"); + super("opentelemetry_api", "opentelemetry_api_1.10"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java index 649e8df960e5..af51ef0284e9 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.15"); + super("opentelemetry_api", "opentelemetry_api_1.15"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java index 53c3a80b8f82..92fa3fd81ab6 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.27"); + super("opentelemetry_api", "opentelemetry_api_1.27"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java index 9dbe8d2fbddf..f4ccf5e50ca2 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/OpenTelemetryApiInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.31", "opentelemetry-api-incubator-1.31"); + super("opentelemetry_api", "opentelemetry_api_1.31", "opentelemetry_api_incubator_1.31"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java index fefa28aa76cb..a75692fd968a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.32"); + super("opentelemetry_api", "opentelemetry_api_1.32"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index c62ac006af59..286273422ce3 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.32", "opentelemetry-api-incubator-1.32"); + super("opentelemetry_api", "opentelemetry_api_1.32", "opentelemetry_api_incubator_1.32"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java index 5971d77a6ade..28112952f997 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.37", "opentelemetry-api-incubator-1.37"); + super("opentelemetry_api", "opentelemetry_api_1.37", "opentelemetry_api_incubator_1.37"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java index 93e45ca132ff..b2524b409272 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.38"); + super("opentelemetry_api", "opentelemetry_api_1.38"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 3b07855edf64..24ed69124bc8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.38", "opentelemetry-api-incubator-1.38"); + super("opentelemetry_api", "opentelemetry_api_1.38", "opentelemetry_api_incubator_1.38"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java index de37424b8fbc..4c10ba61f7c5 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java @@ -17,7 +17,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.4"); + super("opentelemetry_api", "opentelemetry_api_1.4"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 93fca86e9b21..673a7f4f987b 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.40", "opentelemetry-api-incubator-1.40"); + super("opentelemetry_api", "opentelemetry_api_1.40", "opentelemetry_api_incubator_1.40"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java index d0e3cd0fb473..fdd6048a8ec1 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.42"); + super("opentelemetry_api", "opentelemetry_api_1.42"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 65b1a125dbb9..1409623f2616 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.42", "opentelemetry-api-incubator-1.42"); + super("opentelemetry_api", "opentelemetry_api_1.42", "opentelemetry_api_incubator_1.42"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index d00b92691861..25873449a1f4 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.47", "opentelemetry-api-incubator-1.47"); + super("opentelemetry_api", "opentelemetry_api_1.47", "opentelemetry_api_incubator_1.47"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java index cc4363bc1261..3013e53c7771 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/OpenTelemetryApiInstrumentationModule.java @@ -20,7 +20,7 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.50"); + super("opentelemetry_api", "opentelemetry_api_1.50"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index f5c74abbd587..3f07272557d3 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.50", "opentelemetry-api-incubator-1.50"); + super("opentelemetry_api", "opentelemetry_api_1.50", "opentelemetry_api_incubator_1.50"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 45afeee3673c..7862dcf26a16 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.52", "opentelemetry-api-incubator-1.52"); + super("opentelemetry_api", "opentelemetry_api_1.52", "opentelemetry_api_incubator_1.52"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java index 5c15fc0c87f5..cbcc69bfd78d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApiIncubatorInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.56", "opentelemetry-api-incubator-1.56"); + super("opentelemetry_api", "opentelemetry_api_1.56", "opentelemetry_api_incubator_1.56"); } @Override diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApInstrumentationModule.java index 1d0b85c420c2..046c9fbfe003 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApInstrumentationModule.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.57/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_57/OpenTelemetryApInstrumentationModule.java @@ -19,7 +19,7 @@ public class OpenTelemetryApInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OpenTelemetryApInstrumentationModule() { - super("opentelemetry-api", "opentelemetry-api-1.57"); + super("opentelemetry_api", "opentelemetry_api_1.57"); } @Override diff --git a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java index 50645fb28985..b5d8cb40bf6a 100644 --- a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java +++ b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java @@ -20,7 +20,7 @@ public class WithSpanInstrumentationModule extends InstrumentationModule { public WithSpanInstrumentationModule() { - super("opentelemetry-extension-annotations", "opentelemetry-extension-annotations-1.0"); + super("opentelemetry_extension_annotations", "opentelemetry_extension_annotations_1.0"); } @Override diff --git a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentationModule.java b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentationModule.java index 4e9c7f3dbde9..65da464a5ed2 100644 --- a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentationModule.java +++ b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentationModule.java @@ -18,7 +18,7 @@ public class ContextExtensionInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ContextExtensionInstrumentationModule() { - super("opentelemetry-extension-kotlin", "opentelemetry-extension-kotlin-1.0"); + super("opentelemetry_extension_kotlin", "opentelemetry_extension_kotlin_1.0"); } @Override diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java index 3b61339de0ae..4fca579997f4 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java @@ -25,8 +25,8 @@ public class AnnotationInstrumentationModule extends InstrumentationModule { public AnnotationInstrumentationModule() { super( - "opentelemetry-instrumentation-annotations", - "opentelemetry-instrumentation-annotations-1.16", + "opentelemetry_instrumentation_annotations", + "opentelemetry_instrumentation_annotations_1.16", "annotations"); } diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts b/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts index 7e2f7a7bd899..c2e18129c09c 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/build.gradle.kts @@ -14,7 +14,7 @@ muzzle { // if you want to test them anyways, comment out "alpha" from the exclusions in AcceptableVersions.kt versions.set("[1.14.0-alpha,)") assertInverse.set(true) - excludeInstrumentationName("opentelemetry-api") + excludeInstrumentationName("opentelemetry_api") } } diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/InstrumentationApiInstrumentationModule.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/InstrumentationApiInstrumentationModule.java index e6754cb818fe..9a21f1c80f45 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/InstrumentationApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/InstrumentationApiInstrumentationModule.java @@ -20,7 +20,7 @@ public class InstrumentationApiInstrumentationModule extends InstrumentationModu implements ExperimentalInstrumentationModule { public InstrumentationApiInstrumentationModule() { - super("opentelemetry-instrumentation-api"); + super("opentelemetry_instrumentation_api"); } @Override diff --git a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentationModule.java b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentationModule.java index faf8d1c9a1b2..060dc94d84ec 100644 --- a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentationModule.java +++ b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class AgentSpanTestingInstrumentationModule extends InstrumentationModule { public AgentSpanTestingInstrumentationModule() { - super("agent-span-testing"); + super("agent_span_testing"); } @Override diff --git a/instrumentation/oracle-ucp-11.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oracleucp/v11_2/OracleUcpInstrumentationModule.java b/instrumentation/oracle-ucp-11.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oracleucp/v11_2/OracleUcpInstrumentationModule.java index 4f3b6f1e5a94..c26bf8041dd3 100644 --- a/instrumentation/oracle-ucp-11.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oracleucp/v11_2/OracleUcpInstrumentationModule.java +++ b/instrumentation/oracle-ucp-11.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oracleucp/v11_2/OracleUcpInstrumentationModule.java @@ -18,7 +18,7 @@ public class OracleUcpInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public OracleUcpInstrumentationModule() { - super("oracle-ucp", "oracle-ucp-11.2"); + super("oracle_ucp", "oracle_ucp_11.2"); } @Override diff --git a/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java b/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java index bbe976063531..ae3b5d7539bc 100644 --- a/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java +++ b/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java @@ -6,9 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.oshi; import com.google.auto.service.AutoService; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; import io.opentelemetry.javaagent.extension.AgentListener; -import io.opentelemetry.javaagent.tooling.config.AgentConfig; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; import java.lang.reflect.Method; @@ -21,11 +20,7 @@ public class OshiMetricsInstaller implements AgentListener { @Override public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) { - boolean enabled = - DeclarativeConfigUtil.getInstrumentationConfig( - autoConfiguredSdk.getOpenTelemetrySdk(), "oshi") - .getBoolean("enabled", AgentConfig.instrumentationMode().equals("default")); - if (!enabled) { + if (!AgentEnabledInstrumentations.get().isEnabled("oshi")) { return; } diff --git a/instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorInstrumentationModule.java b/instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorInstrumentationModule.java index cf556822ce85..7fcbafae7de5 100644 --- a/instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorInstrumentationModule.java +++ b/instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class PekkoActorInstrumentationModule extends InstrumentationModule { public PekkoActorInstrumentationModule() { - super("pekko-actor", "pekko-actor-1.0"); + super("pekko_actor", "pekko_actor_1.0"); } @Override diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts b/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts index f6719949eb8e..5fa8240477b1 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts @@ -10,7 +10,7 @@ muzzle { versions.set("[1.0,)") assertInverse.set(true) extraDependency("org.apache.pekko:pekko-stream_2.12:1.0.1") - excludeInstrumentationName("tapir-pekko-http-server") + excludeInstrumentationName("tapir_pekko_http_server") } pass { group.set("org.apache.pekko") @@ -18,7 +18,7 @@ muzzle { versions.set("[1.0,)") assertInverse.set(true) extraDependency("org.apache.pekko:pekko-stream_2.13:1.0.1") - excludeInstrumentationName("tapir-pekko-http-server") + excludeInstrumentationName("tapir_pekko_http_server") } pass { group.set("org.apache.pekko") @@ -26,28 +26,28 @@ muzzle { versions.set("[1.0,)") assertInverse.set(true) extraDependency("org.apache.pekko:pekko-stream_3:1.0.1") - excludeInstrumentationName("tapir-pekko-http-server") + excludeInstrumentationName("tapir_pekko_http_server") } pass { group.set("com.softwaremill.sttp.tapir") module.set("tapir-pekko-http-server_2.12") versions.set("[1.7,)") assertInverse.set(true) - excludeInstrumentationName("pekko-http-server") + excludeInstrumentationName("pekko_http_server") } pass { group.set("com.softwaremill.sttp.tapir") module.set("tapir-pekko-http-server_2.13") versions.set("[1.7,)") assertInverse.set(true) - excludeInstrumentationName("pekko-http-server") + excludeInstrumentationName("pekko_http_server") } pass { group.set("com.softwaremill.sttp.tapir") module.set("tapir-pekko-http-server_3") versions.set("[1.7,)") assertInverse.set(true) - excludeInstrumentationName("pekko-http-server") + excludeInstrumentationName("pekko_http_server") } } diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/client/PekkoHttpClientInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/client/PekkoHttpClientInstrumentationModule.java index 015b17fe7780..b764f6fc1d5c 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/client/PekkoHttpClientInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/client/PekkoHttpClientInstrumentationModule.java @@ -17,7 +17,7 @@ public class PekkoHttpClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PekkoHttpClientInstrumentationModule() { - super("pekko-http", "pekko-http-1.0", "pekko-http-client"); + super("pekko_http", "pekko_http_1.0", "pekko_http_client"); } @Override diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java index 2aaf5cac7f01..07ef9e5b5878 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerInstrumentationModule.java @@ -19,7 +19,7 @@ public class PekkoHttpServerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PekkoHttpServerInstrumentationModule() { - super("pekko-http", "pekko-http-1.0", "pekko-http-server"); + super("pekko_http", "pekko_http_1.0", "pekko_http_server"); } @Override diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java index e0359f069ace..5da0b70abb6e 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoHttpServerRouteInstrumentationModule.java @@ -21,7 +21,7 @@ public class PekkoHttpServerRouteInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PekkoHttpServerRouteInstrumentationModule() { - super("pekko-http", "pekko-http-1.0", "pekko-http-server", "pekko-http-server-route"); + super("pekko_http", "pekko_http_1.0", "pekko_http_server", "pekko_http_server_route"); } @Override diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java index 15aa36dac64c..d64883918564 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/tapir/TapirPekkoHttpServerRouteInstrumentationModule.java @@ -18,12 +18,12 @@ public class TapirPekkoHttpServerRouteInstrumentationModule extends Instrumentat implements ExperimentalInstrumentationModule { public TapirPekkoHttpServerRouteInstrumentationModule() { super( - "pekko-http", - "pekko-http-1.0", - "pekko-http-server", - "pekko-http-server-route", - "tapir-pekko-http-server", - "tapir-pekko-http-server-route"); + "pekko_http", + "pekko_http_1.0", + "pekko_http_server", + "pekko_http_server_route", + "tapir_pekko_http_server", + "tapir_pekko_http_server_route"); } @Override diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java index 77519a065c91..520163aec2f2 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java @@ -20,7 +20,7 @@ public class PlayInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PlayInstrumentationModule() { - super("play-mvc", "play-mvc-2.4", "play"); + super("play_mvc", "play_mvc_2.4", "play"); } @Override diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java index dccbd68da2a5..acc7289b72d8 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java +++ b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java @@ -18,7 +18,7 @@ public class PlayInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PlayInstrumentationModule() { - super("play-mvc", "play-mvc-2.6", "play"); + super("play_mvc", "play_mvc_2.6", "play"); } @Override diff --git a/instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java b/instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java index bc0ae3ec7780..b1ad8b08defc 100644 --- a/instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java +++ b/instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java @@ -30,7 +30,7 @@ public class PlayWsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PlayWsInstrumentationModule() { - super("play-ws", "play-ws-1.0"); + super("play_ws", "play_ws_1.0"); } @Override diff --git a/instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java b/instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java index 1ceb6ecfe6e9..70e7fe6c08d1 100644 --- a/instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java +++ b/instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java @@ -31,7 +31,7 @@ public class PlayWsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PlayWsInstrumentationModule() { - super("play-ws", "play-ws-2.0"); + super("play_ws", "play_ws_2.0"); } @Override diff --git a/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java b/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java index 2aa2092eee81..f879b6c6b890 100644 --- a/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java +++ b/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java @@ -31,7 +31,7 @@ public class PlayWsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PlayWsInstrumentationModule() { - super("play-ws", "play-ws-2.1"); + super("play_ws", "play_ws_2.1"); } @Override diff --git a/instrumentation/powerjob-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobInstrumentationModule.java b/instrumentation/powerjob-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobInstrumentationModule.java index 42dffd25921b..2b764e800011 100644 --- a/instrumentation/powerjob-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobInstrumentationModule.java +++ b/instrumentation/powerjob-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobInstrumentationModule.java @@ -16,7 +16,7 @@ public class PowerJobInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PowerJobInstrumentationModule() { - super("powerjob", "powerjob-4.0"); + super("powerjob", "powerjob_4.0"); } @Override diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java index 9a8018e3770d..db50a8ebbddd 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java @@ -16,7 +16,7 @@ public class PulsarInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public PulsarInstrumentationModule() { - super("pulsar", "pulsar-2.8"); + super("pulsar", "pulsar_2.8"); } @Override diff --git a/instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/QuarkusResteasyReactiveInstrumentationModule.java b/instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/QuarkusResteasyReactiveInstrumentationModule.java index 1a1be882bde4..ef26b1bb4fe6 100644 --- a/instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/QuarkusResteasyReactiveInstrumentationModule.java +++ b/instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/QuarkusResteasyReactiveInstrumentationModule.java @@ -16,7 +16,7 @@ public class QuarkusResteasyReactiveInstrumentationModule extends InstrumentationModule { public QuarkusResteasyReactiveInstrumentationModule() { - super("quarkus", "jaxrs", "quarkus-resteasy-reactive", "quarkus-resteasy-reactive-3.0"); + super("quarkus", "jaxrs", "quarkus_resteasy_reactive", "quarkus_resteasy_reactive_3.0"); } @Override diff --git a/instrumentation/quartz-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quartz/v2_0/QuartzInstrumentationModule.java b/instrumentation/quartz-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quartz/v2_0/QuartzInstrumentationModule.java index 3472e7764028..c25723f1dae2 100644 --- a/instrumentation/quartz-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quartz/v2_0/QuartzInstrumentationModule.java +++ b/instrumentation/quartz-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quartz/v2_0/QuartzInstrumentationModule.java @@ -17,7 +17,7 @@ public class QuartzInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public QuartzInstrumentationModule() { - super("quartz", "quartz-2.0"); + super("quartz", "quartz_2.0"); } @Override diff --git a/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcInstrumentationModule.java b/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcInstrumentationModule.java index 50e31f32b14a..3decd368b02f 100644 --- a/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcInstrumentationModule.java +++ b/instrumentation/r2dbc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcInstrumentationModule.java @@ -17,7 +17,7 @@ public class R2dbcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public R2dbcInstrumentationModule() { - super("r2dbc", "r2dbc-1.0"); + super("r2dbc", "r2dbc_1.0"); } @Override diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java index e1876017c0e2..75ab0314d0cf 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java @@ -17,7 +17,7 @@ public class RabbitMqInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RabbitMqInstrumentationModule() { - super("rabbitmq", "rabbitmq-2.7"); + super("rabbitmq", "rabbitmq_2.7"); } @Override diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java b/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java index 4d3140b1d80c..36473bd3afb8 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java @@ -17,7 +17,7 @@ public class RatpackInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RatpackInstrumentationModule() { - super("ratpack", "ratpack-1.4"); + super("ratpack", "ratpack_1.4"); } @Override diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java index d73f4eeaaaf5..ad2239f979f1 100644 --- a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java +++ b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java @@ -19,7 +19,7 @@ public class RatpackInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RatpackInstrumentationModule() { - super("ratpack", "ratpack-1.7"); + super("ratpack", "ratpack_1.7"); } @Override diff --git a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts index e53ec2d92031..a8289ee3dba1 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts @@ -9,7 +9,7 @@ muzzle { versions.set("[3.1.0.RELEASE,)") extraDependency("io.opentelemetry:opentelemetry-api:1.0.0") assertInverse.set(true) - excludeInstrumentationName("opentelemetry-api") + excludeInstrumentationName("opentelemetry_api") } } diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java index 22a1571a62d6..772d6735924c 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ReactorInstrumentationModule.java @@ -18,7 +18,7 @@ public class ReactorInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ReactorInstrumentationModule() { - super("reactor", "reactor-3.1"); + super("reactor", "reactor_3.1"); } @Override diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java index 9dca1677c555..09aec25ef74b 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentationModule.java @@ -20,7 +20,7 @@ public class ContextPropagationOperatorInstrumentationModule extends Instrumenta implements ExperimentalInstrumentationModule { public ContextPropagationOperatorInstrumentationModule() { - super("reactor", "reactor-3.1", "reactor-context-propagation-operator"); + super("reactor", "reactor_3.1", "reactor_context_propagation_operator"); } @Override diff --git a/instrumentation/reactor/reactor-3.4/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.4/javaagent/build.gradle.kts index adc48103a8c9..f5cfee221a9e 100644 --- a/instrumentation/reactor/reactor-3.4/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.4/javaagent/build.gradle.kts @@ -9,7 +9,7 @@ muzzle { versions.set("[3.4.0,)") extraDependency("io.opentelemetry:opentelemetry-api:1.0.0") assertInverse.set(true) - excludeInstrumentationName("opentelemetry-api") + excludeInstrumentationName("opentelemetry_api") } } diff --git a/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java b/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java index ce14821c0e54..088615a9b372 100644 --- a/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java +++ b/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34InstrumentationModule.java @@ -20,7 +20,7 @@ public class ContextPropagationOperator34InstrumentationModule extends Instrumen implements ExperimentalInstrumentationModule { public ContextPropagationOperator34InstrumentationModule() { - super("reactor", "reactor-3.4", "reactor-context-propagation-operator"); + super("reactor", "reactor_3.4", "reactor_context_propagation_operator"); } @Override diff --git a/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaInstrumentationModule.java b/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaInstrumentationModule.java index 60682bcfd536..7e63eddb8cc8 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaInstrumentationModule.java +++ b/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaInstrumentationModule.java @@ -18,7 +18,7 @@ public class ReactorKafkaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ReactorKafkaInstrumentationModule() { - super("reactor-kafka", "reactor-kafka-1.0"); + super("reactor_kafka", "reactor_kafka_1.0"); } @Override diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java index cbdca1728ecd..1316a8c50a9f 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java @@ -29,7 +29,7 @@ public class ReactorNettyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ReactorNettyInstrumentationModule() { - super("reactor-netty", "reactor-netty-0.9"); + super("reactor_netty", "reactor_netty_0.9"); } @Override diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java index 6e9a34ac0b9f..21b063bcbd9c 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java @@ -30,7 +30,7 @@ public class ReactorNettyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ReactorNettyInstrumentationModule() { - super("reactor-netty", "reactor-netty-1.0"); + super("reactor_netty", "reactor_netty_1.0"); } @Override diff --git a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java index a352c18a267e..6884e5784b3f 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java +++ b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java @@ -18,7 +18,7 @@ public class RediscalaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RediscalaInstrumentationModule() { - super("rediscala", "rediscala-1.8"); + super("rediscala", "rediscala_1.8"); } @Override diff --git a/instrumentation/redisson/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_0/RedissonInstrumentationModule.java b/instrumentation/redisson/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_0/RedissonInstrumentationModule.java index b3e6603b9389..fd021dae4d76 100644 --- a/instrumentation/redisson/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_0/RedissonInstrumentationModule.java +++ b/instrumentation/redisson/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_0/RedissonInstrumentationModule.java @@ -21,7 +21,7 @@ public class RedissonInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RedissonInstrumentationModule() { - super("redisson", "redisson-3.0"); + super("redisson", "redisson_3.0"); } @Override diff --git a/instrumentation/redisson/redisson-3.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_17/RedissonInstrumentationModule.java b/instrumentation/redisson/redisson-3.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_17/RedissonInstrumentationModule.java index e28f6336346b..6551a8299a6c 100644 --- a/instrumentation/redisson/redisson-3.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_17/RedissonInstrumentationModule.java +++ b/instrumentation/redisson/redisson-3.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_17/RedissonInstrumentationModule.java @@ -20,7 +20,7 @@ public class RedissonInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RedissonInstrumentationModule() { - super("redisson", "redisson-3.17"); + super("redisson", "redisson_3.17"); } @Override diff --git a/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java b/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java index 3910864551fe..1208909f9c93 100644 --- a/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java +++ b/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java @@ -17,7 +17,7 @@ public class RestletInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RestletInstrumentationModule() { - super("restlet", "restlet-1.1"); + super("restlet", "restlet_1.1"); } @Override diff --git a/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletInstrumentationModule.java b/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletInstrumentationModule.java index 0afe7b787562..91c895dc73ef 100644 --- a/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletInstrumentationModule.java +++ b/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletInstrumentationModule.java @@ -17,7 +17,7 @@ public class RestletInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RestletInstrumentationModule() { - super("restlet", "restlet-2.0"); + super("restlet", "restlet_2.0"); } @Override diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java index a60b3637ffd2..c58d56473d5e 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java @@ -18,7 +18,7 @@ public class RmiClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RmiClientInstrumentationModule() { - super("rmi", "rmi-client"); + super("rmi", "rmi_client"); } @Override diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java index 89b57b22cd3d..50765d7ee7f7 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java @@ -24,7 +24,7 @@ public class RmiContextPropagationInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RmiContextPropagationInstrumentationModule() { - super("rmi", "rmi-context-propagation"); + super("rmi", "rmi_context_propagation"); } @Override diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentationModule.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentationModule.java index 8bdaba4be2ef..fe5189d11e85 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentationModule.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentationModule.java @@ -18,7 +18,7 @@ public class RmiServerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public RmiServerInstrumentationModule() { - super("rmi", "rmi-server"); + super("rmi", "rmi_server"); } @Override diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v4_8/RocketMqInstrumentationModule.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v4_8/RocketMqInstrumentationModule.java index d36914f099da..aef962be83a8 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v4_8/RocketMqInstrumentationModule.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v4_8/RocketMqInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class RocketMqInstrumentationModule extends InstrumentationModule { public RocketMqInstrumentationModule() { - super("rocketmq-client", "rocketmq-client-4.8"); + super("rocketmq_client", "rocketmq_client_4.8"); } @Override diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumentationModule.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumentationModule.java index af1fa81b0e49..32e07a267e64 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumentationModule.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public final class RocketMqInstrumentationModule extends InstrumentationModule { public RocketMqInstrumentationModule() { - super("rocketmq-client", "rocketmq-client-5.0"); + super("rocketmq_client", "rocketmq_client_5.0"); } @Override diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/Java17RuntimeMetricsInstaller.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/Java17RuntimeMetricsInstaller.java index ba2b1d0de1e2..c3b696813743 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/Java17RuntimeMetricsInstaller.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/Java17RuntimeMetricsInstaller.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics; import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RuntimeMetricsConfigUtil; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; import io.opentelemetry.javaagent.extension.AgentListener; -import io.opentelemetry.javaagent.tooling.config.AgentConfig; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; /** An {@link AgentListener} that enables runtime metrics during agent startup. */ @@ -23,7 +23,7 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) { RuntimeMetricsConfigUtil.configure( RuntimeMetrics.builder(GlobalOpenTelemetry.get()), GlobalOpenTelemetry.get(), - AgentConfig.instrumentationMode()); + AgentEnabledInstrumentations.get()); if (runtimeMetrics != null) { Runtime.getRuntime() .addShutdownHook( diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/RuntimeMetricsConfigUtil.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/RuntimeMetricsConfigUtil.java index 221e1e86db89..d408fcffe4e7 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/RuntimeMetricsConfigUtil.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/RuntimeMetricsConfigUtil.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.runtimemetrics.java17.internal; import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics; import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetricsBuilder; @@ -20,7 +21,9 @@ private RuntimeMetricsConfigUtil() {} @Nullable public static RuntimeMetrics configure( - RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, String instrumentationMode) { + RuntimeMetricsBuilder builder, + OpenTelemetry openTelemetry, + EnabledInstrumentations enabledInstrumentations) { /* By default, don't use any JFR metrics. May change this once semantic conventions are updated. If enabled, default to only the metrics not already covered by runtime-telemetry-java8 @@ -28,17 +31,16 @@ public static RuntimeMetrics configure( if (DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry_java17") .getBoolean("enable_all", false)) { builder.enableAllFeatures(); - } else if (DeclarativeConfigUtil.getInstrumentationConfig( - openTelemetry, "runtime_telemetry_java17") - .getBoolean("enabled", false)) { + } else if (enabledInstrumentations.isEnabledExplicitly("runtime_telemetry_java17")) { // default configuration - } else if (DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry") - .getBoolean("enabled", instrumentationMode.equals("default"))) { - // This only uses metrics gathered by JMX - builder.disableAllFeatures(); } else { - // nothing is enabled - return null; + if (enabledInstrumentations.isEnabled("runtime_telemetry")) { + // This only uses metrics gathered by JMX + builder.disableAllFeatures(); + } else { + // nothing is enabled + return null; + } } if (DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry") diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java b/instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java index 4b6a8c5b7030..9c5851fa0b4c 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics; import io.opentelemetry.instrumentation.runtimemetrics.java8.internal.RuntimeMetricsConfigUtil; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; import io.opentelemetry.javaagent.extension.AgentListener; -import io.opentelemetry.javaagent.tooling.config.AgentConfig; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; /** An {@link AgentListener} that enables runtime metrics during agent startup. */ @@ -27,7 +27,7 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) { RuntimeMetricsConfigUtil.configure( RuntimeMetrics.builder(GlobalOpenTelemetry.get()), GlobalOpenTelemetry.get(), - AgentConfig.instrumentationMode()); + AgentEnabledInstrumentations.get()); if (runtimeMetrics != null) { Runtime.getRuntime() .addShutdownHook( diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts index 24be66977afe..05a5e1ba96c2 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - implementation(project(":instrumentation-api")) + implementation(project(":instrumentation-api-incubator")) } diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/RuntimeMetricsConfigUtil.java b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/RuntimeMetricsConfigUtil.java index d6c913d3018c..223e73906293 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/RuntimeMetricsConfigUtil.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/RuntimeMetricsConfigUtil.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.runtimemetrics.java8.internal; import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties; import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics; @@ -21,14 +22,18 @@ private RuntimeMetricsConfigUtil() {} @Nullable public static RuntimeMetrics configure( - RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, String instrumentationMode) { - ExtendedDeclarativeConfigProperties config = - DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry"); - if (!config.getBoolean("enabled", instrumentationMode.equals("default"))) { + RuntimeMetricsBuilder builder, + OpenTelemetry openTelemetry, + EnabledInstrumentations enabledInstrumentations) { + + if (!enabledInstrumentations.isEnabled("runtime_telemetry")) { // nothing is enabled return null; } + ExtendedDeclarativeConfigProperties config = + DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry"); + if (config.getBoolean("emit_experimental_telemetry/development", false)) { builder.emitExperimentalTelemetry(); } diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJava2InstrumentationModule.java b/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJava2InstrumentationModule.java index 3739dd3b06d4..e46e627ca224 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJava2InstrumentationModule.java +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJava2InstrumentationModule.java @@ -15,7 +15,7 @@ public class RxJava2InstrumentationModule extends InstrumentationModule { public RxJava2InstrumentationModule() { - super("rxjava", "rxjava-2.0"); + super("rxjava", "rxjava_2.0"); } @Override diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3InstrumentationModule.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3InstrumentationModule.java index 0be02c91a98d..ef5d489e0f8c 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3InstrumentationModule.java +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3InstrumentationModule.java @@ -18,7 +18,7 @@ public class RxJava3InstrumentationModule extends InstrumentationModule { public RxJava3InstrumentationModule() { - super("rxjava", "rxjava-3.0"); + super("rxjava", "rxjava_3.0"); } @Override diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJava3InstrumentationModule.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJava3InstrumentationModule.java index b3d58b9c36bd..d8597bf33fdb 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJava3InstrumentationModule.java +++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJava3InstrumentationModule.java @@ -18,7 +18,7 @@ public class RxJava3InstrumentationModule extends InstrumentationModule { public RxJava3InstrumentationModule() { - super("rxjava", "rxjava-3.1.1"); + super("rxjava", "rxjava_3.1.1"); } @Override diff --git a/instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java b/instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java index ab71ab8f18a8..252adb0fc928 100644 --- a/instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java +++ b/instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java @@ -15,7 +15,7 @@ @AutoService(InstrumentationModule.class) public class ScalaConcurrentInstrumentationModule extends InstrumentationModule { public ScalaConcurrentInstrumentationModule() { - super("scala-fork-join", "scala-fork-join-2.8"); + super("scala_fork_join", "scala_fork_join_2.8"); } @Override diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java index fdb077791d08..92e6f41e4e32 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java @@ -24,7 +24,7 @@ public class Servlet2InstrumentationModule extends InstrumentationModule private static final String BASE_PACKAGE = "javax.servlet"; public Servlet2InstrumentationModule() { - super("servlet", "servlet-2.2"); + super("servlet", "servlet_2.2"); } // this is required to make sure servlet 2 instrumentation won't apply to servlet 3 diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java index e6ac70933b6d..09836d1cc3e1 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java @@ -27,7 +27,7 @@ public class Servlet3InstrumentationModule extends InstrumentationModule private static final String BASE_PACKAGE = "javax.servlet"; public Servlet3InstrumentationModule() { - super("servlet", "servlet-3.0"); + super("servlet", "servlet_3.0"); } @Override diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/JakartaServletInstrumentationModule.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/JakartaServletInstrumentationModule.java index 2b65851a1953..5994eb2e7830 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/JakartaServletInstrumentationModule.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/JakartaServletInstrumentationModule.java @@ -24,7 +24,7 @@ public class JakartaServletInstrumentationModule extends InstrumentationModule private static final String BASE_PACKAGE = "jakarta.servlet"; public JakartaServletInstrumentationModule() { - super("servlet", "servlet-5.0"); + super("servlet", "servlet_5.0"); } @Override diff --git a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java index 6e78dbc6292e..37ad192fb831 100644 --- a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java +++ b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java @@ -16,7 +16,7 @@ public class SparkInstrumentationModule extends InstrumentationModule { public SparkInstrumentationModule() { - super("spark", "spark-2.3"); + super("spark", "spark_2.3"); } @Override diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/SpringBatchInstrumentationModule.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/SpringBatchInstrumentationModule.java index 9956d5c06ba7..e891cdea9679 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/SpringBatchInstrumentationModule.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/SpringBatchInstrumentationModule.java @@ -28,7 +28,7 @@ public class SpringBatchInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringBatchInstrumentationModule() { - super("spring-batch", "spring-batch-3.0"); + super("spring_batch", "spring_batch_3.0"); } @Override diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java index 3a6d0305c14e..f443c5a4cdd2 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java @@ -24,8 +24,8 @@ public class SpringBootActuatorInstrumentationModule extends InstrumentationModu public SpringBootActuatorInstrumentationModule() { super( - "spring-boot-actuator-autoconfigure", - "spring-boot-actuator-autoconfigure-2.0", + "spring_boot_actuator_autoconfigure", + "spring_boot_actuator_autoconfigure_2.0", // share the instrumentation name with MicrometerInstrumentationModule to lessen the users' // confusion "micrometer"); diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/EarlyConfig.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/EarlyConfig.java index 19a64749a5b9..5da19d3d1e47 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/EarlyConfig.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/EarlyConfig.java @@ -5,7 +5,12 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.internal; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; +import static java.util.Collections.emptyList; + +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; +import java.util.List; +import javax.annotation.Nullable; +import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; /** @@ -18,7 +23,7 @@ private EarlyConfig() {} public static boolean otelEnabled(Environment environment) { boolean disabled = environment.getProperty( - getPropertyName(environment, "otel.sdk.disabled", "otel.disabled"), + isDeclarativeConfig(environment) ? "otel.disabled" : "otel.sdk.disabled", Boolean.class, false); return !disabled; @@ -28,26 +33,61 @@ public static boolean isDeclarativeConfig(Environment environment) { return environment.getProperty("otel.file_format", String.class) != null; } - public static boolean isDefaultEnabled(Environment environment) { + public static EnabledInstrumentations getEnabledInstrumentations( + ConfigurableEnvironment environment) { if (isDeclarativeConfig(environment)) { - String mode = - environment.getProperty( - "otel.instrumentation/development.java.spring_starter.instrumentation_mode", - String.class, - "default"); + return new EnabledInstrumentations() { + @SuppressWarnings( + "unchecked") // Spring's Environment.getProperty with List.class returns a raw List + @Nullable + @Override + public Boolean getEnabled(String instrumentationName) { + List enabled = + environment.getProperty( + "otel.distribution.spring_starter.instrumentation.enabled", + List.class, + emptyList()); + if (enabled.contains(instrumentationName)) { + return true; + } - switch (mode) { - case "none": - return false; - case "default": - return true; - default: - throw new ConfigurationException("Unknown instrumentation mode: " + mode); - } - } else { - return environment.getProperty( - "otel.instrumentation.common.default-enabled", Boolean.class, true); + List disabled = + environment.getProperty( + "otel.distribution.spring_starter.instrumentation.disabled", + List.class, + emptyList()); + if (disabled.contains(instrumentationName)) { + return false; + } + + return null; + } + + @Override + public boolean isDefaultEnabled() { + return environment.getProperty( + "otel.distribution.spring_starter.instrumentation.default_enabled", + Boolean.class, + true); + } + }; } + + return new EnabledInstrumentations() { + @Nullable + @Override + public Boolean getEnabled(String instrumentationName) { + return environment.getProperty( + String.format("otel.instrumentation.%s.enabled", instrumentationName.replace('_', '-')), + Boolean.class); + } + + @Override + public boolean isDefaultEnabled() { + return environment.getProperty( + "otel.instrumentation.common.default-enabled", Boolean.class, true); + } + }; } public static String translatePropertyName(Environment environment, String name) { @@ -69,26 +109,4 @@ public static String translatePropertyName(Environment environment, String name) private static String toSnakeCase(String string) { return string.replace('-', '_'); } - - public static boolean isInstrumentationEnabled( - Environment environment, String name, boolean defaultValue) { - String property = - getPropertyName( - environment, - String.format("otel.instrumentation.%s.enabled", name), - String.format("otel.instrumentation/development.java.%s.enabled", toSnakeCase(name))); - Boolean explicit = environment.getProperty(property, Boolean.class); - if (explicit != null) { - return explicit; - } - if (!defaultValue) { - return false; - } - return isDefaultEnabled(environment); - } - - private static String getPropertyName( - Environment environment, String propertyBased, String declarative) { - return isDeclarativeConfig(environment) ? declarative : propertyBased; - } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationPropertyEnabled.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationPropertyEnabled.java index 20adfe80fffb..38811b3f9005 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationPropertyEnabled.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationPropertyEnabled.java @@ -7,10 +7,12 @@ import static java.util.Objects.requireNonNull; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import java.util.Map; import java.util.Objects; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; +import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -25,9 +27,15 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) Objects.requireNonNull( metadata.getAnnotationAttributes(ConditionalOnEnabledInstrumentation.class.getName())); - return EarlyConfig.isInstrumentationEnabled( - context.getEnvironment(), - requireNonNull(attributes.get("module")).toString(), - (boolean) requireNonNull(attributes.get("enabledByDefault"))); + String name = requireNonNull(attributes.get("module")).toString(); + boolean enabledByDefault = (boolean) requireNonNull(attributes.get("enabledByDefault")); + EnabledInstrumentations enabledInstrumentations = + EarlyConfig.getEnabledInstrumentations((ConfigurableEnvironment) context.getEnvironment()); + + Boolean enabled = enabledInstrumentations.getEnabled(name); + if (enabled != null) { + return enabled; + } + return enabledByDefault && enabledInstrumentations.isDefaultEnabled(); } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java index cf4eea4b60e4..b98f67fc9bb7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java @@ -44,17 +44,17 @@ static void install(ApplicationEnvironmentPreparedEvent applicationEnvironmentPr } private static boolean isLogbackAppenderAddable(ApplicationEnvironmentPreparedEvent event) { - return isAppenderAddable(event, "logback-appender"); + return isAppenderAddable(event, "logback_appender"); } private static boolean isLogbackMdcAppenderAddable(ApplicationEnvironmentPreparedEvent event) { - return isAppenderAddable(event, "logback-mdc"); + return isAppenderAddable(event, "logback_mdc"); } private static boolean isAppenderAddable(ApplicationEnvironmentPreparedEvent event, String name) { ConfigurableEnvironment environment = event.getEnvironment(); return EarlyConfig.otelEnabled(environment) - && EarlyConfig.isInstrumentationEnabled(environment, name, true); + && EarlyConfig.getEnabledInstrumentations(environment).isEnabled(name); } private static void reInitializeOpenTelemetryAppender( diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java index a640bde9aebb..ee714c5ad196 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java @@ -22,7 +22,7 @@ public class OpenTelemetryAppenderAutoConfiguration { public OpenTelemetryAppenderAutoConfiguration() {} - @ConditionalOnEnabledInstrumentation(module = "log4j-appender") + @ConditionalOnEnabledInstrumentation(module = "log4j_appender") @ConditionalOnClass(org.apache.logging.log4j.core.LoggerContext.class) @Configuration static class Log4jAppenderConfig { @@ -37,7 +37,7 @@ ApplicationListener log4jOtelAppenderInitializer( } } - @ConditionalOnEnabledInstrumentation(module = "logback-appender") + @ConditionalOnEnabledInstrumentation(module = "logback_appender") @ConditionalOnClass(ch.qos.logback.classic.LoggerContext.class) @Configuration static class LogbackAppenderConfig { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsProvider.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsProvider.java index 0616792fbf34..258070f7c56b 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsProvider.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics; import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics; import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RuntimeMetricsConfigUtil; import javax.annotation.Nullable; @@ -28,9 +29,10 @@ public int minJavaVersion() { @Nullable @Override - public AutoCloseable start(OpenTelemetry openTelemetry, String instrumentationMode) { + public AutoCloseable start( + OpenTelemetry openTelemetry, EnabledInstrumentations enabledInstrumentations) { logger.debug("Use runtime metrics instrumentation for Java 17+"); return RuntimeMetricsConfigUtil.configure( - RuntimeMetrics.builder(openTelemetry), openTelemetry, instrumentationMode); + RuntimeMetrics.builder(openTelemetry), openTelemetry, enabledInstrumentations); } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsProvider.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsProvider.java index 21425c9737b7..95979d1daaff 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsProvider.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics; import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics; import io.opentelemetry.instrumentation.runtimemetrics.java8.internal.RuntimeMetricsConfigUtil; import javax.annotation.Nullable; @@ -28,9 +29,10 @@ public int minJavaVersion() { @Nullable @Override - public AutoCloseable start(OpenTelemetry openTelemetry, String instrumentationMode) { + public AutoCloseable start( + OpenTelemetry openTelemetry, EnabledInstrumentations enabledInstrumentations) { logger.debug("Use runtime metrics instrumentation for Java 8"); return RuntimeMetricsConfigUtil.configure( - RuntimeMetrics.builder(openTelemetry), openTelemetry, instrumentationMode); + RuntimeMetrics.builder(openTelemetry), openTelemetry, enabledInstrumentations); } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsAutoConfiguration.java index 59c21691df7d..a50189222a7b 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsAutoConfiguration.java @@ -6,9 +6,8 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; +import io.opentelemetry.instrumentation.spring.autoconfigure.internal.EarlyConfig; import java.util.Comparator; import java.util.Optional; import javax.annotation.Nullable; @@ -26,7 +25,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "runtime-telemetry") +@ConditionalOnEnabledInstrumentation(module = "runtime_telemetry") @Configuration public class RuntimeMetricsAutoConfiguration { @@ -57,19 +56,13 @@ public void handleApplicationReadyEvent(ApplicationReadyEvent event) { if (metricsProvider.isPresent()) { this.closeable = - metricsProvider.get().start(openTelemetry, instrumentationMode(openTelemetry)); + metricsProvider + .get() + .start( + openTelemetry, + EarlyConfig.getEnabledInstrumentations(applicationContext.getEnvironment())); } else { logger.debug("No runtime metrics instrumentation available for Java {}", version); } } - - private static String instrumentationMode(OpenTelemetry openTelemetry) { - String mode = - DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "spring_starter") - .getString("instrumentation_mode", "default"); - if (!mode.equals("default") && !mode.equals("none")) { - throw new ConfigurationException("Unknown instrumentation mode: " + mode); - } - return mode; - } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsProvider.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsProvider.java index f6f85b21fea6..a376068ada8b 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsProvider.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics; import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import javax.annotation.Nullable; /** @@ -18,5 +19,5 @@ public interface RuntimeMetricsProvider { int minJavaVersion(); @Nullable - AutoCloseable start(OpenTelemetry openTelemetry, String instrumentationMode); + AutoCloseable start(OpenTelemetry openTelemetry, EnabledInstrumentations enabledInstrumentations); } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java index cfeae0637929..3f512fcad166 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java @@ -19,7 +19,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-scheduling") +@ConditionalOnEnabledInstrumentation(module = "spring_scheduling") @ConditionalOnClass({Scheduled.class, Aspect.class}) @Configuration class SpringSchedulingInstrumentationAutoConfiguration { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/thread/ThreadDetailsAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/thread/ThreadDetailsAutoConfiguration.java index 91a0049a7dc8..1af712582301 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/thread/ThreadDetailsAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/thread/ThreadDetailsAutoConfiguration.java @@ -5,17 +5,26 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.thread; -import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.instrumentation.spring.autoconfigure.internal.EarlyConfig; +import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelEnabled; import io.opentelemetry.instrumentation.thread.internal.AddThreadDetailsSpanProcessor; import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Condition; +import org.springframework.context.annotation.ConditionContext; +import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.core.type.AnnotatedTypeMetadata; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -@ConditionalOnEnabledInstrumentation(module = "common.thread-details", enabledByDefault = false) +@ConditionalOnBean(OpenTelemetry.class) +@Conditional({OtelEnabled.class, ThreadDetailsAutoConfiguration.ThreadDetailsEnabled.class}) @Configuration public class ThreadDetailsAutoConfiguration { @@ -28,4 +37,16 @@ public AutoConfigurationCustomizerProvider threadDetailOtelCustomizer() { return builder; }); } + + static class ThreadDetailsEnabled implements Condition { + @Override + public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { + Environment environment = context.getEnvironment(); + String key = + EarlyConfig.isDeclarativeConfig(environment) + ? "otel.instrumentation/development.java.common.thread_details.enabled" + : "otel.instrumentation.common.thread-details.enabled"; + return environment.getProperty(key, Boolean.class, false); + } + } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java index 10e9178c2e12..4577d2053f1c 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java @@ -22,7 +22,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-web") +@ConditionalOnEnabledInstrumentation(module = "spring_web") @ConditionalOnClass({RestTemplate.class, RestTemplateCustomizer.class}) @Configuration public class SpringWebInstrumentationAutoConfiguration { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java index 93e9a1fde417..b252ab0f5ec0 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java @@ -22,7 +22,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-webflux") +@ConditionalOnEnabledInstrumentation(module = "spring_webflux") @ConditionalOnClass(WebClient.class) @Configuration public class SpringWebfluxInstrumentationAutoConfiguration { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java index 8e47a741b7f8..232faed37ec5 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java @@ -21,7 +21,7 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-webmvc") +@ConditionalOnEnabledInstrumentation(module = "spring_webmvc") @ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class}) @Configuration public class SpringWebMvc5InstrumentationAutoConfiguration { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java index 3501b65e1b67..209dba78c119 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java @@ -24,7 +24,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-web") +@ConditionalOnEnabledInstrumentation(module = "spring_web") @ConditionalOnClass({RestClient.class, RestClientCustomizer.class}) @AutoConfiguration(after = RestClientAutoConfiguration.class) @Configuration diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java index 84e553dfeb6b..87751b4d04ee 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java @@ -21,7 +21,7 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-webmvc") +@ConditionalOnEnabledInstrumentation(module = "spring_webmvc") @ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class}) @Configuration public class SpringWebMvc6InstrumentationAutoConfiguration { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationSpringBoot4AutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationSpringBoot4AutoConfiguration.java index c1415e3ab8ff..1cef01dc7911 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationSpringBoot4AutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationSpringBoot4AutoConfiguration.java @@ -24,7 +24,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-web") +@ConditionalOnEnabledInstrumentation(module = "spring_web") @ConditionalOnClass({RestClient.class, RestClientCustomizer.class}) @AutoConfiguration(after = RestClientAutoConfiguration.class) @Configuration diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationSpringBoot4AutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationSpringBoot4AutoConfiguration.java index 77b15036c6b1..ea1008678d54 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationSpringBoot4AutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationSpringBoot4AutoConfiguration.java @@ -22,7 +22,7 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@ConditionalOnEnabledInstrumentation(module = "spring-web") +@ConditionalOnEnabledInstrumentation(module = "spring_web") @ConditionalOnClass({RestTemplate.class, RestTemplateCustomizer.class}) @Configuration public class SpringWebInstrumentationSpringBoot4AutoConfiguration { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java index da76066daa51..f8ea4a618c24 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java @@ -101,7 +101,7 @@ void shouldNotLoadInstrumentationWhenDefaultIsDisabled() { .withConfiguration(AutoConfigurations.of(SpringWebInstrumentationAutoConfiguration.class)) .withPropertyValues( "otel.file_format=1.0-rc.1", - "otel.instrumentation/development.java.spring_starter.instrumentation_mode=none") + "otel.distribution.spring_starter.instrumentation.default_enabled=false") .run(context -> assertThat(context).doesNotHaveBean("otelRestTemplateBeanPostProcessor")); } @@ -111,8 +111,8 @@ void shouldLoadInstrumentationWhenExplicitlyEnabled() { .withConfiguration(AutoConfigurations.of(SpringWebInstrumentationAutoConfiguration.class)) .withPropertyValues( "otel.file_format=1.0-rc.1", - "otel.instrumentation/development.java.spring_starter.instrumentation_mode=none", - "otel.instrumentation/development.java.spring_web.enabled=true") + "otel.distribution.spring_starter.instrumentation.default_enabled=false", + "otel.distribution.spring_starter.instrumentation.enabled=spring_web") .run(context -> assertThat(context).hasBean("otelRestTemplateBeanPostProcessor")); } @@ -122,8 +122,8 @@ void shouldNotLoadInstrumentationWhenExplicitlyDisabled() { .withConfiguration(AutoConfigurations.of(SpringWebInstrumentationAutoConfiguration.class)) .withPropertyValues( "otel.file_format=1.0-rc.1", - "otel.instrumentation/development.java.spring_starter.instrumentation_mode=none", - "otel.instrumentation/development.java.spring_web.enabled=false") + "otel.distribution.spring_starter.instrumentation.default_enabled=false", + "otel.distribution.spring_starter.instrumentation.disabled=spring_web") .run(context -> assertThat(context).doesNotHaveBean("otelRestTemplateBeanPostProcessor")); } diff --git a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/SpringAwsSqsInstrumentationModule.java b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/SpringAwsSqsInstrumentationModule.java index bd2b7ef83855..b2e646874fec 100644 --- a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/SpringAwsSqsInstrumentationModule.java +++ b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/SpringAwsSqsInstrumentationModule.java @@ -18,7 +18,7 @@ public class SpringAwsSqsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringAwsSqsInstrumentationModule() { - super("spring-cloud-aws", "spring-cloud-aws-3.0"); + super("spring_cloud_aws", "spring_cloud_aws_3.0"); } @Override diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/v2_0/GatewayInstrumentationModule.java b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/v2_0/GatewayInstrumentationModule.java index 695bf2f7be81..ee8e943fa181 100644 --- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/v2_0/GatewayInstrumentationModule.java +++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/v2_0/GatewayInstrumentationModule.java @@ -18,7 +18,7 @@ public class GatewayInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GatewayInstrumentationModule() { - super("spring-cloud-gateway", "spring-cloud-gateway-2.0"); + super("spring_cloud_gateway", "spring_cloud_gateway_2.0"); } @Override diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/webmvc/v5_0/GatewayWebMvcInstrumentationModule.java b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/webmvc/v5_0/GatewayWebMvcInstrumentationModule.java index 7e47f1194b6f..58f5145891cc 100644 --- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/webmvc/v5_0/GatewayWebMvcInstrumentationModule.java +++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/webmvc/v5_0/GatewayWebMvcInstrumentationModule.java @@ -20,7 +20,7 @@ public class GatewayWebMvcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public GatewayWebMvcInstrumentationModule() { - super("spring-cloud-gateway", "spring-cloud-gateway-webmvc-4.3"); + super("spring_cloud_gateway", "spring_cloud_gateway_webmvc_4.3"); } @Override diff --git a/instrumentation/spring/spring-core-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/core/v2_0/SpringCoreInstrumentationModule.java b/instrumentation/spring/spring-core-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/core/v2_0/SpringCoreInstrumentationModule.java index 2e6ddf3a6f3b..0fd45cb60e06 100644 --- a/instrumentation/spring/spring-core-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/core/v2_0/SpringCoreInstrumentationModule.java +++ b/instrumentation/spring/spring-core-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/core/v2_0/SpringCoreInstrumentationModule.java @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class SpringCoreInstrumentationModule extends InstrumentationModule { public SpringCoreInstrumentationModule() { - super("spring-core", "spring-core-2.0"); + super("spring_core", "spring_core_2.0"); } @Override diff --git a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/v1_8/SpringDataInstrumentationModule.java b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/v1_8/SpringDataInstrumentationModule.java index 5c06bc9625f2..6f9cf7053127 100644 --- a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/v1_8/SpringDataInstrumentationModule.java +++ b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/v1_8/SpringDataInstrumentationModule.java @@ -36,7 +36,7 @@ public class SpringDataInstrumentationModule extends InstrumentationModule { public SpringDataInstrumentationModule() { - super("spring-data", "spring-data-1.8"); + super("spring_data", "spring_data_1.8"); } @Override diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/SpringIntegrationInstrumentationModule.java b/instrumentation/spring/spring-integration-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/SpringIntegrationInstrumentationModule.java index 9a86d825d095..ac84c40afe4d 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/SpringIntegrationInstrumentationModule.java +++ b/instrumentation/spring/spring-integration-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/SpringIntegrationInstrumentationModule.java @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class SpringIntegrationInstrumentationModule extends InstrumentationModule { public SpringIntegrationInstrumentationModule() { - super("spring-integration", "spring-integration-4.1"); + super("spring_integration", "spring_integration_4.1"); } @Override diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsInstrumentationModule.java b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsInstrumentationModule.java index a1c07ace281a..7743815c4080 100644 --- a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsInstrumentationModule.java +++ b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsInstrumentationModule.java @@ -20,7 +20,7 @@ public class SpringJmsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringJmsInstrumentationModule() { - super("spring-jms", "spring-jms-2.0"); + super("spring_jms", "spring_jms_2.0"); } @Override diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsInstrumentationModule.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsInstrumentationModule.java index 07462bacee3f..0f4576381468 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsInstrumentationModule.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsInstrumentationModule.java @@ -21,7 +21,7 @@ public class SpringJmsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringJmsInstrumentationModule() { - super("spring-jms", "spring-jms-6.0"); + super("spring_jms", "spring_jms_6.0"); } @Override diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaInstrumentationModule.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaInstrumentationModule.java index b6745d69e932..bf28ed5dccd6 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaInstrumentationModule.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaInstrumentationModule.java @@ -17,7 +17,7 @@ public class SpringKafkaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringKafkaInstrumentationModule() { - super("spring-kafka", "spring-kafka-2.7"); + super("spring_kafka", "spring_kafka_2.7"); } @Override diff --git a/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts index acb01cc03732..a9c8e1ddb77e 100644 --- a/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts @@ -9,7 +9,7 @@ muzzle { module.set("spring-pulsar") versions.set("[1.0.0,)") assertInverse.set(true) - excludeInstrumentationName("pulsar-2.8") + excludeInstrumentationName("pulsar_2.8") } } diff --git a/instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarInstrumentationModule.java b/instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarInstrumentationModule.java index 745875a7a9ef..7514598b338e 100644 --- a/instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarInstrumentationModule.java +++ b/instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarInstrumentationModule.java @@ -19,7 +19,7 @@ public class SpringPulsarInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringPulsarInstrumentationModule() { - super("spring-pulsar", "spring-pulsar-1.0"); + super("spring_pulsar", "spring_pulsar_1.0"); } @Override diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitInstrumentationModule.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitInstrumentationModule.java index 6bfb788d05de..2d4f21d4920d 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitInstrumentationModule.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitInstrumentationModule.java @@ -17,7 +17,7 @@ public class SpringRabbitInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringRabbitInstrumentationModule() { - super("spring-rabbit", "spring-rabbit-1.0"); + super("spring_rabbit", "spring_rabbit_1.0"); } @Override diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/SpringRmiInstrumentationModule.java b/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/SpringRmiInstrumentationModule.java index 0da803b6809e..8794c25302b3 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/SpringRmiInstrumentationModule.java +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/SpringRmiInstrumentationModule.java @@ -20,7 +20,7 @@ public class SpringRmiInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringRmiInstrumentationModule() { - super("spring-rmi", "spring-rmi-4.0"); + super("spring_rmi", "spring_rmi_4.0"); } @Override diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingInstrumentationModule.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingInstrumentationModule.java index bd422f9fbd82..d226945393a3 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingInstrumentationModule.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingInstrumentationModule.java @@ -18,7 +18,7 @@ public class SpringSchedulingInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringSchedulingInstrumentationModule() { - super("spring-scheduling", "spring-scheduling-3.1"); + super("spring_scheduling", "spring_scheduling_3.1"); } @Override diff --git a/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java b/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java index 7e1ce7198ccb..d3f83f266ae0 100644 --- a/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java +++ b/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/servlet/SpringSecurityConfigServletInstrumentationModule.java @@ -22,10 +22,10 @@ public class SpringSecurityConfigServletInstrumentationModule extends Instrument implements ExperimentalInstrumentationModule { public SpringSecurityConfigServletInstrumentationModule() { super( - "spring-security-config", - "spring-security-config-6.0", - "spring-security-config-servlet", - "spring-security-config-servlet-6.0"); + "spring_security_config", + "spring_security_config_6.0", + "spring_security_config_servlet", + "spring_security_config_servlet_6.0"); } @Override diff --git a/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/webflux/SpringSecurityConfigWebFluxInstrumentationModule.java b/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/webflux/SpringSecurityConfigWebFluxInstrumentationModule.java index 03d7d2847122..89a21cbbe110 100644 --- a/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/webflux/SpringSecurityConfigWebFluxInstrumentationModule.java +++ b/instrumentation/spring/spring-security-config-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/security/config/v6_0/webflux/SpringSecurityConfigWebFluxInstrumentationModule.java @@ -19,10 +19,10 @@ public class SpringSecurityConfigWebFluxInstrumentationModule extends Instrument public SpringSecurityConfigWebFluxInstrumentationModule() { super( - "spring-security-config", - "spring-security-config-6.0", - "spring-security-config-webflux", - "spring-security-config-webflux-6.0"); + "spring_security_config", + "spring_security_config_6.0", + "spring_security_config_webflux", + "spring_security_config_webflux_6.0"); } @Override diff --git a/instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringWebInstrumentationModule.java b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringWebInstrumentationModule.java index f257f527177a..38964eabc28c 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringWebInstrumentationModule.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringWebInstrumentationModule.java @@ -21,7 +21,7 @@ public class SpringWebInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringWebInstrumentationModule() { - super("spring-web", "spring-web-3.1"); + super("spring_web", "spring_web_3.1"); } @Override diff --git a/instrumentation/spring/spring-web/spring-web-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/web/v6_0/SpringWebInstrumentationModule.java b/instrumentation/spring/spring-web/spring-web-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/web/v6_0/SpringWebInstrumentationModule.java index 09dfb405ee94..5288f7b6fb63 100644 --- a/instrumentation/spring/spring-web/spring-web-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/web/v6_0/SpringWebInstrumentationModule.java +++ b/instrumentation/spring/spring-web/spring-web-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/web/v6_0/SpringWebInstrumentationModule.java @@ -21,7 +21,7 @@ public class SpringWebInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringWebInstrumentationModule() { - super("spring-web", "spring-web-6.0"); + super("spring_web", "spring_web_6.0"); } @Override diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebfluxClientInstrumentationModule.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebfluxClientInstrumentationModule.java index 3bb8a9f15db5..9c478a3928e8 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebfluxClientInstrumentationModule.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebfluxClientInstrumentationModule.java @@ -16,7 +16,7 @@ public class WebfluxClientInstrumentationModule extends InstrumentationModule { public WebfluxClientInstrumentationModule() { - super("spring-webflux", "spring-webflux-5.0", "spring-webflux-client"); + super("spring_webflux", "spring_webflux_5.0", "spring_webflux_client"); } @Override diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/WebfluxServerInstrumentationModule.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/WebfluxServerInstrumentationModule.java index 03f004532ad7..e3f96eab4084 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/WebfluxServerInstrumentationModule.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/WebfluxServerInstrumentationModule.java @@ -18,7 +18,7 @@ public class WebfluxServerInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public WebfluxServerInstrumentationModule() { - super("spring-webflux", "spring-webflux-5.0", "spring-webflux-server"); + super("spring_webflux", "spring_webflux_5.0", "spring_webflux_server"); } @Override diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java index 346dbcdf6fb5..fc614c1ad3f3 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ReactorNettyInstrumentationModule.java @@ -17,7 +17,7 @@ public class ReactorNettyInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ReactorNettyInstrumentationModule() { - super("spring-webflux", "spring-webflux-5.0", "reactor-netty", "reactor-netty-server"); + super("spring_webflux", "spring_webflux_5.0", "reactor_netty", "reactor_netty_server"); } @Override diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java index e73356acff01..c5ab65bc66c1 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java @@ -22,7 +22,7 @@ public class SpringWebMvcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringWebMvcInstrumentationModule() { - super("spring-webmvc", "spring-webmvc-3.1"); + super("spring_webmvc", "spring_webmvc_3.1"); } @Override diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java index 31692e148fa9..aebda89befda 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java @@ -22,7 +22,7 @@ public class SpringWebMvcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringWebMvcInstrumentationModule() { - super("spring-webmvc", "spring-webmvc-6.0"); + super("spring_webmvc", "spring_webmvc_6.0"); } @Override diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsInstrumentationModule.java b/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsInstrumentationModule.java index e0d960d8afbd..d05995862c30 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsInstrumentationModule.java +++ b/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/SpringWsInstrumentationModule.java @@ -17,7 +17,7 @@ public class SpringWsInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpringWsInstrumentationModule() { - super("spring-ws", "spring-ws-2.0"); + super("spring_ws", "spring_ws_2.0"); } @Override diff --git a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java index 6f150ef5ef6c..fe9d2e72e89b 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java +++ b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java @@ -18,7 +18,7 @@ public class SpymemcachedInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public SpymemcachedInstrumentationModule() { - super("spymemcached", "spymemcached-2.12"); + super("spymemcached", "spymemcached_2.12"); } @Override diff --git a/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2InstrumentationModule.java b/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2InstrumentationModule.java index b07b4b9d7198..6ac3465c22e6 100644 --- a/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2InstrumentationModule.java +++ b/instrumentation/struts/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v2_3/Struts2InstrumentationModule.java @@ -18,7 +18,7 @@ public class Struts2InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Struts2InstrumentationModule() { - super("struts", "struts-2.3"); + super("struts", "struts_2.3"); } @Override diff --git a/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2InstrumentationModule.java b/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2InstrumentationModule.java index a838b4f53ce3..2d93dba02aef 100644 --- a/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2InstrumentationModule.java +++ b/instrumentation/struts/struts-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts/v7_0/Struts2InstrumentationModule.java @@ -20,7 +20,7 @@ public class Struts2InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Struts2InstrumentationModule() { - super("struts", "struts-7.0"); + super("struts", "struts_7.0"); } @Override diff --git a/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryInstrumentationModule.java b/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryInstrumentationModule.java index 62b67e7beb73..17edc22da810 100644 --- a/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryInstrumentationModule.java +++ b/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryInstrumentationModule.java @@ -20,7 +20,7 @@ public class TapestryInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public TapestryInstrumentationModule() { - super("tapestry", "tapestry-5.4"); + super("tapestry", "tapestry_5.4"); } @Override diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java index c26f68561fc8..c8e6859a1043 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java @@ -21,7 +21,7 @@ public class Tomcat10InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Tomcat10InstrumentationModule() { - super("tomcat", "tomcat-10.0"); + super("tomcat", "tomcat_10.0"); } @Override diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java index 5d43bac81e19..6d9b53831d5e 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java @@ -21,7 +21,7 @@ public class Tomcat7InstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public Tomcat7InstrumentationModule() { - super("tomcat", "tomcat-7.0"); + super("tomcat", "tomcat_7.0"); } @Override diff --git a/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java index d23df7a0d3c2..f3ba0216af1f 100644 --- a/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java +++ b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java @@ -17,7 +17,7 @@ public class TomcatJdbcInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public TomcatJdbcInstrumentationModule() { - super("tomcat-jdbc"); + super("tomcat_jdbc"); } @Override diff --git a/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java b/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java index c944ce7f9958..af1bdaa58fde 100644 --- a/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java +++ b/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java @@ -17,7 +17,7 @@ public class TwilioInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public TwilioInstrumentationModule() { - super("twilio", "twilio-6.6"); + super("twilio", "twilio_6.6"); } @Override diff --git a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java index 79c512aac2be..394574f493cd 100644 --- a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java +++ b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowInstrumentationModule.java @@ -20,7 +20,7 @@ public class UndertowInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public UndertowInstrumentationModule() { - super("undertow", "undertow-1.4"); + super("undertow", "undertow_1.4"); } @Override diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinInstrumentationModule.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinInstrumentationModule.java index 3e249f65c145..7e80d4211868 100644 --- a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinInstrumentationModule.java +++ b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinInstrumentationModule.java @@ -20,7 +20,7 @@ public class VaadinInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VaadinInstrumentationModule() { - super("vaadin", "vaadin-14.2"); + super("vaadin", "vaadin_14.2"); } @Override diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java index e36e65b91c43..1b81cf0845c8 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class VertxClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxClientInstrumentationModule() { - super("vertx-http-client", "vertx-http-client-3.0", "vertx"); + super("vertx_http_client", "vertx_http_client_3.0", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java index a3b4c24e8a25..d9c6f59aab92 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java @@ -21,7 +21,7 @@ public class VertxClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxClientInstrumentationModule() { - super("vertx-http-client", "vertx-http-client-4.0", "vertx"); + super("vertx_http_client", "vertx_http_client_4.0", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/VertxClientInstrumentationModule.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/VertxClientInstrumentationModule.java index 737a176f26d3..fddf6f633705 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/VertxClientInstrumentationModule.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/VertxClientInstrumentationModule.java @@ -20,7 +20,7 @@ public class VertxClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxClientInstrumentationModule() { - super("vertx-http-client", "vertx-http-client-5.0", "vertx"); + super("vertx_http_client", "vertx_http_client_5.0", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaInstrumentationModule.java b/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaInstrumentationModule.java index 7e2fd2bbb874..d9f019cf7665 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaInstrumentationModule.java +++ b/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaInstrumentationModule.java @@ -18,7 +18,7 @@ public class VertxKafkaInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxKafkaInstrumentationModule() { - super("vertx-kafka-client", "vertx-kafka-client-3.6", "vertx"); + super("vertx_kafka_client", "vertx_kafka_client_3.6", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientInstrumentationModule.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientInstrumentationModule.java index 9d7dc5300965..ce53193516f3 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientInstrumentationModule.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientInstrumentationModule.java @@ -19,7 +19,7 @@ public class VertxRedisClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxRedisClientInstrumentationModule() { - super("vertx-redis-client", "vertx-redis-client-4.0", "vertx"); + super("vertx_redis_client", "vertx_redis_client_4.0", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java index b31dc3df8880..be2bc0a01010 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java @@ -18,7 +18,7 @@ public class VertxRxInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxRxInstrumentationModule() { - super("vertx-rx-java", "vertx-rx-java-3.5", "vertx"); + super("vertx_rx_java", "vertx_rx_java_3.5", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientInstrumentationModule.java b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientInstrumentationModule.java index e6f0a5d90670..ad7ad794e4d9 100644 --- a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientInstrumentationModule.java +++ b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientInstrumentationModule.java @@ -21,7 +21,7 @@ public class VertxSqlClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxSqlClientInstrumentationModule() { - super("vertx-sql-client", "vertx-sql-client-4.0", "vertx"); + super("vertx_sql_client", "vertx_sql_client_4.0", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/VertxSqlClientInstrumentationModule.java b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/VertxSqlClientInstrumentationModule.java index 25c2c7da6b4f..df415a4febd1 100644 --- a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/VertxSqlClientInstrumentationModule.java +++ b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/sql/VertxSqlClientInstrumentationModule.java @@ -21,7 +21,7 @@ public class VertxSqlClientInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxSqlClientInstrumentationModule() { - super("vertx-sql-client", "vertx-sql-client-5.0", "vertx"); + super("vertx_sql_client", "vertx_sql_client_5.0", "vertx"); } @Override diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java index 392bd6ce67cc..0edf5f0b3ef7 100644 --- a/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java +++ b/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java @@ -18,7 +18,7 @@ public class VertxWebInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public VertxWebInstrumentationModule() { - super("vertx-web", "vertx-web-3.0", "vertx"); + super("vertx_web", "vertx_web_3.0", "vertx"); } @Override diff --git a/instrumentation/vibur-dbcp-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/viburdbcp/v11_0/ViburDbcpInstrumentationModule.java b/instrumentation/vibur-dbcp-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/viburdbcp/v11_0/ViburDbcpInstrumentationModule.java index c7f78cac71a6..f6f666aef12c 100644 --- a/instrumentation/vibur-dbcp-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/viburdbcp/v11_0/ViburDbcpInstrumentationModule.java +++ b/instrumentation/vibur-dbcp-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/viburdbcp/v11_0/ViburDbcpInstrumentationModule.java @@ -17,7 +17,7 @@ @AutoService(InstrumentationModule.class) public class ViburDbcpInstrumentationModule extends InstrumentationModule { public ViburDbcpInstrumentationModule() { - super("vibur-dbcp", "vibur-dbcp-11.0"); + super("vibur_dbcp", "vibur_dbcp_11.0"); } @Override diff --git a/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/WicketInstrumentationModule.java b/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/WicketInstrumentationModule.java index 899cc1ad88da..62425b3af779 100644 --- a/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/WicketInstrumentationModule.java +++ b/instrumentation/wicket-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/wicket/WicketInstrumentationModule.java @@ -18,7 +18,7 @@ public class WicketInstrumentationModule extends InstrumentationModule { public WicketInstrumentationModule() { - super("wicket", "wicket-8.0"); + super("wicket", "wicket_8.0"); } @Override diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobInstrumentationModule.java b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobInstrumentationModule.java index 5a8262cc9710..621179249212 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobInstrumentationModule.java +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobInstrumentationModule.java @@ -21,7 +21,7 @@ public class XxlJobInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public XxlJobInstrumentationModule() { - super("xxl-job", "xxl-job-1.9.2"); + super("xxl_job", "xxl_job_1.9.2"); } @Override diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobInstrumentationModule.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobInstrumentationModule.java index b0f97f29ca41..fda0beae80c0 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobInstrumentationModule.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobInstrumentationModule.java @@ -21,7 +21,7 @@ public class XxlJobInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public XxlJobInstrumentationModule() { - super("xxl-job", "xxl-job-2.1.2"); + super("xxl_job", "xxl_job_2.1.2"); } @Override diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobInstrumentationModule.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobInstrumentationModule.java index 066f5e5df8f5..c65211799ccb 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobInstrumentationModule.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobInstrumentationModule.java @@ -20,7 +20,7 @@ public class XxlJobInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public XxlJobInstrumentationModule() { - super("xxl-job", "xxl-job-2.3.0"); + super("xxl_job", "xxl_job_2.3.0"); } @Override diff --git a/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/ZioInstrumentationModule.java b/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/ZioInstrumentationModule.java index 8b7bd52c0d5f..580bd4eec20c 100644 --- a/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/ZioInstrumentationModule.java +++ b/instrumentation/zio/zio-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/zio/v2_0/ZioInstrumentationModule.java @@ -18,7 +18,7 @@ public class ZioInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ZioInstrumentationModule() { - super("zio", "zio-2.0"); + super("zio", "zio_2.0"); } @Override diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/AgentEnabledInstrumentations.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/AgentEnabledInstrumentations.java new file mode 100644 index 000000000000..17fd9ccee67b --- /dev/null +++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/AgentEnabledInstrumentations.java @@ -0,0 +1,36 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.bootstrap.internal; + +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; +import io.opentelemetry.instrumentation.api.internal.Initializer; + +/** + * Access to enabled instrumentations configuration. + * + *

This class is internal and is hence not for public use. Its APIs are unstable and can change + * at any time. + */ +public class AgentEnabledInstrumentations { + + static EnabledInstrumentations instance; + + public static EnabledInstrumentations get() { + return instance; + } + + @Initializer + public static void set(EnabledInstrumentations enabledInstrumentations) { + AgentEnabledInstrumentations.instance = enabledInstrumentations; + } + + // Visible for testing + public static void resetForTest() { + instance = null; + } + + private AgentEnabledInstrumentations() {} +} diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java index f0aca1b8665f..931d09a155bd 100644 --- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java +++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java @@ -9,10 +9,9 @@ import static java.util.Collections.unmodifiableSet; import static net.bytebuddy.matcher.ElementMatchers.any; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; +import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; import io.opentelemetry.sdk.autoconfigure.spi.Ordered; import java.util.Collections; import java.util.LinkedHashSet; @@ -91,13 +90,7 @@ public final String instrumentationName() { * themselves on some other condition. */ public boolean defaultEnabled() { - String mode = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") - .getString("instrumentation_mode", "default"); - if (!mode.equals("default") && !mode.equals("none")) { - throw new ConfigurationException("Unknown instrumentation mode: " + mode); - } - return mode.equals("default"); + return AgentEnabledInstrumentations.get().isDefaultEnabled(); } /** @@ -179,9 +172,7 @@ private static class IndyConfigurationHolder { private static final boolean indyEnabled; static { - indyEnabled = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") - .getBoolean("indy/development", false); + indyEnabled = ConfigPropertiesUtil.getBoolean("otel.javaagent.experimental.indy", false); if (indyEnabled) { logger.info("Enabled indy for instrumentation modules"); } diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index 5434028a60a0..c14d0c14d082 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/javaagent-tooling/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { api("net.bytebuddy:byte-buddy-dep") implementation("org.ow2.asm:asm-tree") implementation("org.ow2.asm:asm-util") + implementation("com.fasterxml.jackson.core:jackson-databind") annotationProcessor("com.google.auto.service:auto-service") compileOnly("com.google.auto.service:auto-service-annotations") @@ -63,7 +64,6 @@ dependencies { testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("com.google.guava:guava") testImplementation("org.junit-pioneer:junit-pioneer") - testImplementation("com.fasterxml.jackson.core:jackson-databind") } testing { diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java index 46e05f0ac5cc..4230956ca4d8 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java @@ -14,11 +14,9 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.none; -import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.context.Context; import io.opentelemetry.context.ContextStorage; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties; import io.opentelemetry.javaagent.bootstrap.AgentClassLoader; import io.opentelemetry.javaagent.bootstrap.BootstrapPackagePrefixesHolder; @@ -38,6 +36,7 @@ import io.opentelemetry.javaagent.tooling.asyncannotationsupport.WeakRefAsyncOperationEndStrategies; import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesBuilderImpl; import io.opentelemetry.javaagent.tooling.bootstrap.BootstrapPackagesConfigurer; +import io.opentelemetry.javaagent.tooling.config.AgentDistributionConfig; import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig; import io.opentelemetry.javaagent.tooling.field.FieldBackedImplementationConfiguration; import io.opentelemetry.javaagent.tooling.field.VirtualFieldImplementationInstaller; @@ -363,8 +362,7 @@ private static void runAfterAgentListeners( // the application is already setting the global LogManager and AgentListener won't be able // to touch it due to class loader locking. boolean shouldForceSynchronousAgentListenersCalls = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") - .getBoolean(FORCE_SYNCHRONOUS_AGENT_LISTENERS_CONFIG, false); + AgentDistributionConfig.get().getBoolean(FORCE_SYNCHRONOUS_AGENT_LISTENERS_CONFIG, false); boolean javaBefore9 = isJavaBefore9(); if (!shouldForceSynchronousAgentListenersCalls && javaBefore9 && isAppUsingCustomLogManager()) { logger.fine("Custom JUL LogManager detected: delaying AgentListener#afterAgent() calls"); diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java index 83554f955d54..1165b80113f6 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java @@ -11,18 +11,23 @@ import io.opentelemetry.api.incubator.ExtendedOpenTelemetry; import io.opentelemetry.api.incubator.config.ConfigProvider; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; +import io.opentelemetry.instrumentation.api.incubator.config.EnabledInstrumentations; import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedConfigProvider; import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder; import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; +import io.opentelemetry.javaagent.tooling.config.AgentDistributionConfig; import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; import io.opentelemetry.sdk.autoconfigure.SdkAutoconfigureAccess; import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; import io.opentelemetry.sdk.common.CompletableResultCode; import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import org.jetbrains.annotations.Nullable; public final class OpenTelemetryInstaller { @@ -43,18 +48,27 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk( OpenTelemetrySdk sdk = autoConfiguredSdk.getOpenTelemetrySdk(); ConfigProperties configProperties = AutoConfigureUtil.getConfig(autoConfiguredSdk); ConfigProvider configProvider; + EnabledInstrumentations enabledInstrumentations; if (configProperties != null) { // Provide a fake declarative configuration based on config properties // so that declarative configuration API can be used everywhere configProvider = ConfigPropertiesBackedConfigProvider.create(configProperties); sdk = new ExtendedOpenTelemetrySdkWrapper(sdk, configProvider); + enabledInstrumentations = enabledInstrumentationsFromConfigProperties(configProperties); + AgentDistributionConfig.set(getPropertiesDistributionConfig(configProvider)); } else { // Provide a fake ConfigProperties until we have migrated all runtime configuration // access to use declarative configuration API configProvider = ((ExtendedOpenTelemetry) sdk).getConfigProvider(); configProperties = getDeclarativeConfigBridgedProperties(configProvider); + // distribution node is set by the JavaagentDistributionAccessCustomizerProvider + enabledInstrumentations = + enabledInstrumentationsFromConfigDistribution( + Objects.requireNonNull(AgentDistributionConfig.get())); } + AgentEnabledInstrumentations.set(enabledInstrumentations); + setForceFlush(sdk); GlobalOpenTelemetry.set(sdk); @@ -65,11 +79,81 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk( configProvider); } + private static DeclarativeConfigProperties getPropertiesDistributionConfig( + ConfigProvider configProvider) { + DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig(); + if (instrumentationConfig == null) { + instrumentationConfig = empty(); + } + return instrumentationConfig.getStructured("java", empty()).getStructured("javaagent", empty()); + } + + // Visible for testing + public static EnabledInstrumentations enabledInstrumentationsFromConfigProperties( + ConfigProperties configProperties) { + boolean isDefaultEnabled = + configProperties.getBoolean("otel.instrumentation.common.default-enabled", true); + + return new EnabledInstrumentations() { + @Nullable + @Override + public Boolean getEnabled(String instrumentationName) { + return configProperties.getBoolean( + "otel.instrumentation." + instrumentationName.replace('_', '-') + ".enabled"); + } + + @Override + public boolean isDefaultEnabled() { + return isDefaultEnabled; + } + }; + } + + private static EnabledInstrumentations enabledInstrumentationsFromConfigDistribution( + DeclarativeConfigProperties distribution) { + // Should not be parsed for each call + List enabledModules = null; + List disabledModules = null; + + DeclarativeConfigProperties instrumentation = distribution.getStructured("instrumentation"); + if (instrumentation != null) { + disabledModules = instrumentation.getScalarList("disabled", String.class); + enabledModules = instrumentation.getScalarList("enabled", String.class); + } + + List disabled = disabledModules; + List enabled = enabledModules; + + boolean isDefaultEnabled = + Objects.requireNonNull(distribution) + .getStructured("instrumentation", empty()) + .getBoolean("default_enabled", true); + + return new EnabledInstrumentations() { + @Nullable + @Override + public Boolean getEnabled(String instrumentationName) { + if (disabled != null && disabled.contains(instrumentationName)) { + return false; + } + + if (enabled != null && enabled.contains(instrumentationName)) { + return true; + } + return null; + } + + @Override + public boolean isDefaultEnabled() { + return isDefaultEnabled; + } + }; + } + // Visible for testing static ConfigProperties getDeclarativeConfigBridgedProperties(ConfigProvider configProvider) { return new DeclarativeConfigPropertiesBridgeBuilder() .addMapping("otel.javaagent", "agent") - .addOverride("otel.instrumentation.common.default-enabled", defaultEnabled(configProvider)) // these properties are used to initialize the SDK before the configuration file // is loaded for consistency, we pass them to the bridge, so that they can be read // later with the same value from the {@link DeclarativeConfigPropertiesBridge} @@ -78,28 +162,6 @@ static ConfigProperties getDeclarativeConfigBridgedProperties(ConfigProvider con .buildFromInstrumentationConfig(configProvider.getInstrumentationConfig()); } - private static boolean defaultEnabled(ConfigProvider configProvider) { - DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig(); - if (instrumentationConfig == null) { - return true; - } - - String mode = - instrumentationConfig - .getStructured("java", empty()) - .getStructured("agent", empty()) - .getString("instrumentation_mode", "default"); - - switch (mode) { - case "none": - return false; - case "default": - return true; - default: - throw new ConfigurationException("Unknown instrumentation mode: " + mode); - } - } - private static void setForceFlush(OpenTelemetrySdk sdk) { OpenTelemetrySdkAccess.internalSetForceFlush( (timeout, unit) -> { diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentConfig.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentConfig.java deleted file mode 100644 index 10d2af1220c3..000000000000 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.javaagent.tooling.config; - -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; - -public final class AgentConfig { - - public static String instrumentationMode() { - String mode = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") - .getString("instrumentation_mode", "default"); - if (!mode.equals("default") && !mode.equals("none")) { - throw new ConfigurationException("Unknown instrumentation mode: " + mode); - } - return mode; - } - - private AgentConfig() {} -} diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentDistributionConfig.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentDistributionConfig.java new file mode 100644 index 000000000000..bb8a6b348a59 --- /dev/null +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentDistributionConfig.java @@ -0,0 +1,35 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.tooling.config; + +import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty; + +import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; +import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties; +import io.opentelemetry.instrumentation.api.internal.Initializer; + +/** + * Javaagent distribution-specific configuration. + * + *

This class is internal and is hence not for public use. Its APIs are unstable and can change + * at any time. + */ +public class AgentDistributionConfig { + static ExtendedDeclarativeConfigProperties distributionConfig = + new ExtendedDeclarativeConfigProperties(empty()); + + public static ExtendedDeclarativeConfigProperties get() { + return distributionConfig; + } + + @Initializer + public static void set(DeclarativeConfigProperties distributionConfig) { + AgentDistributionConfig.distributionConfig = + new ExtendedDeclarativeConfigProperties(distributionConfig); + } + + private AgentDistributionConfig() {} +} diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/JavaagentDistributionAccessCustomizerProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/JavaagentDistributionAccessCustomizerProvider.java new file mode 100644 index 000000000000..b3ae3d435cea --- /dev/null +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/JavaagentDistributionAccessCustomizerProvider.java @@ -0,0 +1,78 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.tooling.config; + +import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty; + +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.auto.service.AutoService; +import io.opentelemetry.api.incubator.config.ConfigProvider; +import io.opentelemetry.common.ComponentLoader; +import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer; +import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider; +import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties; +import java.util.Collections; +import java.util.Map; +import org.jetbrains.annotations.NotNull; + +/** + * Allows access to the Javaagent distribution node, which cannot be accessed using the {@link + * ConfigProvider} API (yet). + * + *

This class is internal and is hence not for public use. Its APIs are unstable and can change + * at any time. + */ +@AutoService(DeclarativeConfigurationCustomizerProvider.class) +public final class JavaagentDistributionAccessCustomizerProvider + implements DeclarativeConfigurationCustomizerProvider { + + // the entire configuration is copied from + // https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java#L66-L79 + // which is not public + private static final com.fasterxml.jackson.databind.ObjectMapper MAPPER; + + static { + MAPPER = + new ObjectMapper() + // Create empty object instances for keys which are present but have null values + .setDefaultSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY)); + // Boxed primitives which are present but have null values should be set to null, rather than + // empty instances + MAPPER.configOverride(String.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.SET)); + MAPPER.configOverride(Integer.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.SET)); + MAPPER.configOverride(Double.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.SET)); + MAPPER.configOverride(Boolean.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.SET)); + } + + @Override + public void customize(DeclarativeConfigurationCustomizer customizer) { + customizer.addModelCustomizer( + model -> { + Object distribution = model.getAdditionalProperties().get("distribution"); + if (distribution != null) { + AgentDistributionConfig.set( + toProperties(distribution).getStructured("javaagent", empty())); + } + return model; + }); + } + + @NotNull + private static YamlDeclarativeConfigProperties toProperties(Object distribution) { + Map configurationMap = + MAPPER.convertValue(distribution, new TypeReference>() {}); + if (configurationMap == null) { + configurationMap = Collections.emptyMap(); + } + return YamlDeclarativeConfigProperties.create( + configurationMap, + ComponentLoader.forClassLoader( + JavaagentDistributionAccessCustomizerProvider.class.getClassLoader())); + } +} diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java index 04bad0454bdf..315654505c55 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java @@ -6,10 +6,9 @@ package io.opentelemetry.javaagent.tooling.ignore; import com.google.auto.service.AutoService; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer; +import io.opentelemetry.javaagent.tooling.config.AgentDistributionConfig; /** * Additional global ignore settings that are used to reduce number of classes we try to apply @@ -28,7 +27,7 @@ public void configure(IgnoredTypesBuilder builder) { // don't ignore libraries that we actually attempt to instrument. It means either the list is // wrong or a type matcher is. boolean enabled = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") + AgentDistributionConfig.get() .get("testing") .get("additional_library_ignores") .getBoolean("enabled", true); diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassLoadersConfigurer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassLoadersConfigurer.java index 2bbfc0e24637..35a153f89a64 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassLoadersConfigurer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassLoadersConfigurer.java @@ -8,10 +8,9 @@ import static java.util.Collections.emptyList; import com.google.auto.service.AutoService; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer; +import io.opentelemetry.javaagent.tooling.config.AgentDistributionConfig; import java.util.List; @AutoService(IgnoredTypesConfigurer.class) @@ -20,7 +19,7 @@ public class UserExcludedClassLoadersConfigurer implements IgnoredTypesConfigure @Override public void configure(IgnoredTypesBuilder builder) { List excludedClassLoaders = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") + AgentDistributionConfig.get() .getScalarList("exclude_class_loaders", String.class, emptyList()); configureInternal(builder, excludedClassLoaders); } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurer.java index 232ac768e99f..ccaf855527c3 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurer.java @@ -8,10 +8,9 @@ import static java.util.Collections.emptyList; import com.google.auto.service.AutoService; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer; +import io.opentelemetry.javaagent.tooling.config.AgentDistributionConfig; import java.util.List; @AutoService(IgnoredTypesConfigurer.class) @@ -20,8 +19,7 @@ public class UserExcludedClassesConfigurer implements IgnoredTypesConfigurer { @Override public void configure(IgnoredTypesBuilder builder) { List excludedClasses = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "agent") - .getScalarList("exclude_classes", String.class, emptyList()); + AgentDistributionConfig.get().getScalarList("exclude_classes", String.class, emptyList()); configureInternal(builder, excludedClasses); } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java index b9f8fb2164bb..bc664ca671f0 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java @@ -11,8 +11,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; @@ -241,10 +240,7 @@ private AgentBuilder installInjectingModule( static boolean isInstrumentationEnabled( Iterable instrumentationNames, boolean defaultEnabled) { for (String name : instrumentationNames) { - String normalizedName = name.replace('-', '_'); - Boolean enabled = - DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), normalizedName) - .getBoolean("enabled"); + Boolean enabled = AgentEnabledInstrumentations.get().getEnabled(name); if (enabled != null) { return enabled; } diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java index bbb2a3fc084f..79e635c88932 100644 --- a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java +++ b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java @@ -6,24 +6,14 @@ package io.opentelemetry.javaagent.tooling; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; -import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider; -import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; -import java.util.function.Supplier; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; class OpenTelemetryInstallerTest { @@ -40,42 +30,4 @@ void globalOpenTelemetry() { assertThat(sdk).isNotNull().isNotEqualTo(OpenTelemetry.noop()); } - - @ParameterizedTest - @CsvSource({ - "default, true, false", - "none, false, false", - ", true, false", // empty value means property is not set - "invalid, false, true", - }) - void defaultEnabledInDeclarativeConfigPropertiesBridge( - String propertyValue, boolean expected, boolean fail) { - String mode = propertyValue == null ? "" : "instrumentation_mode: \"" + propertyValue + "\""; - String yaml = - "file_format: \"1.0-rc.1\"\n" - + "instrumentation/development:\n" - + " java:\n" - + " agent:\n" - + " " - + mode; - - Supplier configPropertiesSupplier = - () -> - OpenTelemetryInstaller.getDeclarativeConfigBridgedProperties( - SdkConfigProvider.create( - DeclarativeConfiguration.parse( - new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8))))); - - if (fail) { - assertThatCode(() -> configPropertiesSupplier.get()) - .isInstanceOf(ConfigurationException.class) - .hasMessage("Unknown instrumentation mode: invalid"); - } else { - assertThat( - configPropertiesSupplier - .get() - .getBoolean("otel.instrumentation.common.default-enabled")) - .isEqualTo(expected); - } - } } diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstallerTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstallerTest.java index 505526c4273f..5c9ffa472f6f 100644 --- a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstallerTest.java +++ b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstallerTest.java @@ -10,11 +10,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.api.incubator.ExtendedOpenTelemetry; -import io.opentelemetry.api.incubator.config.ConfigProvider; -import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedDeclarativeConfigProperties; +import io.opentelemetry.javaagent.bootstrap.internal.AgentEnabledInstrumentations; +import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import java.util.TreeSet; import java.util.stream.Stream; @@ -27,7 +24,7 @@ class InstrumentationModuleInstallerTest { @AfterEach void tearDown() { - GlobalOpenTelemetry.resetForTest(); + AgentEnabledInstrumentations.resetForTest(); } @ParameterizedTest(name = "isInstrumentationEnabled({0}) = {4}") @@ -43,8 +40,8 @@ void testIsInstrumentationEnabled( when(config.getBoolean("otel.instrumentation.first.enabled")).thenReturn(firstEnabled); when(config.getBoolean("otel.instrumentation.second.enabled")).thenReturn(secondEnabled); - OpenTelemetry openTelemetry = createOpenTelemetry(config); - GlobalOpenTelemetry.set(openTelemetry); + AgentEnabledInstrumentations.set( + OpenTelemetryInstaller.enabledInstrumentationsFromConfigProperties(config)); assertThat( InstrumentationModuleInstaller.isInstrumentationEnabled( @@ -91,14 +88,4 @@ private static Stream instrumentationEnabledParams() { true), Arguments.of("disabled by default", null, null, false, false)); } - - private static OpenTelemetry createOpenTelemetry(ConfigProperties config) { - ExtendedOpenTelemetry otel = mock(ExtendedOpenTelemetry.class); - ConfigProvider configProvider = mock(ConfigProvider.class); - when(otel.getConfigProvider()).thenReturn(configProvider); - when(configProvider.getInstrumentationConfig()) - .thenReturn( - ConfigPropertiesBackedDeclarativeConfigProperties.createInstrumentationConfig(config)); - return otel; - } } diff --git a/smoke-tests/extensions/extension/src/main/java/io/opentelemetry/smoketest/extensions/inlined/SmokeInlinedInstrumentationModule.java b/smoke-tests/extensions/extension/src/main/java/io/opentelemetry/smoketest/extensions/inlined/SmokeInlinedInstrumentationModule.java index 747269d2c9f1..2bbe01d434ac 100644 --- a/smoke-tests/extensions/extension/src/main/java/io/opentelemetry/smoketest/extensions/inlined/SmokeInlinedInstrumentationModule.java +++ b/smoke-tests/extensions/extension/src/main/java/io/opentelemetry/smoketest/extensions/inlined/SmokeInlinedInstrumentationModule.java @@ -16,7 +16,7 @@ public class SmokeInlinedInstrumentationModule extends InstrumentationModule { public SmokeInlinedInstrumentationModule() { - super("smoke-test-extension-inlined"); + super("smoke_test_extension_inlined"); } @Override diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java index f65c5c439ebb..a66d507fd47e 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java @@ -35,7 +35,7 @@ void springBootSmokeTest(int jdk) { client().get("/greeting").aggregate().join(); // There is one span (io.opentelemetry.opentelemetry-instrumentation-annotations-1.16 is - // not used, because instrumentation_mode=none) + // not used, because default_enabled=false) testing.waitAndAssertTraces( trace -> trace.hasSpansSatisfyingExactly( diff --git a/smoke-tests/src/test/resources/declarative-config.yaml b/smoke-tests/src/test/resources/declarative-config.yaml index 86091dc4d39f..0a866ad6293c 100644 --- a/smoke-tests/src/test/resources/declarative-config.yaml +++ b/smoke-tests/src/test/resources/declarative-config.yaml @@ -20,9 +20,9 @@ resource: - name: service.name value: declarative-config-smoke-test -instrumentation/development: - java: - agent: - instrumentation_mode: none - tomcat: - enabled: true +distribution: + javaagent: + instrumentation: + default_enabled: false + enabled: + - tomcat diff --git a/testing-common/integration-tests/src/main/java/IbmResourceLevelInstrumentationModule.java b/testing-common/integration-tests/src/main/java/IbmResourceLevelInstrumentationModule.java index d223a0ac56e0..dfb7313a8d89 100644 --- a/testing-common/integration-tests/src/main/java/IbmResourceLevelInstrumentationModule.java +++ b/testing-common/integration-tests/src/main/java/IbmResourceLevelInstrumentationModule.java @@ -13,7 +13,7 @@ @AutoService(InstrumentationModule.class) public class IbmResourceLevelInstrumentationModule extends InstrumentationModule { public IbmResourceLevelInstrumentationModule() { - super("ibm-resource-level"); + super("ibm_resource_level"); } @Override diff --git a/testing-common/integration-tests/src/main/java/context/ContextTestInstrumentationModule.java b/testing-common/integration-tests/src/main/java/context/ContextTestInstrumentationModule.java index dbb88cea989c..8cf6e69b9f92 100644 --- a/testing-common/integration-tests/src/main/java/context/ContextTestInstrumentationModule.java +++ b/testing-common/integration-tests/src/main/java/context/ContextTestInstrumentationModule.java @@ -17,7 +17,7 @@ public class ContextTestInstrumentationModule extends InstrumentationModule implements ExperimentalInstrumentationModule { public ContextTestInstrumentationModule() { - super("context-test-instrumentation"); + super("context_test_instrumentation"); } @Override diff --git a/testing-common/integration-tests/src/main/java/field/VirtualFieldTestInstrumentationModule.java b/testing-common/integration-tests/src/main/java/field/VirtualFieldTestInstrumentationModule.java index 26980a893591..379efbc3c06b 100644 --- a/testing-common/integration-tests/src/main/java/field/VirtualFieldTestInstrumentationModule.java +++ b/testing-common/integration-tests/src/main/java/field/VirtualFieldTestInstrumentationModule.java @@ -21,7 +21,7 @@ @AutoService(InstrumentationModule.class) public class VirtualFieldTestInstrumentationModule extends InstrumentationModule { public VirtualFieldTestInstrumentationModule() { - super("virtual-field-test"); + super("virtual_field_test"); } @Override diff --git a/testing-common/integration-tests/src/main/java/helper/DuplicateHelperInstrumentationModule.java b/testing-common/integration-tests/src/main/java/helper/DuplicateHelperInstrumentationModule.java index 4b31e4fecc18..31e018b489b6 100644 --- a/testing-common/integration-tests/src/main/java/helper/DuplicateHelperInstrumentationModule.java +++ b/testing-common/integration-tests/src/main/java/helper/DuplicateHelperInstrumentationModule.java @@ -16,7 +16,7 @@ @AutoService(InstrumentationModule.class) public class DuplicateHelperInstrumentationModule extends InstrumentationModule { public DuplicateHelperInstrumentationModule() { - super("duplicate-helper"); + super("duplicate_helper"); } @Override diff --git a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/instrumentation/DenyUnsafeInstrumentationModule.java b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/instrumentation/DenyUnsafeInstrumentationModule.java index cf32a67e0c68..ad154132ef48 100644 --- a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/instrumentation/DenyUnsafeInstrumentationModule.java +++ b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/instrumentation/DenyUnsafeInstrumentationModule.java @@ -20,7 +20,7 @@ public class DenyUnsafeInstrumentationModule extends InstrumentationModule { public DenyUnsafeInstrumentationModule() { - super("deny-unsafe"); + super("deny_unsafe"); } @Override