Merge branch 'main' into temporary-prefixes-nats

Author: AlixBa

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java

@@ -84,6 +84,11 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties
     // renaming to avoid top level config
     SPECIAL_MAPPINGS.put(
         "java.servlet.javascript_snippet/development", "otel.experimental.javascript-snippet");
+    // jmx properties don't have an "instrumentation" segment
+    SPECIAL_MAPPINGS.put("java.jmx.enabled", "otel.jmx.enabled");
+    SPECIAL_MAPPINGS.put("java.jmx.config", "otel.jmx.config");
+    SPECIAL_MAPPINGS.put("java.jmx.discovery.delay", "otel.jmx.discovery.delay");
+    SPECIAL_MAPPINGS.put("java.jmx.target_system", "otel.jmx.target.system");
   }
 
   private final ConfigProperties configProperties;
@@ -210,11 +215,6 @@ private String resolvePropertyKey(String name) {
       return "otel.java" + translated;
     }
 
-    // Handle jmx prefix: java.jmx.* → otel.jmx.*
-    if (translated.startsWith("jmx.")) {
-      return "otel." + translated;
-    }
-
     // Standard mapping
     return "otel.instrumentation." + translated;
   }

examples/extension/src/main/java/com/example/javaagent/DemoIgnoredTypesConfigurer.java

@@ -8,7 +8,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 /**
  * Custom {@link IgnoredTypesConfigurer} which exists currently only to verify correct shading.
@@ -19,5 +18,5 @@
 public class DemoIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {}
+  public void configure(IgnoredTypesBuilder builder) {}
 }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java

@@ -51,7 +51,6 @@
 public final class InstrumenterBuilder<REQUEST, RESPONSE> {
 
   private static final Logger logger = Logger.getLogger(InstrumenterBuilder.class.getName());
-  private static final boolean supportsDeclarativeConfig = supportsDeclarativeConfig();
 
   final OpenTelemetry openTelemetry;
   final String instrumentationName;
@@ -75,20 +74,6 @@ public final class InstrumenterBuilder<REQUEST, RESPONSE> {
   boolean propagateOperationListenersToOnEnd = false;
   boolean enabled = true;
 
-  private static boolean supportsDeclarativeConfig() {
-    try {
-      Class.forName("io.opentelemetry.api.incubator.ExtendedOpenTelemetry");
-      return true;
-    } catch (ClassNotFoundException e) {
-      // The incubator module is not available.
-      // This only happens in OpenTelemetry API instrumentation tests, where an older version of
-      // OpenTelemetry API is used that does not have ExtendedOpenTelemetry.
-      // Having the incubator module without ExtendedOpenTelemetry class should still return false
-      // for those tests to avoid a ClassNotFoundException.
-      return false;
-    }
-  }
-
   static {
     Experimental.internalAddOperationListenerAttributesExtractor(
         (builder, operationListenerAttributesExtractor) ->
@@ -394,21 +379,23 @@ SpanSuppressor buildSpanSuppressor() {
   @Nullable
   private String getSpanSuppressionStrategy() {
     // we cannot use DeclarativeConfigUtil here because it's not available in instrumentation-api
-    if (maybeDeclarativeConfig(openTelemetry)) {
+    DeclarativeConfigProperties commonConfig = empty();
+    if (openTelemetry instanceof ExtendedOpenTelemetry) {
       DeclarativeConfigProperties instrumentationConfig =
           ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider().getInstrumentationConfig();
-      if (instrumentationConfig == null) {
-        return null;
+      if (instrumentationConfig != null) {
+        commonConfig =
+            instrumentationConfig.getStructured("java", empty()).getStructured("common", empty());
       }
-
-      return instrumentationConfig
-          .getStructured("java", empty())
-          .getStructured("common", empty())
-          .getString("span_suppression_strategy/development");
-    } else {
-      return ConfigPropertiesUtil.getString(
-          "otel.instrumentation.experimental.span-suppression-strategy");
     }
+    String experimentalOverride =
+        ConfigPropertiesUtil.getString(
+            "otel.instrumentation.experimental.span-suppression-strategy");
+    String result =
+        commonConfig.getString(
+            "span_suppression_strategy/development",
+            experimentalOverride == null ? "" : experimentalOverride);
+    return result.isEmpty() ? null : result;
   }
 
   private Set<SpanKey> getSpanKeysFromAttributesExtractors() {
@@ -488,15 +475,6 @@ public void setSpanStatusExtractorCustomizer(
     }
   }
 
-  /**
-   * Returns true if the current classpath supports declarative config and the instance may support
-   * declarative config (the agent implements ExtendedOpenTelemetry even when declarative config
-   * isn't used).
-   */
-  private static boolean maybeDeclarativeConfig(OpenTelemetry openTelemetry) {
-    return supportsDeclarativeConfig && openTelemetry instanceof ExtendedOpenTelemetry;
-  }
-
   private interface InstrumenterConstructor<RQ, RS> {
     Instrumenter<RQ, RS> create(InstrumenterBuilder<RQ, RS> builder);
 

instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaIgnoredTypesConfigurer.java

@@ -8,13 +8,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public class AkkaIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
+  public void configure(IgnoredTypesBuilder builder) {
     // This is a Mailbox created by akka.dispatch.Dispatcher#createMailbox. We must not add
     // a context to it as context should only be carried by individual envelopes in the queue
     // of this mailbox.

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaServerIgnoredTypesConfigurer.java

@@ -8,13 +8,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public class AkkaServerIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
+  public void configure(IgnoredTypesBuilder builder) {
     // in AkkaHttpServerInstrumentationTestAsync http pipeline test sending this message trigger
     // processing next request, we don't want to propagate context there
     builder.ignoreTaskClass("akka.stream.impl.fusing.ActorGraphInterpreter$AsyncInput");

instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaSingletons.java

@@ -6,10 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.AwsLambdaFunctionInstrumenter;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.AwsLambdaFunctionInstrumenterFactory;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrapperConfiguration;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import java.time.Duration;
 
 public final class AwsLambdaSingletons {
@@ -18,9 +18,9 @@ public final class AwsLambdaSingletons {
       AwsLambdaFunctionInstrumenterFactory.createInstrumenter(GlobalOpenTelemetry.get());
   private static final Duration FLUSH_TIMEOUT =
       Duration.ofMillis(
-          AgentInstrumentationConfig.get()
+          DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "aws_lambda")
               .getLong(
-                  "otel.instrumentation.aws-lambda.flush-timeout",
+                  "flush_timeout",
                   WrapperConfiguration.OTEL_LAMBDA_FLUSH_TIMEOUT_DEFAULT.toMillis()));
 
   public static AwsLambdaFunctionInstrumenter functionInstrumenter() {

instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSingletons.java

@@ -7,13 +7,13 @@
 
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.AwsLambdaFunctionInstrumenter;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrapperConfiguration;
 import io.opentelemetry.instrumentation.awslambdaevents.common.v2_2.internal.AwsLambdaEventsInstrumenterFactory;
 import io.opentelemetry.instrumentation.awslambdaevents.common.v2_2.internal.AwsLambdaSqsInstrumenterFactory;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import java.time.Duration;
 
 public final class AwsLambdaSingletons {
@@ -27,9 +27,9 @@ public final class AwsLambdaSingletons {
       AwsLambdaSqsInstrumenterFactory.forEvent(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME);
   private static final Duration FLUSH_TIMEOUT =
       Duration.ofMillis(
-          AgentInstrumentationConfig.get()
+          DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "aws_lambda")
               .getLong(
-                  "otel.instrumentation.aws-lambda.flush-timeout",
+                  "flush_timeout",
                   WrapperConfiguration.OTEL_LAMBDA_FLUSH_TIMEOUT_DEFAULT.toMillis()));
 
   public static AwsLambdaFunctionInstrumenter functionInstrumenter() {

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java

@@ -13,8 +13,8 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 
 /**
@@ -36,8 +36,8 @@ public class TracingRequestHandler extends RequestHandler2 {
   public static final RequestHandler2 tracingHandler =
       AwsSdkTelemetry.builder(GlobalOpenTelemetry.get())
           .setCaptureExperimentalSpanAttributes(
-              AgentInstrumentationConfig.get()
-                  .getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false))
+              DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "aws_sdk")
+                  .getBoolean("experimental_span_attributes/development", false))
           .setMessagingReceiveTelemetryEnabled(
               ExperimentalConfig.get().messagingReceiveInstrumentationEnabled())
           .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders())

instrumentation/internal/internal-application-logger/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/logging/ApplicationLoggingIgnoredTypesConfigurer.java

@@ -8,13 +8,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public final class ApplicationLoggingIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
+  public void configure(IgnoredTypesBuilder builder) {
     builder.allowClass("org.slf4j.LoggerFactory");
     builder.allowClass("org.springframework.boot.SpringApplication");
     builder.allowClass("org.springframework.boot.logging.LoggingApplicationListener");

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderIgnoredTypesConfigurer.java

@@ -8,13 +8,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public class ClassLoaderIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
+  public void configure(IgnoredTypesBuilder builder) {
     builder.allowClass("jdk.internal.loader.BuiltinClassLoader");
     builder.allowClass("sun.misc.Launcher$AppClassLoader");
   }