Remove internal-proxy instrumentation (#4749)

open-telemetry · Nov 30, 2021 · f5142f2 · f5142f2
1 parent 05e163e
commit f5142f2
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 242 deletions.
diff --git a/instrumentation/internal/internal-proxy/javaagent-unit-tests/build.gradle.kts b/instrumentation/internal/internal-proxy/javaagent-unit-tests/build.gradle.kts
diff --git a/...ation/internal/internal-proxy/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy b/...ation/internal/internal-proxy/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy
diff --git a/instrumentation/internal/internal-proxy/javaagent/build.gradle.kts b/instrumentation/internal/internal-proxy/javaagent/build.gradle.kts
diff --git a/.../src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyHelper.java b/.../src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyHelper.java
diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentation.java b/.../java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentation.java
diff --git a/...io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java b/...io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java
diff --git a/...rumentation/internal/internal-proxy/javaagent/src/test/groovy/NewProxyInstanceTest.groovy b/...rumentation/internal/internal-proxy/javaagent/src/test/groovy/NewProxyInstanceTest.groovy
diff --git a/...java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionHelper.java b/...java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionHelper.java
@@ -34,15 +34,8 @@ public static Field[] filterFields(Class<?> containingClass, Field[] fields) {
  }
 
  public static Method[] filterMethods(Class<?> containingClass, Method[] methods) {
- if (methods.length == 0) {
- return methods;
- } else if (containingClass.isInterface()
- && containingClass.isSynthetic()
- && VirtualFieldAccessorMarker.class.isAssignableFrom(containingClass)
- && containingClass.getName().contains("VirtualFieldAccessor$")) {
- // hide all methods from virtual field accessor interfaces
- return new Method[0];
- } else if (!VirtualFieldInstalledMarker.class.isAssignableFrom(containingClass)) {
+ if (methods.length == 0
+ || !VirtualFieldInstalledMarker.class.isAssignableFrom(containingClass)) {
  // nothing to filter when class does not have any added virtual fields
  return methods;
  }

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
@@ -32,7 +32,6 @@
 import io.opentelemetry.javaagent.tooling.muzzle.AgentTooling;
 import io.opentelemetry.javaagent.tooling.util.Trie;
 import java.lang.instrument.Instrumentation;
-import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -76,14 +75,6 @@ public class AgentInstaller {
  // this needs to be done as early as possible - before the first Config.get() call
  ConfigInitializer.initialize();
 
- // ensure java.lang.reflect.Proxy is loaded, as transformation code uses it internally
- // loading java.lang.reflect.Proxy after the bytebuddy transformer is set up causes
- // the internal-proxy instrumentation module to transform it, and then the bytebuddy
- // transformation code also tries to load it, which leads to a ClassCircularityError
- // loading java.lang.reflect.Proxy early here still allows it to be retransformed by the
- // internal-proxy instrumentation module after the bytebuddy transformer is set up
- Proxy.class.getName();
-
  Integer strictContextStressorMillis = Integer.getInteger(STRICT_CONTEXT_STRESSOR_MILLIS);
  if (strictContextStressorMillis != null) {
  io.opentelemetry.context.ContextStorage.addWrapper(

diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -72,7 +72,6 @@ dependencies {
  baseJavaagentLibs(project(":instrumentation:internal:internal-class-loader:javaagent"))
  baseJavaagentLibs(project(":instrumentation:internal:internal-eclipse-osgi-3.6:javaagent"))
  baseJavaagentLibs(project(":instrumentation:internal:internal-lambda:javaagent"))
- baseJavaagentLibs(project(":instrumentation:internal:internal-proxy:javaagent"))
  baseJavaagentLibs(project(":instrumentation:internal:internal-reflection:javaagent"))
  baseJavaagentLibs(project(":instrumentation:internal:internal-url-class-loader:javaagent"))
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -139,8 +139,6 @@ include(":instrumentation:internal:internal-class-loader:javaagent-integration-t
 include(":instrumentation:internal:internal-eclipse-osgi-3.6:javaagent")
 include(":instrumentation:internal:internal-lambda:javaagent")
 include(":instrumentation:internal:internal-lambda-java9:javaagent")
-include(":instrumentation:internal:internal-proxy:javaagent")
-include(":instrumentation:internal:internal-proxy:javaagent-unit-tests")
 include(":instrumentation:internal:internal-reflection:javaagent")
 include(":instrumentation:internal:internal-reflection:javaagent-integration-tests")
 include(":instrumentation:internal:internal-url-class-loader:javaagent")