Rename activej instrumentation classes (#13560)

Author: laurit

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionInstrumentation.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejAsyncServletInstrumentation.java

@@ -8,7 +8,7 @@
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
-import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerConnectionSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -28,7 +28,7 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class ActivejHttpServerConnectionInstrumentation implements TypeInstrumentation {
+public class ActivejAsyncServletInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerHttpAttributesGetter.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerAttributesGetter.java

@@ -17,7 +17,7 @@
 import java.util.Map;
 import javax.annotation.Nullable;
 
-final class ActivejHttpServerHttpAttributesGetter
+final class ActivejHttpServerAttributesGetter
     implements HttpServerAttributesGetter<HttpRequest, HttpResponse> {
 
   @Override

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionInstrumentationModule.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java

@@ -15,15 +15,15 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class ActivejHttpServerConnectionInstrumentationModule extends InstrumentationModule {
+public class ActivejHttpServerInstrumentationModule extends InstrumentationModule {
 
-  public ActivejHttpServerConnectionInstrumentationModule() {
+  public ActivejHttpServerInstrumentationModule() {
     super("activej-http", "activej-http-6.0");
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return singletonList(new ActivejHttpServerConnectionInstrumentation());
+    return singletonList(new ActivejAsyncServletInstrumentation());
   }
 
   @Override

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerConnectionSingletons.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerSingletons.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 
-public final class ActivejHttpServerConnectionSingletons {
+public final class ActivejHttpServerSingletons {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.activej-http-6.0";
 
@@ -20,13 +20,13 @@ public final class ActivejHttpServerConnectionSingletons {
     INSTRUMENTER =
         JavaagentHttpServerInstrumenters.create(
             INSTRUMENTATION_NAME,
-            new ActivejHttpServerHttpAttributesGetter(),
+            new ActivejHttpServerAttributesGetter(),
             ActivejHttpServerRequestGetter.INSTANCE);
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
     return INSTRUMENTER;
   }
 
-  private ActivejHttpServerConnectionSingletons() {}
+  private ActivejHttpServerSingletons() {}
 }

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/PromiseWrapper.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.activejhttp;
 
-import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerConnectionSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerSingletons.instrumenter;
 
 import io.activej.http.HttpRequest;
 import io.activej.http.HttpResponse;