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 index f58d4201efb4..f79ef5e2fed5 100644 --- 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 @@ -28,11 +28,12 @@ import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; final class RealFieldInjector implements AsmVisitorWrapper { private static final String INSTALLED_FIELDS_MARKER_CLASS_NAME = - Utils.getInternalName(VirtualFieldInstalledMarker.class); + Type.getInternalName(VirtualFieldInstalledMarker.class); private final FieldAccessorInterfaces fieldAccessorInterfaces; private final String typeName; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldFindRewriter.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldFindRewriter.java index ea1f2c5e5248..4c430c3c50e1 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldFindRewriter.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldFindRewriter.java @@ -11,7 +11,6 @@ import io.opentelemetry.instrumentation.api.util.VirtualField; import io.opentelemetry.javaagent.extension.instrumentation.internal.AsmApi; import io.opentelemetry.javaagent.tooling.TransformSafeLogger; -import io.opentelemetry.javaagent.tooling.Utils; import io.opentelemetry.javaagent.tooling.muzzle.VirtualFieldMappings; import java.lang.reflect.Method; import net.bytebuddy.asm.AsmVisitorWrapper; @@ -98,7 +97,7 @@ public MethodVisitor visitMethod( public void visitMethodInsn( int opcode, String owner, String name, String descriptor, boolean isInterface) { pushOpcode(opcode); - if (Utils.getInternalName(FIND_VIRTUAL_FIELD_METHOD.getDeclaringClass()).equals(owner) + if (Type.getInternalName(FIND_VIRTUAL_FIELD_METHOD.getDeclaringClass()).equals(owner) && FIND_VIRTUAL_FIELD_METHOD.getName().equals(name) && Type.getMethodDescriptor(FIND_VIRTUAL_FIELD_METHOD).equals(descriptor)) { logger.log(