Define servlet classloader matchers in the module (#130)

* Define servlet classloader matchers in the module

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

instrumentation/servlet/servlet-2.3/build.gradle.kts

@@ -14,7 +14,7 @@ muzzle {
     fail {
         group = "javax.servlet"
         module = "javax.servlet-api"
-        versions = "(3.0.1,)"
+        versions = "(,)"
     }
 }
 

instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentationModule.java

@@ -66,6 +66,15 @@ public int getOrder() {
     return 1;
   }
 
+  // this is required to make sure servlet 2 instrumentation won't apply to servlet 3
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // Request/response wrappers are available since servlet 2.3!
+    return hasClassesNamed(
+            "javax.servlet.http.HttpServlet", "javax.servlet.http.HttpServletRequestWrapper")
+        .and(not(hasClassesNamed("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener")));
+  }
+
   @Override
   public Map<String, String> contextStore() {
     return singletonMap("javax.servlet.ServletResponse", Integer.class.getName());
@@ -95,15 +104,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   public static class Servlet2BodyInstrumentation implements TypeInstrumentation {
 
-    // this is required to make sure servlet 2 instrumentation won't apply to servlet 3
-    @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Request/response wrappers are available since servlet 2.3!
-      return hasClassesNamed(
-              "javax.servlet.http.HttpServlet", "javax.servlet.http.HttpServletRequestWrapper")
-          .and(not(hasClassesNamed("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener")));
-    }
-
     @Override
     public ElementMatcher<TypeDescription> typeMatcher() {
       return safeHasSuperType(

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentationModule.java

@@ -66,6 +66,14 @@ public int getOrder() {
     return 1;
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // Optimization for expensive typeMatcher.
+    // ReadListener was added in 3.1
+    return hasClassesNamed("javax.servlet.http.HttpServlet", "javax.servlet.AsyncEvent")
+        .and(not(hasClassesNamed("javax.servlet.ReadListener")));
+  }
+
   @Override
   public String[] helperClassNames() {
     return new String[] {
@@ -91,14 +99,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   private static class Servlet30BodyInstrumentation implements TypeInstrumentation {
 
-    @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
-      // ReadListener was added in 3.1
-      return hasClassesNamed("javax.servlet.http.HttpServlet", "javax.servlet.AsyncEvent")
-          .and(not(hasClassesNamed("javax.servlet.ReadListener")));
-    }
-
     @Override
     public ElementMatcher<? super TypeDescription> typeMatcher() {
       return safeHasSuperType(

instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31BodyInstrumentationModule.java

@@ -59,6 +59,12 @@ public int getOrder() {
     return 1;
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // Optimization for expensive typeMatcher.
+    return hasClassesNamed("javax.servlet.http.HttpServlet", "javax.servlet.ReadListener");
+  }
+
   @Override
   public String[] helperClassNames() {
     return new String[] {
@@ -89,12 +95,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   private static final class Servlet31BodyInstrumentation implements TypeInstrumentation {
 
-    @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
-      return hasClassesNamed("javax.servlet.http.HttpServlet", "javax.servlet.ReadListener");
-    }
-
     @Override
     public ElementMatcher<? super TypeDescription> typeMatcher() {
       return safeHasSuperType(