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

Work around lambda instrumentation failure 

Ideally we would ignore instrumenting helper classes...
This commit is contained in:
Trask Stalnaker 2021-11-23 16:14:38 -08:00
parent dac1522a3f
commit 6d63815b44
2 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/NettySslInstrumentationHandler.java
View File

@ -8,6 +8,8 @@ package io.opentelemetry.javaagent.instrumentation.netty.common.client;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import io.opentelemetry.context.Context;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@ -75,17 +77,7 @@ public final class NettySslInstrumentationHandler extends ChannelDuplexHandler {
// netty SslHandler starts the handshake after it receives the channelActive() signal; this
// happens just after the connection is established
// this makes connect() promise a good place to start the SSL handshake span
promise.addListener(
future -> {
// there won't be any SSL handshake if the channel fails to connect
if (!future.isSuccess()) {
return;
}
request = NettySslRequest.create(ctx.channel());
if (instrumenter.shouldStart(parentContext, request)) {
context = instrumenter.start(parentContext, request);
}
});
promise.addListener(new StartListener(ctx));
ctx.connect(remoteAddress, localAddress, promise);
}
@ -112,4 +104,25 @@ public final class NettySslInstrumentationHandler extends ChannelDuplexHandler {
return null;
}
}
private class StartListener implements GenericFutureListener<Future<Void>> {
private final ChannelHandlerContext ctx;
private StartListener(ChannelHandlerContext ctx) {
this.ctx = ctx;
}
@Override
public void operationComplete(Future<Void> future) {
// there won't be any SSL handshake if the channel fails to connect
if (!future.isSuccess()) {
return;
}
request = NettySslRequest.create(ctx.channel());
if (instrumenter.shouldStart(parentContext, request)) {
context = instrumenter.start(parentContext, request);
}
}
}
}

20
instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java
View File

@ -9,6 +9,7 @@ import io.netty.resolver.AddressResolver;
import io.netty.resolver.AddressResolverGroup;
import io.netty.util.concurrent.EventExecutor;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.Promise;
import io.opentelemetry.context.Context;
import io.opentelemetry.javaagent.instrumentation.netty.common.NettyConnectionRequest;
@ -106,7 +107,7 @@ public final class InstrumentedAddressResolverGroup<T extends SocketAddress>
Context context = instrumenter.start(parentContext, request);
try {
Future<U> future = resolveFunc.get();
return future.addListener(f -> instrumenter.end(context, request, null, f.cause()));
return future.addListener(new OnEndListener<>(request, context));
} catch (Throwable t) {
instrumenter.end(context, request, null, t);
throw t;
@ -117,5 +118,22 @@ public final class InstrumentedAddressResolverGroup<T extends SocketAddress>
public void close() {
delegate.close();
}
// currently cannot use lambda for this
private class OnEndListener<U> implements GenericFutureListener<Future<U>> {
private final NettyConnectionRequest request;
private final Context context;
private OnEndListener(NettyConnectionRequest request, Context context) {
this.request = request;
this.context = context;
}
@Override
public void operationComplete(Future<U> future) {
instrumenter.end(context, request, null, future.cause());
}
}
}
}