Refactor grizzly modules (#9455)

Author: amarziali

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

@@ -20,8 +20,8 @@ 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:grizzly-2')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly-http-2.3.20')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly:grizzly-2.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly:grizzly-http-2.3.20')
 
   latestDepTestImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '5+'
 }

dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java

@@ -7,50 +7,24 @@
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import com.google.auto.service.AutoService;
 import datadog.context.Context;
 import datadog.context.ContextScope;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.api.CorrelationIdentifier;
 import datadog.trace.api.gateway.Flow;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.grizzly.http.server.Response;
 
-@AutoService(InstrumenterModule.class)
-public class GrizzlyHttpHandlerInstrumentation extends InstrumenterModule.Tracing
+public class GrizzlyHttpHandlerInstrumentation
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public GrizzlyHttpHandlerInstrumentation() {
-    super("grizzly");
-  }
-
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public String instrumentedType() {
     return "org.glassfish.grizzly.http.server.HttpHandler";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".GrizzlyDecorator",
-      packageName + ".GrizzlyDecorator$GrizzlyBlockResponseFunction",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".SpanClosingListener",
-      packageName + ".GrizzlyBlockingHelper",
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

…t/instrumentation/grizzly-2/build.gradle …ntation/grizzly/grizzly-2.0/build.gradledd-java-agent/instrumentation/grizzly-2/build.gradle renamed to dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle dd-java-agent/instrumentation/grizzly-2/build.gradle renamed to dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle

@@ -0,0 +1,39 @@
+package datadog.trace.instrumentation.grizzly;
+
+import static java.util.Collections.singletonList;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import java.util.List;
+
+@AutoService(InstrumenterModule.class)
+public class GrizzlyModule extends InstrumenterModule.Tracing {
+  public GrizzlyModule() {
+    super("grizzly");
+  }
+
+  @Override
+  public boolean defaultEnabled() {
+    return false;
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".ExtractAdapter",
+      packageName + ".ExtractAdapter$Request",
+      packageName + ".ExtractAdapter$Response",
+      packageName + ".GrizzlyDecorator",
+      packageName + ".GrizzlyDecorator$GrizzlyBlockResponseFunction",
+      packageName + ".RequestURIDataAdapter",
+      packageName + ".SpanClosingListener",
+      packageName + ".GrizzlyBlockingHelper",
+    };
+  }
+
+  @Override
+  public List<Instrumenter> typeInstrumentations() {
+    return singletonList(new GrizzlyHttpHandlerInstrumentation());
+  }
+}