Reorganize shared servlet code (intro to #4317)

open-telemetry · Dec 6, 2021 · 185fc64 · 185fc64
1 parent ce4cef7
commit 185fc64
Show file tree

Hide file tree

Showing 47 changed files with 380 additions and 120 deletions.
diff --git a/instrumentation/jetty/jetty-common/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-common/javaagent/build.gradle.kts
@@ -3,6 +3,5 @@ plugins {
 }
 
 dependencies {
-  api(project(":instrumentation:servlet:servlet-common:library"))
-  implementation(project(":instrumentation:servlet:servlet-common:javaagent"))
+  api(project(":instrumentation:servlet:servlet-common:javaagent"))
 }
diff --git a/...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java b/...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java
@@ -8,7 +8,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.servlet.ServletAccessor;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAccessor;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletHelper;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletResponseContext;

diff --git a/...agent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java b/...agent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java
@@ -9,7 +9,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.servlet.AppServerBridge;
-import io.opentelemetry.instrumentation.servlet.ServletAccessor;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAccessor;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletHelper;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletResponseContext;

diff --git a/instrumentation/servlet/servlet-2.2/javaagent/build.gradle.kts b/instrumentation/servlet/servlet-2.2/javaagent/build.gradle.kts
@@ -20,9 +20,8 @@ muzzle {
 dependencies {
   compileOnly("javax.servlet:servlet-api:2.2")
   implementation(project(":instrumentation:servlet:servlet-common:javaagent"))
-  implementation(project(":instrumentation:servlet:servlet-javax-common:library"))
+  implementation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 
-  testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
 
   testLibrary("org.eclipse.jetty:jetty-server:7.0.0.v20091005")

diff --git a/...c/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java b/...c/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v2_2;
 
-import io.opentelemetry.instrumentation.servlet.ServletAsyncListener;
-import io.opentelemetry.instrumentation.servlet.javax.JavaxServletAccessor;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAsyncListener;
+import io.opentelemetry.javaagent.instrumentation.servlet.javax.JavaxServletAccessor;
 import java.util.Collections;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;

diff --git a/...opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesExtractor.java b/...opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesExtractor.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v2_2;
 
-import io.opentelemetry.instrumentation.servlet.ServletAccessor;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAccessor;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletHttpAttributesExtractor;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletResponseContext;

diff --git a/...o/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java b/...o/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java
@@ -12,6 +12,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.servlet.common.service.ServletAndFilterInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.servlet.javax.response.JavaxResponseInstrumentationFactory;
 import java.util.Arrays;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -34,6 +35,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new HttpServletResponseInstrumentation(),
         new ServletAndFilterInstrumentation(
             "javax.servlet",
-            Servlet2InstrumentationModule.class.getPackage().getName() + ".Servlet2Advice"));
+            Servlet2InstrumentationModule.class.getPackage().getName() + ".Servlet2Advice"),
+        JavaxResponseInstrumentationFactory.create());
   }
 }
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java b/...va/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.servlet.v2_2;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import io.opentelemetry.instrumentation.servlet.ServletAccessor;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAccessor;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
 
 public class Servlet2SpanNameExtractor<REQUEST, RESPONSE>

diff --git a/...est/groovy/HttpServletResponseTest.groovy → ...est/groovy/HttpServletResponseTest.groovy b/...est/groovy/HttpServletResponseTest.groovy → ...est/groovy/HttpServletResponseTest.groovy
diff --git a/instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts b/instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts
@@ -18,10 +18,9 @@ muzzle {
 dependencies {
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
   api(project(":instrumentation:servlet:servlet-common:javaagent"))
-  api(project(":instrumentation:servlet:servlet-javax-common:library"))
+  api(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
-  testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 
   testLibrary("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
   testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")

diff --git a/...c/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Accessor.java b/...c/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Accessor.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
-import io.opentelemetry.instrumentation.servlet.ServletAsyncListener;
-import io.opentelemetry.instrumentation.servlet.javax.JavaxServletAccessor;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAsyncListener;
+import io.opentelemetry.javaagent.instrumentation.servlet.javax.JavaxServletAccessor;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;

diff --git a/...elemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterMappingResolverFactory.java b/...elemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterMappingResolverFactory.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
-import io.opentelemetry.instrumentation.servlet.naming.ServletFilterMappingResolverFactory;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletFilterMappingResolverFactory;
 import java.util.Collection;
 import javax.servlet.FilterConfig;
 import javax.servlet.FilterRegistration;

diff --git a/...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java b/...o/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java
@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.instrumentation.servlet.common.async.AsyncContextStartInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.servlet.common.async.AsyncStartInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.servlet.common.service.ServletAndFilterInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.servlet.javax.response.JavaxResponseInstrumentationFactory;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -42,7 +43,8 @@ BASE_PACKAGE, adviceClassName(".Servlet3AsyncContextStartAdvice")),
             BASE_PACKAGE,
             adviceClassName(".Servlet3Advice"),
             adviceClassName(".Servlet3InitAdvice"),
-            adviceClassName(".Servlet3FilterInitAdvice")));
+            adviceClassName(".Servlet3FilterInitAdvice")),
+        JavaxResponseInstrumentationFactory.create());
   }
 
   private static String adviceClassName(String suffix) {

diff --git a/.../opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3MappingResolverFactory.java b/.../opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3MappingResolverFactory.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
-import io.opentelemetry.instrumentation.servlet.naming.ServletMappingResolverFactory;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletMappingResolverFactory;
 import javax.annotation.Nullable;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;