AddThreadDetailsSpanProcessor isn't needed any more

Author: zeitlinger

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

@@ -95,6 +95,7 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties
     SPECIAL_MAPPINGS.put("java.jmx.enabled", "otel.jmx.enabled");
     SPECIAL_MAPPINGS.put("java.jmx.config", "otel.jmx.config");
     SPECIAL_MAPPINGS.put("java.jmx.target.system", "otel.jmx.target.system");
+    SPECIAL_MAPPINGS.put("java.common.thread_details.enabled", "otel.javaagent.add-thread-details");
   }
 
   private final ConfigProperties configProperties;

declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java

@@ -84,6 +84,15 @@ void testAgentPrefix() {
         .isTrue();
   }
 
+  @Test
+  void testThreadDetails() {
+    DeclarativeConfigProperties config = createConfig("otel.javaagent.add-thread-details", "true");
+
+    assertThat(config.get("java").get("common").get("thread_details").getBoolean("enabled"))
+        .isNotNull()
+        .isTrue();
+  }
+
   @Test
   void testJmxPrefix() {
     DeclarativeConfigProperties config = createConfig("otel.jmx.enabled", "true");

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/ThreadDetailsInstrumenterCustomizerProvider.java

@@ -7,13 +7,11 @@
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
-import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
-import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import javax.annotation.Nullable;
@@ -23,19 +21,10 @@ public class ThreadDetailsInstrumenterCustomizerProvider implements Instrumenter
   public void customize(InstrumenterCustomizer customizer) {
     OpenTelemetry openTelemetry = customizer.getOpenTelemetry();
     if (openTelemetry instanceof ExtendedOpenTelemetry) {
-      // Declarative config is used.
-      // Otherwise, thread details are configured in
-      // io.opentelemetry.javaagent.tooling.AgentTracerProviderConfigurer.
-
-      DeclarativeConfigProperties instrumentationConfig =
-          ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider().getInstrumentationConfig();
-
-      if (instrumentationConfig != null
-          && instrumentationConfig
-              .getStructured("java", empty())
-              .getStructured("common", empty())
-              .getStructured("thread_details", empty())
-              .getBoolean("enabled", false)) {
+      if (((ExtendedOpenTelemetry) openTelemetry)
+          .getInstrumentationConfig("common")
+          .get("thread_details")
+          .getBoolean("enabled", false)) {
         customizer.addAttributesExtractor(new ThreadDetailsAttributesExtractor<>());
       }
     }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/thread/ThreadDetailsAutoConfiguration.java

@@ -16,8 +16,7 @@ io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.w
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.scheduling.SpringSchedulingInstrumentationAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.RuntimeMetricsAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java8RuntimeMetricsProvider,\
-io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java17RuntimeMetricsProvider,\
-io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.thread.ThreadDetailsAutoConfiguration
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java17RuntimeMetricsProvider
 
 org.springframework.context.ApplicationListener=\
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.logging.LogbackAppenderApplicationListener

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -21,4 +21,3 @@ io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.s
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.RuntimeMetricsAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java8RuntimeMetricsProvider
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java17RuntimeMetricsProvider
-io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.thread.ThreadDetailsAutoConfiguration

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -10,7 +10,6 @@
 import com.google.auto.service.AutoService;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.exporter.logging.LoggingSpanExporter;
-import io.opentelemetry.instrumentation.thread.internal.AddThreadDetailsSpanProcessor;
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
@@ -20,8 +19,6 @@
 
 @AutoService(AutoConfigurationCustomizerProvider.class)
 public class AgentTracerProviderConfigurer implements AutoConfigurationCustomizerProvider {
-  private static final String ADD_THREAD_DETAILS = "otel.javaagent.add-thread-details";
-
   @Override
   public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
     autoConfigurationCustomizer.addTracerProviderCustomizer(
@@ -32,24 +29,15 @@ public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
   private static SdkTracerProviderBuilder configure(
       SdkTracerProviderBuilder sdkTracerProviderBuilder, ConfigProperties config) {
 
-    // Register additional thread details logging span processor
-    if (config.getBoolean(ADD_THREAD_DETAILS, true)) {
-      sdkTracerProviderBuilder.addSpanProcessor(new AddThreadDetailsSpanProcessor());
-    }
-
-    maybeEnableLoggingExporter(sdkTracerProviderBuilder, config);
-
-    return sdkTracerProviderBuilder;
-  }
-
-  private static void maybeEnableLoggingExporter(
-      SdkTracerProviderBuilder builder, ConfigProperties config) {
     if (EarlyInitAgentConfig.get().isDebug()) {
       // don't install another instance if the user has already explicitly requested it.
       if (loggingExporterIsNotAlreadyConfigured(config)) {
-        builder.addSpanProcessor(SimpleSpanProcessor.create(LoggingSpanExporter.create()));
+        sdkTracerProviderBuilder.addSpanProcessor(
+            SimpleSpanProcessor.create(LoggingSpanExporter.create()));
       }
     }
+
+    return sdkTracerProviderBuilder;
   }
 
   private static boolean loggingExporterIsNotAlreadyConfigured(ConfigProperties config) {

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentTracerProviderConfigurer.java

@@ -8,7 +8,6 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.thread.ThreadDetailsAutoConfiguration;
 import java.time.Duration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -55,7 +54,6 @@ void setUpContext() {
             .withConfiguration(
                 AutoConfigurations.of(
                     OpenTelemetryAutoConfiguration.class,
-                    ThreadDetailsAutoConfiguration.class,
                     SpringSmokeOtelConfiguration.class,
                     kafkaAutoConfigurationClass(),
                     KafkaInstrumentationAutoConfiguration.class,