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..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 @@ -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"; + } + @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..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 @@ -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"; } @Override