agent tracer customizer

Author: zeitlinger

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

@@ -6,8 +6,10 @@
 package io.opentelemetry.javaagent.tooling;
 
 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;
 
@@ -17,22 +19,32 @@ public class AgentTracerCustomizerProvider implements DeclarativeConfigurationCu
   public void customize(DeclarativeConfigurationCustomizer customizer) {
     customizer.addModelCustomizer(
         model -> {
-          TracerProviderModel tracerProvider = model.getTracerProvider();
-          if (tracerProvider == null) {
+          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;
           }
-          //          InstrumentationModel instrumentationModel =
-          // model.getInstrumentationDevelopment();
-          //          ExperimentalLanguageSpecificInstrumentationModel java =
-          // instrumentationModel.getJava();
-          // todo how to get the "add_thread_details" from the config?
-          // do we need a ConfigProvider?
+
+          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
 
-          tracerProvider
-              .getProcessors()
-              .add(new SpanProcessorModel().withAdditionalProperty("thread_details", null));
           return model;
         });
   }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentTracerComponentProvider.java renamed to javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ThreadDetailsComponentProvider.java

@@ -13,7 +13,7 @@
 
 @SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class AgentTracerComponentProvider implements ComponentProvider<SpanProcessor> {
+public class ThreadDetailsComponentProvider implements ComponentProvider<SpanProcessor> {
   @Override
   public String getName() {
     return "thread_details";