From 2174e0935f84450300cdc141a5e9786fd125a639 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Fri, 27 May 2022 14:04:44 -0700 Subject: [PATCH] change instrumentation name from play -> play-mvc --- .../instrumentation/play/v2_4/Play24Singletons.java | 6 +++++- .../play/v2_4/PlayInstrumentationModule.java | 5 ++++- .../instrumentation/play/v2_6/Play26Singletons.java | 6 +++++- .../play/v2_6/PlayInstrumentationModule.java | 5 ++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/Play24Singletons.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/Play24Singletons.java index 1be47dff55..7ee8101fed 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/Play24Singletons.java +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/Play24Singletons.java @@ -5,6 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.play.v2_4; +import static io.opentelemetry.javaagent.instrumentation.play.v2_4.PlayInstrumentationModule.INSTRUMENTATION_NAME_EXTRA; + import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; @@ -18,7 +20,9 @@ public final class Play24Singletons { private static final String SPAN_NAME = "play.request"; private static final Instrumenter INSTRUMENTER = Instrumenter.builder( - GlobalOpenTelemetry.get(), "io.opentelemetry.play-2.4", s -> SPAN_NAME) + GlobalOpenTelemetry.get(), + "io.opentelemetry." + INSTRUMENTATION_NAME_EXTRA, + s -> SPAN_NAME) .newInstrumenter(); public static Instrumenter instrumenter() { diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java index a3b4e95799..3adc53a8e5 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java @@ -17,8 +17,11 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) public class PlayInstrumentationModule extends InstrumentationModule { + static final String INSTRUMENTATION_NAME = "play-mvc"; + static final String INSTRUMENTATION_NAME_EXTRA = "play-mvc-2.4"; + public PlayInstrumentationModule() { - super("play", "play-2.4"); + super(INSTRUMENTATION_NAME, INSTRUMENTATION_NAME_EXTRA); } @Override diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/Play26Singletons.java b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/Play26Singletons.java index fb61f77c56..8742f63aae 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/Play26Singletons.java +++ b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/Play26Singletons.java @@ -5,6 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.play.v2_6; +import static io.opentelemetry.javaagent.instrumentation.play.v2_6.PlayInstrumentationModule.INSTRUMENTATION_NAME_EXTRA; + import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; @@ -24,7 +26,9 @@ public final class Play26Singletons { private static final String SPAN_NAME = "play.request"; private static final Instrumenter INSTRUMENTER = Instrumenter.builder( - GlobalOpenTelemetry.get(), "io.opentelemetry.play-2.6", s -> SPAN_NAME) + GlobalOpenTelemetry.get(), + "io.opentelemetry." + INSTRUMENTATION_NAME_EXTRA, + s -> SPAN_NAME) .newInstrumenter(); @Nullable private static final Method typedKeyGetUnderlying; diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java index 2bbcbbb7de..e4d0688456 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java +++ b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java @@ -15,8 +15,11 @@ import java.util.List; @AutoService(InstrumentationModule.class) public class PlayInstrumentationModule extends InstrumentationModule { + static final String INSTRUMENTATION_NAME = "play-mvc"; + static final String INSTRUMENTATION_NAME_EXTRA = "play-mvc-2.6"; + public PlayInstrumentationModule() { - super("play", "play-2.6"); + super(INSTRUMENTATION_NAME, INSTRUMENTATION_NAME_EXTRA); } @Override