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

Add scopes to http server response (DataDog/dd-trace-java#1408)

This commit is contained in:
Nikolay Martynov 2020-04-29 14:05:30 -04:00 committed by Trask Stalnaker
parent 6f472a62a0
commit c63b4fd9a3
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/auto/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java
View File

@ -15,9 +15,13 @@
*/
package io.opentelemetry.auto.instrumentation.netty.v3_8.server;
import static io.opentelemetry.auto.instrumentation.netty.v3_8.server.NettyHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.netty.v3_8.server.NettyHttpServerDecorator.TRACER;
import io.opentelemetry.auto.bootstrap.ContextStore;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.auto.instrumentation.netty.v3_8.ChannelTraceContext;
import io.opentelemetry.context.Scope;
import io.opentelemetry.trace.Span;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
@ -45,18 +49,20 @@ public class HttpServerResponseTracingHandler extends SimpleChannelDownstreamHan
return;
}
final HttpResponse response = (HttpResponse) msg.getMessage();
try (final Scope scope = TRACER.withSpan(span)) {
final HttpResponse response = (HttpResponse) msg.getMessage();
try {
ctx.sendDownstream(msg);
} catch (final Throwable throwable) {
NettyHttpServerDecorator.DECORATE.onError(span, throwable);
span.setAttribute(Tags.HTTP_STATUS, 500);
try {
ctx.sendDownstream(msg);
} catch (final Throwable throwable) {
DECORATE.onError(span, throwable);
span.setAttribute(Tags.HTTP_STATUS, 500);
span.end(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}
DECORATE.onResponse(span, response);
DECORATE.beforeFinish(span);
span.end(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}
NettyHttpServerDecorator.DECORATE.onResponse(span, response);
NettyHttpServerDecorator.DECORATE.beforeFinish(span);
span.end(); // Finish the span manually since finishSpanOnClose was false
}
}

24
instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/auto/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java
View File

@ -16,6 +16,7 @@
package io.opentelemetry.auto.instrumentation.netty.v4_0.server;
import static io.opentelemetry.auto.instrumentation.netty.v4_0.server.NettyHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.netty.v4_0.server.NettyHttpServerDecorator.TRACER;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
@ -23,6 +24,7 @@ import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.http.HttpResponse;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.auto.instrumentation.netty.v4_0.AttributeKeys;
import io.opentelemetry.context.Scope;
import io.opentelemetry.trace.Span;
public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
@ -35,18 +37,20 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap
return;
}
final HttpResponse response = (HttpResponse) msg;
try (final Scope scope = TRACER.withSpan(span)) {
final HttpResponse response = (HttpResponse) msg;
try {
ctx.write(msg, prm);
} catch (final Throwable throwable) {
DECORATE.onError(span, throwable);
span.setAttribute(Tags.HTTP_STATUS, 500);
try {
ctx.write(msg, prm);
} catch (final Throwable throwable) {
DECORATE.onError(span, throwable);
span.setAttribute(Tags.HTTP_STATUS, 500);
span.end(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}
DECORATE.onResponse(span, response);
DECORATE.beforeFinish(span);
span.end(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}
DECORATE.onResponse(span, response);
DECORATE.beforeFinish(span);
span.end(); // Finish the span manually since finishSpanOnClose was false
}
}

24
instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/auto/instrumentation/netty/v4_1/server/HttpServerResponseTracingHandler.java
View File

@ -16,6 +16,7 @@
package io.opentelemetry.auto.instrumentation.netty.v4_1.server;
import static io.opentelemetry.auto.instrumentation.netty.v4_1.server.NettyHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.netty.v4_1.server.NettyHttpServerDecorator.TRACER;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
@ -23,6 +24,7 @@ import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.http.HttpResponse;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.auto.instrumentation.netty.v4_1.AttributeKeys;
import io.opentelemetry.context.Scope;
import io.opentelemetry.trace.Span;
public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
@ -35,18 +37,20 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap
return;
}
final HttpResponse response = (HttpResponse) msg;
try (final Scope scope = TRACER.withSpan(span)) {
final HttpResponse response = (HttpResponse) msg;
try {
ctx.write(msg, prm);
} catch (final Throwable throwable) {
DECORATE.onError(span, throwable);
span.setAttribute(Tags.HTTP_STATUS, 500);
try {
ctx.write(msg, prm);
} catch (final Throwable throwable) {
DECORATE.onError(span, throwable);
span.setAttribute(Tags.HTTP_STATUS, 500);
span.end(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}
DECORATE.onResponse(span, response);
DECORATE.beforeFinish(span);
span.end(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}
DECORATE.onResponse(span, response);
DECORATE.beforeFinish(span);
span.end(); // Finish the span manually since finishSpanOnClose was false
}
}