open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix muzzle failure on calls to primitive array clone (#5405)

This commit is contained in:
Lauri Tulmin 2022-02-22 19:10:47 +02:00 committed by GitHub
parent ceb36c4a17
commit 84b46cbc48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java
View File

@ -362,6 +362,12 @@ final class ReferenceCollectingClassVisitor extends ClassVisitor {
? underlyingType(Type.getType(owner)) ? underlyingType(Type.getType(owner))
: Type.getType("L" + owner + ";"); : Type.getType("L" + owner + ";");
// method invoked on a primitive array type
if (ownerType.getSort() != Type.OBJECT) {
super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
return;
}
{ // ref for method return type { // ref for method return type
Type returnType = underlyingType(methodType.getReturnType()); Type returnType = underlyingType(methodType.getReturnType());
if (returnType.getSort() == Type.OBJECT) { if (returnType.getSort() == Type.OBJECT) {

2
muzzle/src/test/java/muzzle/TestClasses.java
View File

@ -14,6 +14,7 @@ import net.bytebuddy.asm.Advice;
public class TestClasses { public class TestClasses {
public static class MethodBodyAdvice { public static class MethodBodyAdvice {
@SuppressWarnings("ReturnValueIgnored")
@Advice.OnMethodEnter @Advice.OnMethodEnter
public static void methodBodyAdvice() { public static void methodBodyAdvice() {
A a = new A(); A a = new A();
@ -24,6 +25,7 @@ public class TestClasses {
a.publicB.methodWithArrays(new String[0]); a.publicB.methodWithArrays(new String[0]);
B.staticMethod(); B.staticMethod();
A.staticB.method("bar"); A.staticB.method("bar");
new int[0].clone();
} }
public static class A { public static class A {