Rename servlet instrumentation classes (#317)

* Rename servlet instrumentation classes

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>

* Fix

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>

Author: pavolloffay

…/Servlet31NoWrappingInstrumentation.java …g/Servlet30AndFilterInstrumentation.javainstrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30AndFilterInstrumentation.java instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30AndFilterInstrumentation.java

@@ -58,7 +58,7 @@
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
 import org.hypertrace.agent.filter.FilterRegistry;
 
-public class Servlet31NoWrappingInstrumentation implements TypeInstrumentation {
+public class Servlet30AndFilterInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<ClassLoader> classLoaderOptimization() {
@@ -78,7 +78,7 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
             .and(takesArgument(0, named("javax.servlet.ServletRequest")))
             .and(takesArgument(1, named("javax.servlet.ServletResponse")))
             .and(isPublic()),
-        Servlet31NoWrappingInstrumentation.class.getName() + "$ServletAdvice");
+        Servlet30AndFilterInstrumentation.class.getName() + "$ServletAdvice");
     return matchers;
   }
 
@@ -90,7 +90,7 @@ public static boolean start(
         @Advice.Local("currentSpan") Span currentSpan) {
 
       int callDepth =
-          CallDepthThreadLocalMap.incrementCallDepth(Servlet31InstrumentationName.class);
+          CallDepthThreadLocalMap.incrementCallDepth(Servlet30InstrumentationName.class);
       if (callDepth > 0) {
         return false;
       }
@@ -143,7 +143,7 @@ public static void exit(
         @Advice.Argument(1) ServletResponse response,
         @Advice.Local("currentSpan") Span currentSpan) {
       int callDepth =
-          CallDepthThreadLocalMap.decrementCallDepth(Servlet31InstrumentationName.class);
+          CallDepthThreadLocalMap.decrementCallDepth(Servlet30InstrumentationName.class);
       if (callDepth > 0) {
         return;
       }

…et31NoWrappingInstrumentationModule.java …ping/Servlet30InstrumentationModule.javainstrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30InstrumentationModule.java instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30InstrumentationModule.java

@@ -27,10 +27,10 @@
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class Servlet31NoWrappingInstrumentationModule extends InstrumentationModule {
+public class Servlet30InstrumentationModule extends InstrumentationModule {
 
-  public Servlet31NoWrappingInstrumentationModule() {
-    super(Servlet31InstrumentationName.PRIMARY, Servlet31InstrumentationName.OTHER);
+  public Servlet30InstrumentationModule() {
+    super(Servlet30InstrumentationName.PRIMARY, Servlet30InstrumentationName.OTHER);
   }
 
   @Override
@@ -41,7 +41,7 @@ public int getOrder() {
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Arrays.asList(
-        new Servlet31NoWrappingInstrumentation(),
+        new Servlet30AndFilterInstrumentation(),
         new ServletRequestInstrumentation(),
         new ServletInputStreamInstrumentation(),
         new ServletResponseInstrumentation(),

…apping/Servlet31InstrumentationName.java …apping/Servlet30InstrumentationName.javainstrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31InstrumentationName.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30InstrumentationName.java instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31InstrumentationName.java renamed to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30InstrumentationName.java

@@ -16,7 +16,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping;
 
-public class Servlet31InstrumentationName {
+public class Servlet30InstrumentationName {
   public static final String PRIMARY = "servlet";
   public static final String[] OTHER = {
     "servlet-3",

…vlet30NoWrappingInstrumentationTest.java …apping/Servlet30InstrumentationTest.javainstrumentation/servlet/servlet-3.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30NoWrappingInstrumentationTest.java renamed to instrumentation/servlet/servlet-3.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30InstrumentationTest.java instrumentation/servlet/servlet-3.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30NoWrappingInstrumentationTest.java renamed to instrumentation/servlet/servlet-3.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet30InstrumentationTest.java

@@ -45,7 +45,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class Servlet30NoWrappingInstrumentationTest extends AbstractInstrumenterTest {
+public class Servlet30InstrumentationTest extends AbstractInstrumenterTest {
   private static final String REQUEST_BODY = "hello";
   private static final String REQUEST_HEADER = "requestheader";
   private static final String REQUEST_HEADER_VALUE = "requestvalue";