refactor servlet modules

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle

@@ -40,7 +40,7 @@ dependencies {
   iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
-  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet'))
+  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-net'))
   iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')

dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle

@@ -77,9 +77,9 @@ dependencies {
   jetty9LatestDepTestImplementation "org.eclipse.jetty:jetty-servlet:9.+",  {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
 
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {
@@ -90,8 +90,8 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
 
 }

dd-java-agent/instrumentation/dropwizard/build.gradle

@@ -4,7 +4,7 @@ apply from: "$rootDir/gradle/java.gradle"
 
 dependencies {
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   // Don't want to conflict with jetty from the test server.
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {

dd-java-agent/instrumentation/glassfish-3.0/build.gradle

@@ -19,7 +19,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   testImplementation libs.guava
   testImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly:grizzly-2.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly:grizzly-http-2.3.20')
 

dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle

@@ -25,7 +25,7 @@ tasks.named("latestDepJava11Test") {
 dependencies {
   compileOnly group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.0.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.0.0'
   testImplementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '3.0.0'
 

dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle

@@ -27,7 +27,7 @@ addTestSuite('nestedTest')
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-jersey')
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-resteasy-3.0')
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-resteasy-3.1')

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle

@@ -60,10 +60,10 @@ dependencies {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
   testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle

@@ -74,16 +74,16 @@ dependencies {
   }
 
   testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11")
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12")
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
 

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle

@@ -25,10 +25,10 @@ dependencies {
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.0.0.v20091005'
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
 
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.+'
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.+'

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle

@@ -25,8 +25,8 @@ dependencies {
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.6.0.v20120127'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.6.0.v20120127'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.6.0.v20120127'
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
 
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.+'

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle

@@ -180,42 +180,42 @@ dependencies {
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: jetty9Version
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: jetty9Version
   testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10')
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
-  testFixturesImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+  testFixturesImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
 
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.2.30.v20200428'
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.2.30.v20200428'
   jetty92TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.2.30.v20200428'
   jetty92TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2')
-  jetty92TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  jetty92TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.15.v20190215'
   jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.15.v20190215'
   jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.4.15.v20190215'
   jetty94TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.4.15.v20190215'
   jetty94TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  jetty94TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  jetty94TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.+'
 
   latestDepJetty9TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  latestDepJetty9TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  latestDepJetty9TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+'
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+'
   latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
   latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 }
 configurations.getByName('latestDepForkedTestRuntimeClasspath').resolutionStrategy {
   force libs.slf4j

dd-java-agent/instrumentation/jsp-2.3/build.gradle

@@ -17,7 +17,7 @@ dependencies {
   compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0'
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37
   // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in
   testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'

dd-java-agent/instrumentation/liberty-20/build.gradle

@@ -21,7 +21,7 @@ configurations {
   register("testLogging")
 }
 
-evaluationDependsOn ':dd-java-agent:instrumentation:servlet:request-3'
+evaluationDependsOn ':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'
 
 // Since these tasks output are used in dependencies they have to be declared before, they can be configured later
 def unpackOpenLiberty = tasks.register('unpackOpenLiberty', UnpackOpenLiberty) {
@@ -35,24 +35,24 @@ dependencies {
 
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
   compileOnly files(unpackOpenLiberty.map {it.extractedJars.get() })
-  implementation project(':dd-java-agent:instrumentation:servlet-common')
+  implementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast')
 
   testImplementation files(unpackOpenLiberty.map {it.wsServerJar.get() })
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:osgi-4.3')
   testRuntimeOnly files(filterLogbackClassic.map { it.destinationDir })
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   webappCompileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
   // compileOnly to avoid bringing all the test dependencies to the test app
   // these are to be provided by the system classloader on test time
-  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   // only the testFixtures jar (not its dependencies) and groovy should be included in the webapp
-  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))) {
+  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))) {
     transitive = false
   }
   // use the above instead of:
-  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   // because using testFixtures() causes some early evaluation of dependencies
   webappRuntimeOnly libs.groovy
 }

dd-java-agent/instrumentation/liberty-23/build.gradle

@@ -23,7 +23,7 @@ configurations {
   register("testLogging")
 }
 
-evaluationDependsOn ':dd-java-agent:instrumentation:servlet:request-5'
+evaluationDependsOn ':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'
 
 // Since these tasks output are used in dependencies they have to be declared before, they can be configured later
 def unpackOpenLiberty = tasks.register('unpackOpenLiberty', UnpackOpenLiberty) {
@@ -38,27 +38,27 @@ dependencies {
 
   compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'
   compileOnly files(unpackOpenLiberty.map {it.extractedJars.get() })
-  implementation project(':dd-java-agent:instrumentation:servlet:request-5')
+  implementation project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
 
   testImplementation files(unpackOpenLiberty.map {it.extractedJars.get() })
   testImplementation files(unpackOpenLiberty.map {it.wsServerJar.get() })
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:osgi-4.3')
   testRuntimeOnly files(filterLogbackClassic.map { it.destinationDir })
   testRuntimeOnly project(':dd-java-agent:instrumentation:liberty-20')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly files(shadowJar.map { it.archiveFile })
 
   webappCompileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'
   // compileOnly to avoid bringing all the test dependencies to the test app
   // these are to be provided by the system classloader on test time
-  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   // only the testFixtures jar (not its dependencies) and groovy should be included in the webapp
-  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))) {
+  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))) {
     transitive = false
   }
   // use the above instead of:
-  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   // because using testFixtures() causes some early evaluation of dependencies
   webappRuntimeOnly libs.groovy
 }

dd-java-agent/instrumentation/servlet/request-5/build.gradle → dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle

@@ -57,10 +57,10 @@ dependencies {
   testImplementation group: 'jakarta.servlet.jsp', name: 'jakarta.servlet.jsp-api', version: '3.0.0'
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
 
-  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet-common'), {
+  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast'), {
     transitive = false
   }
-  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:request-3'), {
+  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'), {
     transitive = false
   }
 

dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java → dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java

@@ -95,4 +95,10 @@ public static void onExit(
       }
     }
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }