From 11566b7e5efe4e77fd9560a85afa998eed9750c6 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 19 Mar 2020 19:01:32 -0700 Subject: [PATCH] Better span names for netty (#247) --- .../netty40/ChannelFutureListenerInstrumentation.java | 3 ++- .../netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy | 2 +- .../netty41/ChannelFutureListenerInstrumentation.java | 3 ++- .../netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/auto/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/auto/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index 94899c9f50..252cafee52 100644 --- a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/auto/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/auto/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -17,6 +17,7 @@ package io.opentelemetry.auto.instrumentation.netty40; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; 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 net.bytebuddy.matcher.ElementMatchers.isMethod; 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 Span errorSpan = - NettyHttpServerDecorator.TRACER.spanBuilder("netty.connect").startSpan(); + NettyHttpServerDecorator.TRACER.spanBuilder("CONNECT").setSpanKind(CLIENT).startSpan(); errorSpan.setAttribute(Tags.COMPONENT, "netty"); try (final Scope scope = NettyHttpServerDecorator.TRACER.withSpan(errorSpan)) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); diff --git a/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy b/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy index cabb33469a..100cfe9761 100644 --- a/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy +++ b/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy @@ -92,7 +92,7 @@ class Netty40ClientTest extends HttpClientTest { // for up to a total of 10 seconds (default connection time limit) for (def i = 1; i < size; i++) { span(i) { - operationName "netty.connect" + operationName "CONNECT" childOf span(0) errored true tags { diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/auto/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/auto/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index 97d1acb965..49d7e356c9 100644 --- a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/auto/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/auto/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -17,6 +17,7 @@ package io.opentelemetry.auto.instrumentation.netty41; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; 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 net.bytebuddy.matcher.ElementMatchers.isMethod; 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 Span errorSpan = - NettyHttpServerDecorator.TRACER.spanBuilder("netty.connect").startSpan(); + NettyHttpServerDecorator.TRACER.spanBuilder("CONNECT").setSpanKind(CLIENT).startSpan(); errorSpan.setAttribute(Tags.COMPONENT, "netty"); try (final Scope scope = NettyHttpServerDecorator.TRACER.withSpan(errorSpan)) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); diff --git a/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy b/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy index 5dd990dc97..67ff99fab0 100644 --- a/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy +++ b/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy @@ -102,7 +102,7 @@ class Netty41ClientTest extends HttpClientTest { // for up to a total of 10 seconds (default connection time limit) for (def i = 1; i < size; i++) { span(i) { - operationName "netty.connect" + operationName "CONNECT" childOf span(0) errored true tags {