Skip to content

Commit 65555e1

Browse files
committed
fix expensive typo
1 parent 535b7e4 commit 65555e1

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

instrumentation/play/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.List;
2121
import javax.annotation.Nullable;
2222
import net.bytebuddy.asm.Advice;
23-
import net.bytebuddy.asm.Advice.AssignReturned;
2423
import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
2524
import play.shaded.ahc.org.asynchttpclient.AsyncHandler;
2625
import play.shaded.ahc.org.asynchttpclient.Request;
@@ -56,13 +55,14 @@ public static class AdviceScope {
5655
private final Request request;
5756
private final Scope scope;
5857

59-
public AdviceScope(Context parentContext, Request request, Context context, Scope scope) {
58+
private AdviceScope(Context parentContext, Request request, Context context, Scope scope) {
6059
this.parentContext = parentContext;
6160
this.request = request;
62-
this.context = parentContext;
61+
this.context = context;
6362
this.scope = scope;
6463
}
6564

65+
@Nullable
6666
public static AdviceScope start(Request request) {
6767
Context parentContext = currentContext();
6868
if (!instrumenter().shouldStart(parentContext, request)) {
@@ -91,15 +91,18 @@ public void end(@Nullable Throwable throwable) {
9191
}
9292
}
9393

94-
@AssignReturned.ToArguments(@ToArgument(value = 1, index = 1))
94+
@Advice.AssignReturned.ToArguments(@ToArgument(value = 1, index = 1))
9595
@Advice.OnMethodEnter(suppress = Throwable.class)
9696
public static Object[] methodEnter(
97-
@Advice.Argument(0) Request request, @Advice.Argument(1) AsyncHandler<?> asyncHandler) {
97+
@Advice.Argument(0) Request request,
98+
@Advice.Argument(1) AsyncHandler<?> originalAsyncHandler) {
99+
// intermediate variable required for inlined advice
100+
AsyncHandler<?> asyncHandler = originalAsyncHandler;
98101
AdviceScope adviceScope = AdviceScope.start(request);
99-
if (adviceScope == null) {
100-
return new Object[] {null, asyncHandler};
102+
if (adviceScope != null) {
103+
asyncHandler = adviceScope.wrap(asyncHandler);
101104
}
102-
return new Object[] {adviceScope, adviceScope.wrap(asyncHandler)};
105+
return new Object[] {adviceScope, asyncHandler};
103106
}
104107

105108
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

0 commit comments

Comments
 (0)