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

Better span names for netty (#247)

This commit is contained in:
Trask Stalnaker 2020-03-19 19:01:32 -07:00 committed by GitHub
parent 5089a05c44
commit 11566b7e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/auto/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
View File

@ -17,6 +17,7 @@ package io.opentelemetry.auto.instrumentation.netty40;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -104,7 +105,7 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default {
final Scope parentScope = NettyHttpServerDecorator.TRACER.withSpan(parentSpan); final Scope parentScope = NettyHttpServerDecorator.TRACER.withSpan(parentSpan);
final Span errorSpan = final Span errorSpan =
NettyHttpServerDecorator.TRACER.spanBuilder("netty.connect").startSpan(); NettyHttpServerDecorator.TRACER.spanBuilder("CONNECT").setSpanKind(CLIENT).startSpan();
errorSpan.setAttribute(Tags.COMPONENT, "netty"); errorSpan.setAttribute(Tags.COMPONENT, "netty");
try (final Scope scope = NettyHttpServerDecorator.TRACER.withSpan(errorSpan)) { try (final Scope scope = NettyHttpServerDecorator.TRACER.withSpan(errorSpan)) {
NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause);

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

@ -92,7 +92,7 @@ class Netty40ClientTest extends HttpClientTest {
// for up to a total of 10 seconds (default connection time limit) // for up to a total of 10 seconds (default connection time limit)
for (def i = 1; i < size; i++) { for (def i = 1; i < size; i++) {
span(i) { span(i) {
operationName "netty.connect" operationName "CONNECT"
childOf span(0) childOf span(0)
errored true errored true
tags { tags {

3
instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/auto/instrumentation/netty41/ChannelFutureListenerInstrumentation.java
View File

@ -17,6 +17,7 @@ package io.opentelemetry.auto.instrumentation.netty41;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -104,7 +105,7 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default {
final Scope parentScope = NettyHttpServerDecorator.TRACER.withSpan(parentSpan); final Scope parentScope = NettyHttpServerDecorator.TRACER.withSpan(parentSpan);
final Span errorSpan = final Span errorSpan =
NettyHttpServerDecorator.TRACER.spanBuilder("netty.connect").startSpan(); NettyHttpServerDecorator.TRACER.spanBuilder("CONNECT").setSpanKind(CLIENT).startSpan();
errorSpan.setAttribute(Tags.COMPONENT, "netty"); errorSpan.setAttribute(Tags.COMPONENT, "netty");
try (final Scope scope = NettyHttpServerDecorator.TRACER.withSpan(errorSpan)) { try (final Scope scope = NettyHttpServerDecorator.TRACER.withSpan(errorSpan)) {
NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause);

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

@ -102,7 +102,7 @@ class Netty41ClientTest extends HttpClientTest {
// for up to a total of 10 seconds (default connection time limit) // for up to a total of 10 seconds (default connection time limit)
for (def i = 1; i < size; i++) { for (def i = 1; i < size; i++) {
span(i) { span(i) {
operationName "netty.connect" operationName "CONNECT"
childOf span(0) childOf span(0)
errored true errored true
tags { tags {