agent tracer customizer

Author: zeitlinger

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentTracerCustomizerProvider.java renamed to sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/sdk/LoggingSpanExporterCustomizerProvider.java

@@ -3,18 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.tooling;
+package io.opentelemetry.instrumentation.sdk;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
 
-@AutoService(DeclarativeConfigurationCustomizerProvider.class)
-public class AgentTracerCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
+public class LoggingSpanExporterCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
   @Override
   public void customize(DeclarativeConfigurationCustomizer customizer) {
     customizer.addModelCustomizer(

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ThreadDetailsComponentProvider.java renamed to sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/thread/ThreadDetailsComponentProvider.java

@@ -3,16 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.tooling;
+package io.opentelemetry.instrumentation.thread;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
-import io.opentelemetry.instrumentation.thread.AddThreadDetailsSpanProcessor;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.trace.SpanProcessor;
 
-@SuppressWarnings("rawtypes")
-@AutoService(ComponentProvider.class)
 public class ThreadDetailsComponentProvider implements ComponentProvider<SpanProcessor> {
   @Override
   public String getName() {

sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/thread/ThreadDetailsCustomizerProvider.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.thread;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
+
+public class ThreadDetailsCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
+  @Override
+  public void customize(DeclarativeConfigurationCustomizer customizer) {
+    customizer.addModelCustomizer(
+        model -> {
+          DeclarativeConfigProperties properties =
+              SdkConfigProvider.create(model).getInstrumentationConfig();
+          if (properties == null) {
+            properties = DeclarativeConfigProperties.empty();
+          }
+          DeclarativeConfigProperties java =
+              properties.getStructured("java", DeclarativeConfigProperties.empty());
+          if (!java.getBoolean("enabled", true)) {
+            // todo extract this logic to a common place
+            // todo should this be pulled out or to be reusable by spring?
+            return model;
+          }
+
+          if (java.getStructured("thread_details", DeclarativeConfigProperties.empty())
+              .getBoolean("enabled", true)) {
+            TracerProviderModel tracerProvider = model.getTracerProvider();
+            if (tracerProvider != null) {
+              tracerProvider
+                  .getProcessors()
+                  .add(new SpanProcessorModel().withAdditionalProperty("thread_details", null));
+            }
+          }
+
+
+          // todo also add logging like in AgentTracerProviderConfigurer
+
+          return model;
+        });
+  }
+}

sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

@@ -0,0 +1 @@
+io.opentelemetry.instrumentation.thread.ThreadDetailsComponentProvider

sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider

@@ -0,0 +1,2 @@
+io.opentelemetry.instrumentation.thread.ThreadDetailsCustomizerProvider
+io.opentelemetry.instrumentation.sdk.LoggingSpanExporterCustomizerProvider

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/AgentTracerComponentProviderTest.java renamed to sdk-autoconfigure-support/src/test/java/io/opentelemetry/instrumentation/thread/ThreadDetailsConfigurationCustomizerProviderTest.java

@@ -1,9 +1,4 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.javaagent.tooling;
+package io.opentelemetry.instrumentation.thread;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -14,15 +9,15 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
 import org.junit.jupiter.api.Test;
 
-class AgentTracerComponentProviderTest {
+class ThreadDetailsConfigurationCustomizerProviderTest {
+
   @Test
   void addSpanProcessor() {
     OpenTelemetryConfigurationModel model =
-        new DeclarativeConfigurationBuilder()
-            .customizeModel(
-                new OpenTelemetryConfigurationModel()
-                    .withFileFormat("0.4")
-                    .withTracerProvider(new TracerProviderModel()));
+        new DeclarativeConfigurationBuilder().customizeModel(
+            new OpenTelemetryConfigurationModel()
+                .withFileFormat("0.4")
+                .withTracerProvider(new TracerProviderModel()));
 
     try (OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model)) {
       assertThat(sdk.toString()).containsOnlyOnce("AddThreadDetailsSpanProcessor");