Improve tomcat version detection (#11936)

open-telemetry · Aug 1, 2024 · 4d41ca5 · 4d41ca5
1 parent f8c383c
commit 4d41ca5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...o/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java b/...o/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java
@@ -25,7 +25,13 @@ public Tomcat10InstrumentationModule() {
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // only matches tomcat 10.0+
-    return hasClassesNamed("jakarta.servlet.http.HttpServletRequest");
+    return hasClassesNamed("jakarta.servlet.http.HttpServletRequest")
+        .and(
+            // tomcat 10 has at least one of these two classes. Cache$EvictionOrder is present in
+            // 10.0.0, but is removed before 10.1.0. GenericUser is added before Cache$EvictionOrder
+            // is removed
+            hasClassesNamed("org.apache.catalina.users.GenericUser")
+                .or(hasClassesNamed("org.apache.catalina.webresources.Cache$EvictionOrder")));
   }
 
   @Override

diff --git a/.../io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java b/.../io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java
@@ -25,7 +25,8 @@ public Tomcat7InstrumentationModule() {
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // does not match tomcat 10.0+
-    return hasClassesNamed("javax.servlet.http.HttpServletRequest");
+    return hasClassesNamed(
+        "javax.servlet.http.HttpServletRequest", "org.apache.catalina.loader.Constants");
   }
 
   @Override