explicit check

Author: zeitlinger

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

@@ -18,6 +18,7 @@
 public final class ConfigPropertiesBackedConfigProvider implements ConfigProvider {
 
   private final DeclarativeConfigProperties instrumentationConfig;
+  private final ConfigProperties configProperties;
 
   public static ConfigProvider create(ConfigProperties configProperties) {
     return new ConfigPropertiesBackedConfigProvider(configProperties);
@@ -27,10 +28,15 @@ private ConfigPropertiesBackedConfigProvider(ConfigProperties configProperties)
     this.instrumentationConfig =
         ConfigPropertiesBackedDeclarativeConfigProperties.createInstrumentationConfig(
             configProperties);
+    this.configProperties = configProperties;
   }
 
   @Override
   public DeclarativeConfigProperties getInstrumentationConfig() {
     return instrumentationConfig;
   }
+
+  public ConfigProperties getConfigProperties() {
+    return configProperties;
+  }
 }

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

@@ -132,16 +132,6 @@ public String getString(String name) {
   @Nullable
   @Override
   public Boolean getBoolean(String name) {
-    String fullPath = pathWithName(name);
-    if (fullPath.equals("java.common.thread_details.enabled")) {
-      Boolean value = configProperties.getBoolean("otel.javaagent.add-thread-details");
-      if (value != null) {
-        return value;
-      }
-      // Default to true in system properties if not set
-      return true;
-    }
-
     return configProperties.getBoolean(resolvePropertyKey(name));
   }
 

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

@@ -84,15 +84,6 @@ 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

@@ -0,0 +1,37 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.incubator.thread;
+
+import static io.opentelemetry.api.common.AttributeKey.longKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
+import javax.annotation.Nullable;
+
+public class ThreadDetailsAttributesExtractor<RESPONSE, REQUEST>
+    implements AttributesExtractor<REQUEST, RESPONSE> {
+  // attributes are not stable yet
+  private static final AttributeKey<Long> THREAD_ID = longKey("thread.id");
+  private static final AttributeKey<String> THREAD_NAME = stringKey("thread.name");
+
+  @Override
+  public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
+    Thread currentThread = Thread.currentThread();
+    attributes.put(THREAD_ID, currentThread.getId());
+    attributes.put(THREAD_NAME, currentThread.getName());
+  }
+
+  @Override
+  public void onEnd(
+      AttributesBuilder attributes,
+      Context context,
+      REQUEST request,
+      @Nullable RESPONSE response,
+      @Nullable Throwable error) {}
+}

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/thread/ThreadDetailsAttributesExtractor.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.thread;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.InstrumenterCustomizer;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.InstrumenterCustomizerProvider;
+import io.opentelemetry.instrumentation.api.incubator.thread.ThreadDetailsAttributesExtractor;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public class ThreadDetailsInstrumenterCustomizerProvider implements InstrumenterCustomizerProvider {
+  @Override
+  public void customize(InstrumenterCustomizer customizer) {
+    OpenTelemetry openTelemetry = customizer.getOpenTelemetry();
+    if (openTelemetry instanceof ExtendedOpenTelemetry) {
+      if (((ExtendedOpenTelemetry) openTelemetry)
+          .getInstrumentationConfig("common")
+          .get("thread_details")
+          .getBoolean("enabled", false)) {
+        customizer.addAttributesExtractor(new ThreadDetailsAttributesExtractor<>());
+      }
+    }
+  }
+}

instrumentation-api-incubator/src/test/resources/META-INF/services/io.opentelemetry.instrumentation.api.incubator.instrumenter.InstrumenterCustomizerProvider

@@ -0,0 +1 @@
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.thread.ThreadDetailsInstrumenterCustomizerProvider

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.tooling.config;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
+import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.InstrumenterCustomizer;
+import io.opentelemetry.instrumentation.api.incubator.instrumenter.InstrumenterCustomizerProvider;
+import io.opentelemetry.instrumentation.api.incubator.thread.ThreadDetailsAttributesExtractor;
+import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedConfigProvider;
+
+@AutoService(InstrumenterCustomizerProvider.class)
+public class ThreadDetailsInstrumenterCustomizerProvider implements InstrumenterCustomizerProvider {
+  @Override
+  public void customize(InstrumenterCustomizer customizer) {
+    if (customizer.getOpenTelemetry() instanceof ExtendedOpenTelemetry) {
+      ExtendedOpenTelemetry openTelemetry = (ExtendedOpenTelemetry) customizer.getOpenTelemetry();
+      ConfigProvider configProvider = openTelemetry.getConfigProvider();
+      boolean threadDetailsEnabled =
+          configProvider instanceof ConfigPropertiesBackedConfigProvider
+              ?
+              // declarative configuration not in use, read from ConfigProperties
+              ((ConfigPropertiesBackedConfigProvider) configProvider)
+                  .getConfigProperties()
+                  .getBoolean("otel.javaagent.add-thread-details", true)
+              : openTelemetry
+                  .getInstrumentationConfig("common")
+                  .get("thread_details")
+                  .getBoolean("enabled", false);
+
+      if (threadDetailsEnabled) {
+        customizer.addAttributesExtractor(new ThreadDetailsAttributesExtractor<>());
+      }
+    }
+  }
+}

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/services/io.opentelemetry.instrumentation.api.incubator.instrumenter.InstrumenterCustomizerProvider

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.incubator.instrumenter;
+package io.opentelemetry.javaagent.tooling.config;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 import static java.util.Collections.emptyMap;