Skip to content

Commit 2071fb2

Browse files
authored
Use Type.getInternalName instead of our own util (#14936)
1 parent 50d1afc commit 2071fb2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/RealFieldInjector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@
2828
import org.objectweb.asm.FieldVisitor;
2929
import org.objectweb.asm.MethodVisitor;
3030
import org.objectweb.asm.Opcodes;
31+
import org.objectweb.asm.Type;
3132

3233
final class RealFieldInjector implements AsmVisitorWrapper {
3334

3435
private static final String INSTALLED_FIELDS_MARKER_CLASS_NAME =
35-
Utils.getInternalName(VirtualFieldInstalledMarker.class);
36+
Type.getInternalName(VirtualFieldInstalledMarker.class);
3637

3738
private final FieldAccessorInterfaces fieldAccessorInterfaces;
3839
private final String typeName;

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldFindRewriter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.opentelemetry.instrumentation.api.util.VirtualField;
1212
import io.opentelemetry.javaagent.extension.instrumentation.internal.AsmApi;
1313
import io.opentelemetry.javaagent.tooling.TransformSafeLogger;
14-
import io.opentelemetry.javaagent.tooling.Utils;
1514
import io.opentelemetry.javaagent.tooling.muzzle.VirtualFieldMappings;
1615
import java.lang.reflect.Method;
1716
import net.bytebuddy.asm.AsmVisitorWrapper;
@@ -98,7 +97,7 @@ public MethodVisitor visitMethod(
9897
public void visitMethodInsn(
9998
int opcode, String owner, String name, String descriptor, boolean isInterface) {
10099
pushOpcode(opcode);
101-
if (Utils.getInternalName(FIND_VIRTUAL_FIELD_METHOD.getDeclaringClass()).equals(owner)
100+
if (Type.getInternalName(FIND_VIRTUAL_FIELD_METHOD.getDeclaringClass()).equals(owner)
102101
&& FIND_VIRTUAL_FIELD_METHOD.getName().equals(name)
103102
&& Type.getMethodDescriptor(FIND_VIRTUAL_FIELD_METHOD).equals(descriptor)) {
104103
logger.log(

0 commit comments

Comments
 (0)