tomcat test project

Author: zeitlinger

instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/ErrorHandlerValve.java

@@ -12,7 +12,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class ErrorHandlerValve extends ErrorReportValve {
+// public, because it's loaded by reflection
+public class ErrorHandlerValve extends ErrorReportValve {
 
   private static final Logger logger = LoggerFactory.getLogger(ErrorHandlerValve.class);
 

instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TestAccessLogValve.java

@@ -17,7 +17,8 @@
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
 
-class TestAccessLogValve extends ValveBase implements AccessLog {
+// public, because it's loaded by reflection
+public class TestAccessLogValve extends ValveBase implements AccessLog {
 
   public final List<Map.Entry<String, String>> getLoggedIds() {
     return loggedIds;

instrumentation/servlet/servlet-5.0/tomcat-testing/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 }
 
 dependencies {
+  testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
   testImplementation(project(":instrumentation:servlet:servlet-5.0:testing"))
 
   testLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.0")

instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/ErrorHandlerValve.java

@@ -12,7 +12,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class ErrorHandlerValve extends ErrorReportValve {
+// public, because it's loaded by reflection
+public class ErrorHandlerValve extends ErrorReportValve {
 
   private static final Logger logger = LoggerFactory.getLogger(ErrorHandlerValve.class);
 

instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/TestAccessLogValve.java

@@ -17,7 +17,8 @@
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
 
-class TestAccessLogValve extends ValveBase implements AccessLog {
+// public, because it's loaded by reflection
+public class TestAccessLogValve extends ValveBase implements AccessLog {
 
   public final List<Map.Entry<String, String>> getLoggedIds() {
     return loggedIds;