From 500f736da6217d592ca840899b72272c04d24bcc Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:17:49 +0200 Subject: [PATCH 1/2] Adding module group to AkkaHttpServerInstrumentationModule and AkkaHttpServerRouteInstrumentationModule --- .../AkkaHttpServerInstrumentationModule.java | 16 ++++++++-------- ...AkkaHttpServerRouteInstrumentationModule.java | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java index b84f85f78816..d1a41fb92579 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java @@ -11,15 +11,22 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; +import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumentationModule.class) -public class AkkaHttpServerInstrumentationModule extends InstrumentationModule { +public class AkkaHttpServerInstrumentationModule extends InstrumentationModule + implements ExperimentalInstrumentationModule { public AkkaHttpServerInstrumentationModule() { super("akka-http", "akka-http-10.0", "akka-http-server"); } + @Override + public String getModuleGroup() { + return "akka-http-10.0-server"; + } + @Override public ElementMatcher.Junction classLoaderMatcher() { // in GraphInterpreterInstrumentation we instrument a class that belongs to akka-streams, make @@ -27,13 +34,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("akka.http.scaladsl.HttpExt"); } - @Override - public boolean isIndyModule() { - // AkkaHttpServerInstrumentationModule and AkkaHttpServerRouteInstrumentationModule share - // AkkaRouteHolder class - return false; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java index 6c484eb968ed..47249093ce25 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java @@ -10,6 +10,7 @@ import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; +import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import java.util.List; /** @@ -17,16 +18,15 @@ * AkkaHttpServerInstrumentationModule applies to classes in akka-http-core.jar */ @AutoService(InstrumentationModule.class) -public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule { +public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule + implements ExperimentalInstrumentationModule { public AkkaHttpServerRouteInstrumentationModule() { super("akka-http", "akka-http-10.0", "akka-http-server", "akka-http-server-route"); } @Override - public boolean isIndyModule() { - // AkkaHttpServerInstrumentationModule and AkkaHttpServerRouteInstrumentationModule share - // AkkaRouteHolder class - return false; + public String getModuleGroup() { + return "akka-http-10.0-server"; } @Override From 4c2890b01615b65148b2535ca2b449c0fc64a8c8 Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:54:27 +0200 Subject: [PATCH 2/2] Renaming akka module group --- .../akkahttp/server/AkkaHttpServerInstrumentationModule.java | 2 +- .../server/route/AkkaHttpServerRouteInstrumentationModule.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java index d1a41fb92579..32d2ffc35277 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java @@ -24,7 +24,7 @@ public AkkaHttpServerInstrumentationModule() { @Override public String getModuleGroup() { - return "akka-http-10.0-server"; + return "akka-http"; } @Override diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java index 47249093ce25..169c9253f895 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaHttpServerRouteInstrumentationModule.java @@ -26,7 +26,7 @@ public AkkaHttpServerRouteInstrumentationModule() { @Override public String getModuleGroup() { - return "akka-http-10.0-server"; + return "akka-http"; } @Override