Skip to content

Commit dd9e43e

Browse files
committed
add nullaway to spring
1 parent defea92 commit dd9e43e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/AnnotatedMethodInstrumentation.java

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

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.instrumentation.spring.ws.v2_0.SpringWsSingletons.instrumenter;
10+
import static java.util.Objects.requireNonNull;
1011
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
1112
import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
1213
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -53,12 +54,12 @@ public static class AnnotatedMethodAdvice {
5354

5455
public static class AdviceScope {
5556
private final CallDepth callDepth;
56-
private final SpringWsRequest request;
57-
private final Context context;
58-
private final Scope scope;
57+
@Nullable private final SpringWsRequest request;
58+
@Nullable private final Context context;
59+
@Nullable private final Scope scope;
5960

6061
private AdviceScope(
61-
CallDepth callDepth, SpringWsRequest request, Context context, Scope scope) {
62+
CallDepth callDepth, @Nullable SpringWsRequest request, @Nullable Context context, @Nullable Scope scope) {
6263
this.callDepth = callDepth;
6364
this.request = request;
6465
this.context = context;
@@ -88,7 +89,8 @@ public void exit(@Nullable Throwable throwable) {
8889
return;
8990
}
9091
scope.close();
91-
instrumenter().end(context, request, null, throwable);
92+
// scope non-null implies context and request are both non-null (see enter method above)
93+
instrumenter().end(requireNonNull(context), requireNonNull(request), null, throwable);
9294
}
9395
}
9496

0 commit comments

Comments
 (0)