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 flaky reactor netty connect span tests (#8636)

This commit is contained in:
Lauri Tulmin 2023-06-02 23:38:17 +03:00 committed by GitHub
parent 4def59ef78
commit b5b51934df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java
View File

@ -80,6 +80,7 @@ public class TransportConnectorInstrumentation implements TypeInstrumentation {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter( public static void onEnter(
@Advice.Argument(0) SocketAddress remoteAddress, @Advice.Argument(0) SocketAddress remoteAddress,
@Advice.Argument(2) ChannelPromise channelPromise,
@Advice.Local("otelContext") Context context, @Advice.Local("otelContext") Context context,
@Advice.Local("otelRequest") NettyConnectionRequest request, @Advice.Local("otelRequest") NettyConnectionRequest request,
@Advice.Local("otelScope") Scope scope) { @Advice.Local("otelScope") Scope scope) {
@ -92,12 +93,15 @@ public class TransportConnectorInstrumentation implements TypeInstrumentation {
context = connectionInstrumenter().start(parentContext, request); context = connectionInstrumenter().start(parentContext, request);
scope = context.makeCurrent(); scope = context.makeCurrent();
// the span is finished in the mono decorated by the ConnectionWrapper
VirtualField.find(ChannelPromise.class, ConnectionRequestAndContext.class)
.set(channelPromise, ConnectionRequestAndContext.create(request, context));
} }
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void endConnect( public static void endConnect(
@Advice.Thrown Throwable throwable, @Advice.Thrown Throwable throwable,
@Advice.Argument(2) ChannelPromise channelPromise,
@Advice.Local("otelContext") Context context, @Advice.Local("otelContext") Context context,
@Advice.Local("otelRequest") NettyConnectionRequest request, @Advice.Local("otelRequest") NettyConnectionRequest request,
@Advice.Local("otelScope") Scope scope) { @Advice.Local("otelScope") Scope scope) {
@ -109,10 +113,6 @@ public class TransportConnectorInstrumentation implements TypeInstrumentation {
if (throwable != null) { if (throwable != null) {
connectionInstrumenter().end(context, request, null, throwable); connectionInstrumenter().end(context, request, null, throwable);
} else {
// the span is finished in the mono decorated by the ConnectionWrapper
VirtualField.find(ChannelPromise.class, ConnectionRequestAndContext.class)
.set(channelPromise, ConnectionRequestAndContext.create(request, context));
} }
} }
} }
@ -123,6 +123,7 @@ public class TransportConnectorInstrumentation implements TypeInstrumentation {
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter( public static void onEnter(
@Advice.Argument(0) List<SocketAddress> remoteAddresses, @Advice.Argument(0) List<SocketAddress> remoteAddresses,
@Advice.Argument(2) ChannelPromise channelPromise,
@Advice.Argument(3) int index, @Advice.Argument(3) int index,
@Advice.Local("otelContext") Context context, @Advice.Local("otelContext") Context context,
@Advice.Local("otelRequest") NettyConnectionRequest request, @Advice.Local("otelRequest") NettyConnectionRequest request,
@ -136,12 +137,15 @@ public class TransportConnectorInstrumentation implements TypeInstrumentation {
context = connectionInstrumenter().start(parentContext, request); context = connectionInstrumenter().start(parentContext, request);
scope = context.makeCurrent(); scope = context.makeCurrent();
// the span is finished in the mono decorated by the ConnectionWrapper
VirtualField.find(ChannelPromise.class, ConnectionRequestAndContext.class)
.set(channelPromise, ConnectionRequestAndContext.create(request, context));
} }
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void endConnect( public static void endConnect(
@Advice.Thrown Throwable throwable, @Advice.Thrown Throwable throwable,
@Advice.Argument(2) ChannelPromise channelPromise,
@Advice.Local("otelContext") Context context, @Advice.Local("otelContext") Context context,
@Advice.Local("otelRequest") NettyConnectionRequest request, @Advice.Local("otelRequest") NettyConnectionRequest request,
@Advice.Local("otelScope") Scope scope) { @Advice.Local("otelScope") Scope scope) {
@ -153,10 +157,6 @@ public class TransportConnectorInstrumentation implements TypeInstrumentation {
if (throwable != null) { if (throwable != null) {
connectionInstrumenter().end(context, request, null, throwable); connectionInstrumenter().end(context, request, null, throwable);
} else {
// the span is finished in the mono decorated by the ConnectionWrapper
VirtualField.find(ChannelPromise.class, ConnectionRequestAndContext.class)
.set(channelPromise, ConnectionRequestAndContext.create(request, context));
} }
} }
} }