pr review

Author: zeitlinger

instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionInstrumentationModule.java

@@ -13,7 +13,6 @@
 import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ClassInjector;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.InjectionMode;
-import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
@@ -25,7 +24,8 @@ public ReflectionInstrumentationModule() {
 
   @Override
   public boolean defaultEnabled() {
-    return EarlyInitAgentConfig.get().isInternalReflectionEnabled();
+    // internal instrumentations are always enabled by default
+    return true;
   }
 
   @Override

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/EarlyInitAgentConfig.java

@@ -50,11 +50,6 @@ public boolean isExperimentalFieldInjectionEnabled() {
     return getBoolean("otel.javaagent.experimental.field-injection.enabled", true);
   }
 
-  public boolean isInternalReflectionEnabled() {
-    // internal instrumentations are always enabled by default
-    return getBoolean("otel.javaagent.internal-reflection.enabled", true);
-  }
-
   public int getLoggingApplicationLogsBufferMaxRecords() {
     return getInt("otel.javaagent.logging.application.logs-buffer-max-records", 2048);
   }

muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java

@@ -6,10 +6,8 @@
 package io.opentelemetry.javaagent.tooling.muzzle;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.instrumentation.api.internal.cache.Cache;
 import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder;
-import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
 import java.lang.instrument.Instrumentation;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
@@ -52,10 +50,6 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
   // Many things are package visible for testing purposes --
   // others to avoid creation of synthetic accessors
 
-  // cannot use EarlyInitAgentConfig here
-  private static final boolean REFLECTION_ENABLED =
-      ConfigPropertiesUtil.getBoolean("otel.javaagent.internal-reflection.enabled", true);
-
   private static final Method findLoadedClassMethod = getFindLoadedClassMethod();
 
   static final int TYPE_CAPACITY = 64;
@@ -625,12 +619,6 @@ public TypeList.Generic getInterfaces() {
           Class<?> clazz = classRef.get();
           if (clazz != null) {
             for (Class<?> interfaceClass : clazz.getInterfaces()) {
-              // virtual field accessors are removed by internal-reflection instrumentation
-              // we do this extra check for tests run with internal-reflection disabled
-              if (!REFLECTION_ENABLED
-                  && VirtualFieldAccessorMarker.class.isAssignableFrom(interfaceClass)) {
-                continue;
-              }
               // using raw type
               result.add(newTypeDescription(interfaceClass));
             }