Skip to content

Commit c23e9d2

Browse files
committed
fix: add missing @nullable annotations in javaagent-tooling and muzzle
- VirtualFieldChecker.getAnnotationNode(): missing @nullable on return - HelperInjector: @nullable on helpersSource (first constructor), instrumentation (forDynamicTypes), and classLoader (transform) Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 0fc541f commit c23e9d2

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/VirtualFieldChecker.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.opentelemetry.instrumentation.api.util.VirtualField;
99
import io.opentelemetry.javaagent.extension.instrumentation.internal.AsmApi;
10+
import javax.annotation.Nullable;
1011
import net.bytebuddy.asm.Advice;
1112
import org.objectweb.asm.ClassReader;
1213
import org.objectweb.asm.MethodVisitor;
@@ -61,6 +62,7 @@ public void visitMethodInsn(
6162
});
6263
}
6364

65+
@Nullable
6466
private static AnnotationNode getAnnotationNode(MethodNode source, Type type) {
6567
if (source.visibleAnnotations != null) {
6668
for (AnnotationNode annotationNode : source.visibleAnnotations) {

muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public HelperInjector(
124124
String requestingName,
125125
List<String> helperClassNames,
126126
List<HelperResource> helperResources,
127-
ClassLoader helpersSource,
127+
@Nullable ClassLoader helpersSource,
128128
@Nullable Instrumentation instrumentation) {
129129
this.requestingName = requestingName;
130130

0 commit comments

Comments
 (0)