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 Operation name logging for Netty based applications (#2317)

This commit is contained in:
neinoi 2021-02-19 12:59:50 -05:00 committed by GitHub
parent 1ca7276593
commit 1f884e4d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerRequestTracingHandler.java
View File

@ -46,7 +46,9 @@ public class HttpServerRequestTracingHandler extends SimpleChannelUpstreamHandle
HttpRequest request = (HttpRequest) message;
Context context =
tracer().startSpan(request, ctx.getChannel(), channelTraceContext, "netty.request");
tracer()
.startSpan(
request, ctx.getChannel(), channelTraceContext, "HTTP " + request.getMethod());
try (Scope ignored = context.makeCurrent()) {
ctx.sendUpstream(event);
// the span is ended normally in HttpServerResponseTracingHandler

2
instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ServerTest.groovy
View File

@ -143,6 +143,6 @@ class Netty38ServerTest extends HttpServerTest<ServerBootstrap> implements Agent
@Override
String expectedServerSpanName(ServerEndpoint endpoint) {
return "netty.request"
return "HTTP GET"
}
}

3
instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerRequestTracingHandler.java
View File

@ -32,7 +32,8 @@ public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapte
return;
}
Context context = tracer().startSpan((HttpRequest) msg, channel, channel, "netty.request");
HttpRequest request = (HttpRequest) msg;
Context context = tracer().startSpan(request, channel, channel, "HTTP " + request.getMethod());
try (Scope ignored = context.makeCurrent()) {
ctx.fireChannelRead(msg);
// the span is ended normally in HttpServerResponseTracingHandler

2
instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ServerTest.groovy
View File

@ -115,6 +115,6 @@ class Netty40ServerTest extends HttpServerTest<EventLoopGroup> implements AgentT
@Override
String expectedServerSpanName(ServerEndpoint endpoint) {
return "netty.request"
return "HTTP GET"
}
}

3
instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/HttpServerRequestTracingHandler.java
View File

@ -32,7 +32,8 @@ public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapte
return;
}
Context context = tracer().startSpan((HttpRequest) msg, channel, channel, "netty.request");
HttpRequest request = (HttpRequest) msg;
Context context = tracer().startSpan(request, channel, channel, "HTTP " + request.method());
try (Scope ignored = context.makeCurrent()) {
ctx.fireChannelRead(msg);
// the span is ended normally in HttpServerResponseTracingHandler

2
instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ServerTest.groovy
View File

@ -114,6 +114,6 @@ class Netty41ServerTest extends HttpServerTest<EventLoopGroup> implements AgentT
@Override
String expectedServerSpanName(ServerEndpoint endpoint) {
return "netty.request"
return "HTTP GET"
}
}