Reduce unsafe usages

laurit · laurit · commit c9f31da9b74a · 2025-10-01T17:27:56.000+03:00
diff --git a/instrumentation/executors/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/executors/ThreadPoolExecutorTest.java b/instrumentation/executors/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/executors/ThreadPoolExecutorTest.java
@@ -10,7 +10,7 @@
 
 import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java
@@ -17,8 +17,10 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import io.opentelemetry.javaagent.bootstrap.InjectedClassHelper;
+import io.opentelemetry.javaagent.bootstrap.InjectedClassHelper.HelperClassLoader;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import java.lang.invoke.MethodHandles;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.method.MethodDescription;
@@ -59,8 +61,12 @@ public static class LoadClassAdvice {
 
     @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
     public static Class<?> onEnter(
-        @Advice.This ClassLoader classLoader, @Advice.Argument(0) String name) {
-      return InjectedClassHelper.loadHelperClass(classLoader, name);
+        @Advice.This ClassLoader classLoader, @Advice.Argument(0) String name) throws Throwable {
+      HelperClassLoader helperClassLoader =
+          InjectedClassHelper.getHelperClassLoader(classLoader, name);
+      return helperClassLoader != null
+          ? helperClassLoader.loadHelperClass(MethodHandles.lookup())
+          : null;
     }
 
     @AssignReturned.ToReturned
diff --git a/instrumentation/internal/internal-lambda/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationTest.java b/instrumentation/internal/internal-lambda/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/LambdaInstrumentationTest.java
@@ -7,7 +7,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import org.junit.jupiter.api.Test;
 
 class LambdaInstrumentationTest {
diff --git a/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/ReflectionTest.java b/instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/ReflectionTest.java
@@ -7,8 +7,8 @@
 
 import instrumentation.TestHelperClass;
 import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import java.io.ObjectStreamClass;
 import java.io.Serializable;
 import java.lang.reflect.Field;
diff --git a/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionHelper.java b/instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionHelper.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.internal.reflection;
 
 import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldDetector;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldDetector;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/InjectedClassHelper.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/InjectedClassHelper.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.bootstrap;
 
+import java.lang.invoke.MethodHandles;
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
@@ -37,21 +38,25 @@ public static boolean isHelperClass(ClassLoader classLoader, String className) {
     return helperClassDetector.test(classLoader, className);
   }
 
-  private static volatile BiFunction<ClassLoader, String, Class<?>> helperClassLoader;
+  private static volatile BiFunction<ClassLoader, String, HelperClassLoader> helperClassLoader;
 
   public static void internalSetHelperClassLoader(
-      BiFunction<ClassLoader, String, Class<?>> helperClassLoader) {
+      BiFunction<ClassLoader, String, HelperClassLoader> helperClassLoader) {
     if (InjectedClassHelper.helperClassLoader != null) {
       // Only possible by misuse of this API, just ignore.
       return;
     }
     InjectedClassHelper.helperClassLoader = helperClassLoader;
   }
 
-  public static Class<?> loadHelperClass(ClassLoader classLoader, String className) {
+  public static HelperClassLoader getHelperClassLoader(ClassLoader classLoader, String className) {
     if (helperClassLoader == null) {
       return null;
     }
     return helperClassLoader.apply(classLoader, className);
   }
+
+  public interface HelperClassLoader {
+    Class<?> loadHelperClass(MethodHandles.Lookup lookup) throws Throwable;
+  }
 }
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/field/VirtualFieldAccessorMarker.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/field/VirtualFieldAccessorMarker.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.bootstrap;
+package io.opentelemetry.javaagent.bootstrap.field;
 
 /** A marker interface implemented by virtual field accessor classes. */
 public interface VirtualFieldAccessorMarker {}
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/field/VirtualFieldDetector.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/field/VirtualFieldDetector.java
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.bootstrap;
+package io.opentelemetry.javaagent.bootstrap.field;
 
 import io.opentelemetry.instrumentation.api.internal.cache.Cache;
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 
 /** Helper class for detecting whether given class has virtual fields. */
@@ -48,4 +49,8 @@ public static boolean hasVirtualField(Class<?> clazz, String virtualFieldInterfa
   public static void markVirtualFields(Class<?> clazz, Collection<String> virtualFieldClassName) {
     classesWithVirtualFields.put(clazz, virtualFieldClassName);
   }
+
+  public static MethodHandles.Lookup lookup() {
+    return MethodHandles.lookup();
+  }
 }
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/field/VirtualFieldInstalledMarker.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/field/VirtualFieldInstalledMarker.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.bootstrap;
+package io.opentelemetry.javaagent.bootstrap.field;
 
 /**
  * A marker interface that signifies that virtual fields have been installed into the class that
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
@@ -131,6 +131,16 @@ private static void installBytebuddyAgent(
     // https://bugs.openjdk.org/browse/JDK-8164165
     ThreadLocalRandom.current();
 
+    // AgentBuilder.Default constructor triggers sun.misc.Unsafe::objectFieldOffset called warning
+    // AgentBuilder$Default.<init>
+    // -> NexusAccessor.<clinit>
+    // -> ClassInjector$UsingReflection.<clinit>
+    // -> ClassInjector$UsingUnsafe.<clinit>
+    // -> WARNING: sun.misc.Unsafe::objectFieldOffset called by
+    // net.bytebuddy.dynamic.loading.ClassInjector$UsingUnsafe$Dispatcher$CreationAction
+    // we don't use byte-buddy nexus so we disable it and later restore the original value for the
+    // system property
+    String originalNexusDisabled = System.setProperty("net.bytebuddy.nexus.disabled", "true");
     AgentBuilder agentBuilder =
         new AgentBuilder.Default(
                 // default method graph compiler inspects the class hierarchy, we don't need it, so
@@ -147,6 +157,13 @@ private static void installBytebuddyAgent(
             .with(AgentTooling.poolStrategy())
             .with(AgentTooling.transformListener())
             .with(AgentTooling.locationStrategy());
+    // restore the original value for the nexus disabled property
+    if (originalNexusDisabled != null) {
+      System.setProperty("net.bytebuddy.nexus.disabled", originalNexusDisabled);
+    } else {
+      System.clearProperty("net.bytebuddy.nexus.disabled");
+    }
+
     if (JavaModule.isSupported()) {
       agentBuilder = agentBuilder.with(new ExposeAgentBootstrapListener(inst));
     }
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldAccessorInterfacesGenerator.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldAccessorInterfacesGenerator.java
@@ -9,7 +9,7 @@
 import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldNames.getRealGetterName;
 import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldNames.getRealSetterName;
 
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
 import io.opentelemetry.javaagent.tooling.muzzle.VirtualFieldMappings;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationClassFileLocatorProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationClassFileLocatorProvider.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.tooling.field;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
 import io.opentelemetry.javaagent.tooling.muzzle.ClassFileLocatorProvider;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.description.modifier.SyntheticState;
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationInstaller.java
@@ -15,7 +15,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldDetector;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldDetector;
 import io.opentelemetry.javaagent.tooling.HelperInjector;
 import io.opentelemetry.javaagent.tooling.TransformSafeLogger;
 import io.opentelemetry.javaagent.tooling.instrumentation.InstrumentationModuleInstaller;
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/GeneratedVirtualFieldNames.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/GeneratedVirtualFieldNames.java
@@ -5,6 +5,8 @@
 
 package io.opentelemetry.javaagent.tooling.field;
 
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldAccessorMarker;
+
 final class GeneratedVirtualFieldNames {
 
   /**
@@ -13,7 +15,8 @@ final class GeneratedVirtualFieldNames {
    * 'isolating' (or 'module') classloaders like jboss and osgi see injected classes. This works
    * because we instrument those classloaders to load everything inside bootstrap packages.
    */
-  static final String DYNAMIC_CLASSES_PACKAGE = "io.opentelemetry.javaagent.bootstrap.field.";
+  static final String DYNAMIC_CLASSES_PACKAGE =
+      VirtualFieldAccessorMarker.class.getPackage().getName() + ".";
 
   private GeneratedVirtualFieldNames() {}
 
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java
@@ -10,7 +10,7 @@
 import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldNames.getRealSetterName;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.AsmApi;
 import io.opentelemetry.javaagent.tooling.Utils;
 import java.util.Arrays;
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java
diff --git a/testing-common/integration-tests/src/test/java/context/FieldBackedImplementationTest.java b/testing-common/integration-tests/src/test/java/context/FieldBackedImplementationTest.java
diff --git a/testing-common/integration-tests/src/test/java/context/FieldInjectionDisabledTest.java b/testing-common/integration-tests/src/test/java/context/FieldInjectionDisabledTest.java

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`package io.opentelemetry.javaagent.bootstrap;`
`7`	`7`
	`8`	`+import java.lang.invoke.MethodHandles;`
`8`	`9`	`import java.util.function.BiFunction;`
`9`	`10`	`import java.util.function.BiPredicate;`
`10`	`11`	`import java.util.function.Function;`
`@@ -37,21 +38,25 @@ public static boolean isHelperClass(ClassLoader classLoader, String className) {`
`37`	`38`	`return helperClassDetector.test(classLoader, className);`
`38`	`39`	`}`
`39`	`40`
`40`		`- private static volatile BiFunction<ClassLoader, String, Class<?>> helperClassLoader;`
	`41`	`+ private static volatile BiFunction<ClassLoader, String, HelperClassLoader> helperClassLoader;`
`41`	`42`
`42`	`43`	`public static void internalSetHelperClassLoader(`
`43`		`- BiFunction<ClassLoader, String, Class<?>> helperClassLoader) {`
	`44`	`+ BiFunction<ClassLoader, String, HelperClassLoader> helperClassLoader) {`
`44`	`45`	`if (InjectedClassHelper.helperClassLoader != null) {`
`45`	`46`	`// Only possible by misuse of this API, just ignore.`
`46`	`47`	`return;`
`47`	`48`	`}`
`48`	`49`	`InjectedClassHelper.helperClassLoader = helperClassLoader;`
`49`	`50`	`}`
`50`	`51`
`51`		`- public static Class<?> loadHelperClass(ClassLoader classLoader, String className) {`
	`52`	`+ public static HelperClassLoader getHelperClassLoader(ClassLoader classLoader, String className) {`
`52`	`53`	`if (helperClassLoader == null) {`
`53`	`54`	`return null;`
`54`	`55`	`}`
`55`	`56`	`return helperClassLoader.apply(classLoader, className);`
`56`	`57`	`}`
	`58`	`+`
	`59`	`+ public interface HelperClassLoader {`
	`60`	`+ Class<?> loadHelperClass(MethodHandles.Lookup lookup) throws Throwable;`
	`61`	`+ }`
`57`	`62`	`}`