Skip to content

Commit 2a4ae97

Browse files
committed
make things identical when they should
1 parent 65555e1 commit 2a4ae97

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

instrumentation/play/play-ws/play-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.opentelemetry.javaagent.instrumentation.playws.AsyncHttpClientInstrumentation;
1919
import io.opentelemetry.javaagent.instrumentation.playws.HandlerPublisherInstrumentation;
2020
import java.util.List;
21+
import javax.annotation.Nullable;
2122
import net.bytebuddy.asm.Advice;
2223
import net.bytebuddy.asm.Advice.AssignReturned;
2324
import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
@@ -76,7 +77,7 @@ public static Object[] methodEnter(
7677
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
7778
public static void methodExit(
7879
@Advice.Argument(0) Request request,
79-
@Advice.Thrown Throwable throwable,
80+
@Advice.Thrown @Nullable Throwable throwable,
8081
@Advice.Enter Object[] enterResult) {
8182
Context context = (Context) enterResult[0];
8283
if (context != null && throwable != null) {

instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public static Object[] methodEnter(
6060
if (!instrumenter().shouldStart(parentContext, request)) {
6161
return new Object[] {null, asyncHandler};
6262
}
63+
6364
Context context = instrumenter().start(parentContext, request);
6465

6566
if (asyncHandler instanceof StreamedAsyncHandler) {

0 commit comments

Comments
 (0)