From 6142b7a2a44eef94dc6a23f00213507cf12f53ca Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 19 Mar 2020 14:10:17 -0700 Subject: [PATCH] Fix tracer names to match others (#249) --- .../elasticsearch/ElasticsearchRestClientDecorator.java | 3 ++- .../elasticsearch/ElasticsearchTransportClientDecorator.java | 3 ++- .../auto/instrumentation/jaxrs/JaxRsClientDecorator.java | 3 +-- .../auto/instrumentation/logback/LogbackSpans.java | 2 +- .../auto/instrumentation/rmi/server/RmiServerDecorator.java | 2 +- .../servlet/dispatcher/RequestDispatcherDecorator.java | 3 ++- .../auto/instrumentation/servlet/filter/FilterDecorator.java | 3 ++- .../instrumentation/servlet/http/HttpServletDecorator.java | 3 ++- .../servlet/http/HttpServletResponseDecorator.java | 3 ++- .../springwebflux/server/SpringWebfluxHttpServerDecorator.java | 3 +-- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java index cfef8c3458..501a05759a 100644 --- a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java +++ b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java @@ -28,7 +28,8 @@ public class ElasticsearchRestClientDecorator extends DatabaseClientDecorator { public static final ElasticsearchRestClientDecorator DECORATE = new ElasticsearchRestClientDecorator(); - public static final Tracer TRACER = OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + public static final Tracer TRACER = + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.elasticsearch"); @Override protected String service() { diff --git a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java index 3edb8fc399..1a533e55d8 100644 --- a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java +++ b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java @@ -26,7 +26,8 @@ public class ElasticsearchTransportClientDecorator extends DatabaseClientDecorat public static final ElasticsearchTransportClientDecorator DECORATE = new ElasticsearchTransportClientDecorator(); - public static final Tracer TRACER = OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + public static final Tracer TRACER = + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.elasticsearch"); @Override protected String service() { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientDecorator.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientDecorator.java index d428d68513..edd0affc94 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientDecorator.java +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientDecorator.java @@ -27,8 +27,7 @@ public class JaxRsClientDecorator public static final JaxRsClientDecorator DECORATE = new JaxRsClientDecorator(); public static final Tracer TRACER = - OpenTelemetry.getTracerFactory() - .get("io.opentelemetry.instrumentation.auto.jaxrs-client-2.0"); + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jaxrs-client-2.0"); @Override protected String getComponentName() { diff --git a/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java b/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java index 7334790f4a..709f09c4b7 100644 --- a/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java +++ b/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java @@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j; public class LogbackSpans { private static final Tracer TRACER = - OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.logback-1.0"); public static void capture(final ILoggingEvent event) { diff --git a/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/server/RmiServerDecorator.java b/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/server/RmiServerDecorator.java index 60d87b73cf..01b44e0d16 100644 --- a/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/server/RmiServerDecorator.java +++ b/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/server/RmiServerDecorator.java @@ -24,7 +24,7 @@ public class RmiServerDecorator extends ServerDecorator { public static final RmiServerDecorator DECORATE = new RmiServerDecorator(); public static final Tracer TRACER = - OpenTelemetry.getTracerFactory().get("io.opentelemetry.instrumentation.auto.rmi"); + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.rmi"); @Override protected String getSpanType() { diff --git a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java index b259b9cf74..08d2e34db3 100644 --- a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java +++ b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java @@ -21,7 +21,8 @@ import io.opentelemetry.trace.Tracer; public class RequestDispatcherDecorator extends BaseDecorator { public static final RequestDispatcherDecorator DECORATE = new RequestDispatcherDecorator(); - public static final Tracer TRACER = OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + public static final Tracer TRACER = + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.servlet"); @Override protected String getSpanType() { diff --git a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/filter/FilterDecorator.java b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/filter/FilterDecorator.java index f413090fbe..41c41d3f41 100644 --- a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/filter/FilterDecorator.java +++ b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/filter/FilterDecorator.java @@ -21,7 +21,8 @@ import io.opentelemetry.trace.Tracer; public class FilterDecorator extends BaseDecorator { public static final FilterDecorator DECORATE = new FilterDecorator(); - public static final Tracer TRACER = OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + public static final Tracer TRACER = + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.servlet"); @Override protected String getSpanType() { diff --git a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletDecorator.java b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletDecorator.java index 3b171718cb..a890dbff15 100644 --- a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletDecorator.java +++ b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletDecorator.java @@ -21,7 +21,8 @@ import io.opentelemetry.trace.Tracer; public class HttpServletDecorator extends BaseDecorator { public static final HttpServletDecorator DECORATE = new HttpServletDecorator(); - public static final Tracer TRACER = OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + public static final Tracer TRACER = + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.servlet"); @Override protected String getSpanType() { diff --git a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletResponseDecorator.java b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletResponseDecorator.java index 86e17dae95..a804b8862b 100644 --- a/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletResponseDecorator.java +++ b/instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/http/HttpServletResponseDecorator.java @@ -21,7 +21,8 @@ import io.opentelemetry.trace.Tracer; public class HttpServletResponseDecorator extends BaseDecorator { public static final HttpServletResponseDecorator DECORATE = new HttpServletResponseDecorator(); - public static final Tracer TRACER = OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto"); + public static final Tracer TRACER = + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.servlet"); @Override protected String getSpanType() { diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java index 2079bc81cb..5cb9980ae2 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java +++ b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java @@ -26,8 +26,7 @@ public class SpringWebfluxHttpServerDecorator extends ServerDecorator { public static final SpringWebfluxHttpServerDecorator DECORATE = new SpringWebfluxHttpServerDecorator(); public static final Tracer TRACER = - OpenTelemetry.getTracerFactory() - .get("io.opentelemetry.instrumentation.auto.spring-webflux-5.0"); + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.spring-webflux-5.0"); @Override protected String getSpanType() {