convert dynamic config to use the new SdkTracerProvider.setTracerConfigurator (#565)

* convert dynamic config to use the new SdkTracerProvider.setTracerConfigurator

* cleanup and spotless

Author: jackshirazi

custom/src/main/java/co/elastic/otel/dynamicconfig/DynamicConfiguration.java

@@ -18,7 +18,7 @@
  */
 package co.elastic.otel.dynamicconfig;
 
-import static co.elastic.otel.dynamicconfig.DynamicInstrumentation.updateTracerConfigurations;
+import static co.elastic.otel.dynamicconfig.DynamicInstrumentation.setProviderTracerConfigurator;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
@@ -111,14 +111,16 @@ public void reenableTracesFor(String instrumentationName) {
     UpdatableConfigurator.INSTANCE.put(
         InstrumentationScopeInfo.create(INSTRUMENTATION_NAME_PREPEND + instrumentationName),
         TracerConfig.enabled());
-    updateTracerConfigurations(GlobalOpenTelemetry.getTracerProvider());
+    setProviderTracerConfigurator(
+        GlobalOpenTelemetry.getTracerProvider(), UpdatableConfigurator.INSTANCE);
   }
 
   public void disableTracesFor(String instrumentationName) {
     UpdatableConfigurator.INSTANCE.put(
         InstrumentationScopeInfo.create(INSTRUMENTATION_NAME_PREPEND + instrumentationName),
         TracerConfig.disabled());
-    updateTracerConfigurations(GlobalOpenTelemetry.getTracerProvider());
+    setProviderTracerConfigurator(
+        GlobalOpenTelemetry.getTracerProvider(), UpdatableConfigurator.INSTANCE);
   }
 
   public void disableAllTraces() {

custom/src/main/java/co/elastic/otel/dynamicconfig/DynamicInstrumentation.java

@@ -18,36 +18,23 @@
  */
 package co.elastic.otel.dynamicconfig;
 
-import static co.elastic.otel.dynamicconfig.DynamicConfiguration.INSTRUMENTATION_NAME_PREPEND;
-
-import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
-import io.opentelemetry.sdk.internal.ComponentRegistry;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.internal.TracerConfig;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Notes: 1. The instrumentation can't have been disabled by configuration, eg using
  * -Dotel.instrumentation.[name].enabled=false as in that case it is never initialized so can't be
- * "re-enabled" 2. The specific instrumentation name is used, you can see these by setting this
- * class logging level to j.u.l.Level.CONFIG 3. The disable/re-enable is eventually consistent,
- * needing the application to pass a synchronization barrier to take effect - but for most
- * applications these are very frequent
+ * "re-enabled" 2. The disable/re-enable is eventually consistent, needing the application to pass a
+ * synchronization barrier to take effect - but for most applications these are very frequent
  */
 public class DynamicInstrumentation {
 
-  private static final Logger logger = Logger.getLogger(DynamicInstrumentation.class.getName());
-
   private static Object getField(String fieldname, Object target) {
     try {
       Field field = target.getClass().getDeclaredField(fieldname);
@@ -59,17 +46,6 @@ private static Object getField(String fieldname, Object target) {
     }
   }
 
-  private static Object call(String methodname, Object target) {
-    try {
-      Method method = target.getClass().getDeclaredMethod(methodname);
-      method.setAccessible(true);
-      return method.invoke(target);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      throw new IllegalStateException(
-          "Error calling " + methodname + " on " + target.getClass(), e);
-    }
-  }
-
   private static <T> Object call(
       String methodname, Object target, T arg1, Class<? super T> arg1Class) {
     try {
@@ -91,75 +67,19 @@ public static SdkTracerProviderBuilder setTracerConfigurator(
     return sdkTracerProviderBuilder;
   }
 
-  // SdkTracerProvider.getTracerConfig(InstrumentationScopeInfo instrumentationScopeInfo)
-  // here because it's not currently public
-  private static TracerConfig getTracerConfig(
-      SdkTracerProvider provider, InstrumentationScopeInfo instrumentationScopeInfo) {
-    return (TracerConfig)
-        call("getTracerConfig", provider, instrumentationScopeInfo, InstrumentationScopeInfo.class);
-  }
-
-  // SdkTracer.getInstrumentationScopeInfo()
+  // SdkTracerProvider.setTracerConfigurator(ScopeConfigurator tracerConfigurator)
   // here because it's not currently public
-  private static InstrumentationScopeInfo getInstrumentationScopeInfo(Tracer sdkTracer)
-      throws NoSuchFieldException, IllegalAccessException {
-    return (InstrumentationScopeInfo) call("getInstrumentationScopeInfo", sdkTracer);
-  }
-
-  // Not an existing method
-  // SdkTracerProvider.updateTracerConfigurations()
-  // updates all tracers with the current SdkTracerProvider.tracerConfigurator
-  // Code implementation equivalent to
-  // this.tracerSdkComponentRegistry
-  //        .getComponents()
-  //        .forEach(
-  //            sdkTracer ->
-  //                sdkTracer.updateTracerConfig(
-  //                    getTracerConfig(sdkTracer.getInstrumentationScopeInfo())));
-  // where SdkTracer.updateTracerConfig(TracerConfig tracerConfig) is equivalent to
-  //  this.tracerEnabled = tracerConfig.isEnabled();
-  static void updateTracerConfigurations(TracerProvider provider) {
+  public static TracerConfig setProviderTracerConfigurator(
+      TracerProvider provider, ScopeConfigurator<TracerConfig> tracerConfigurator) {
     if (!(provider instanceof SdkTracerProvider)) {
       provider = (TracerProvider) getField("delegate", provider);
     }
-    ComponentRegistry<Tracer> tracerSdkComponentRegistry =
-        (ComponentRegistry<Tracer>) getField("tracerSdkComponentRegistry", provider);
-    SdkTracerProvider finalProvider = (SdkTracerProvider) provider;
-    final List<String> activatedTracers;
-    if (logger.isLoggable(Level.CONFIG)) {
-      activatedTracers = new ArrayList<>();
+    if (provider instanceof SdkTracerProvider) {
+      return (TracerConfig)
+          call("setTracerConfigurator", provider, tracerConfigurator, ScopeConfigurator.class);
     } else {
-      activatedTracers = null;
-    }
-    tracerSdkComponentRegistry
-        .getComponents()
-        .forEach(
-            sdkTracer -> {
-              try {
-                InstrumentationScopeInfo instrumentationScopeInfo =
-                    getInstrumentationScopeInfo(sdkTracer);
-                TracerConfig tConfig = getTracerConfig(finalProvider, instrumentationScopeInfo);
-                Field tracerEnabledField = sdkTracer.getClass().getDeclaredField("tracerEnabled");
-                tracerEnabledField.setAccessible(true);
-                // Update is synced but the reader is NOT necessarily so this is eventual
-                // consistency, takes effect when the application passes a sync boundary
-                synchronized (sdkTracer) {
-                  tracerEnabledField.set(sdkTracer, tConfig.isEnabled());
-                }
-                if (logger.isLoggable(Level.CONFIG)) {
-                  String name = instrumentationScopeInfo.getName();
-                  if (name.startsWith(INSTRUMENTATION_NAME_PREPEND)) {
-                    name = name.substring(INSTRUMENTATION_NAME_PREPEND.length());
-                  }
-                  activatedTracers.add(name);
-                  activatedTracers.add(tConfig.isEnabled() ? "enabled" : "disabled");
-                }
-              } catch (NoSuchFieldException | IllegalAccessException e) {
-                throw new RuntimeException(e);
-              }
-            });
-    if (logger.isLoggable(Level.CONFIG)) {
-      logger.log(Level.CONFIG, "Activated Tracers: " + activatedTracers);
+      throw new IllegalStateException(
+          "Expected SdkTracerProvider but got " + provider.getClass().getName());
     }
   }
 

custom/src/test/java/co/elastic/otel/config/DynamicInstrumentationTest.java

@@ -19,7 +19,6 @@
 package co.elastic.otel.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
@@ -50,8 +49,8 @@ public void checkForPublicImplementations() throws NoSuchMethodException, ClassN
     Method method3 = sdkTracer.getDeclaredMethod("getInstrumentationScopeInfo");
     assertThat(Modifier.toString(method3.getModifiers())).isNotEqualTo("public");
 
-    assertThatThrownBy(
-            () -> SdkTracerProvider.class.getDeclaredMethod("updateTracerConfigurations"))
-        .isInstanceOf(NoSuchMethodException.class);
+    Method method4 =
+        SdkTracerProvider.class.getDeclaredMethod("setTracerConfigurator", ScopeConfigurator.class);
+    assertThat(Modifier.toString(method4.getModifiers())).isNotEqualTo("public");
   }
 }

smoke-tests/src/test/java/com/example/javaagent/smoketest/DynamicInstrumentationSmokeTest.java

@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 class DynamicInstrumentationSmokeTest extends TestAppSmokeTest {
@@ -59,13 +58,11 @@ public void endTest() throws InterruptedException {
   }
 
   @Test
-  @Disabled // https://github.com/elastic/elastic-otel-java/issues/562
   public void flipMethodInstrumentation() throws InterruptedException {
     dynamicFlipInstrumentation("Methods", 1);
   }
 
   @Test
-  @Disabled // https://github.com/elastic/elastic-otel-java/issues/562
   public void flipAllInstrumentation() throws InterruptedException {
     dynamicFlipInstrumentation("All", 0);
   }