Enable grizzly by default

amarziali · amarziali · commit c437ce97e348 · 2024-11-20T09:20:39.000+01:00
diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
@@ -28,11 +28,6 @@ public GrizzlyHttpHandlerInstrumentation() {
     super("grizzly");
   }
 
-  @Override
-  public boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public String instrumentedType() {
     return "org.glassfish.grizzly.http.server.HttpHandler";
diff --git a/dd-java-agent/instrumentation/grizzly-2/src/test/groovy/GrizzlyTest.groovy b/dd-java-agent/instrumentation/grizzly-2/src/test/groovy/GrizzlyTest.groovy
@@ -31,13 +31,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_B
 
 class GrizzlyTest extends HttpServerTest<HttpServer> {
 
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-
-    injectSysConfig("dd.integration.grizzly.enabled", "true")
-  }
-
   static GrizzlyTest testInstance
 
   static void markHandlerRan(boolean value) {
diff --git a/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java b/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java
@@ -27,11 +27,6 @@ public AsyncHttpClientInstrumentation() {
     super("grizzly-client", "ning");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public String instrumentedType() {
     return "com.ning.http.client.AsyncHttpClient";
diff --git a/dd-java-agent/instrumentation/grizzly-client-1.9/src/test/groovy/GrizzlyAsyncHttpClientTest.groovy b/dd-java-agent/instrumentation/grizzly-client-1.9/src/test/groovy/GrizzlyAsyncHttpClientTest.groovy
@@ -21,13 +21,6 @@ abstract class GrizzlyAsyncHttpClientTest extends HttpClientTest {
   @Shared
   def client = new AsyncHttpClient()
 
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-
-    injectSysConfig("dd.integration.grizzly-client.enabled", "true")
-  }
-
   @Override
   int doRequest(String method, URI uri, Map<String, String> headers, String body, Closure callback) {
 
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/build.gradle b/dd-java-agent/instrumentation/grizzly-http-2.3.20/build.gradle
@@ -33,7 +33,3 @@ dependencies {
   latestDepTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '2.+'
   latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
 }
-
-tasks.withType(Test) {
-  jvmArgs += ['-Ddd.integration.grizzly-filterchain.enabled=true']
-}
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java
@@ -35,11 +35,6 @@ public String[] helperClassNames() {
     };
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java
@@ -21,11 +21,6 @@ public String instrumentedType() {
     return "org.glassfish.grizzly.http.HttpCodecFilter";
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java
@@ -21,11 +21,6 @@ public String instrumentedType() {
     return "org.glassfish.grizzly.http.HttpServerFilter";
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/test/groovy/GrizzlyIOStrategyTest.groovy b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/test/groovy/GrizzlyIOStrategyTest.groovy
@@ -6,13 +6,6 @@ import org.glassfish.grizzly.strategies.SimpleDynamicNIOStrategy
 
 abstract class GrizzlyIOStrategyTest extends GrizzlyTest {
 
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-
-    injectSysConfig("dd.integration.grizzly-http.enabled", "true")
-  }
-
   @Override
   HttpServer server() {
     def server = super.server() as GrizzlyServer
diff --git a/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy b/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy
@@ -27,10 +27,7 @@ class MuleForkedTest extends WithHttpServer<MuleTestContainer> {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
-
-    injectSysConfig("integration.grizzly-filterchain.enabled", "true")
     injectSysConfig("integration.mule.enabled", "true")
-    injectSysConfig("integration.grizzly-client.enabled", "true")
   }
 
   @AutoCleanup
diff --git a/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy b/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy
@@ -29,8 +29,6 @@ class MuleHttpServerForkedTest extends HttpServerTest<MuleTestContainer> {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
-
-    injectSysConfig("integration.grizzly-filterchain.enabled", "true")
     injectSysConfig("integration.mule.enabled", "true")
   }
 
diff --git a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy
@@ -17,7 +17,6 @@ class Jersey2SmokeTest extends AbstractJerseySmokeTest {
     command.add(javaPath())
     command.addAll(defaultJavaProperties)
     command.addAll(iastJvmOpts())
-    command.add(withSystemProperty('integration.grizzly.enabled', true))
     if (Platform.isJavaVersionAtLeast(17)) {
       command.addAll((String[]) ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'])
     }
diff --git a/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy b/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy
@@ -16,7 +16,6 @@ class Jersey3SmokeTest extends AbstractJerseySmokeTest {
     command.add(javaPath())
     command.addAll(defaultJavaProperties)
     command.addAll(iastJvmOpts())
-    command.add(withSystemProperty('integration.grizzly.enabled', true))
     //command.add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000")
     //command.add("-Xdebug")
     command.addAll((String[]) ['-jar', jarPath, httpPort])
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy b/utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy
@@ -117,11 +117,7 @@ abstract class DDSpecification extends Specification {
   }
 
   private static Map<Object, Object> systemPropertiesExceptAllowed() {
-    def allowlist = [
-      'dd.appsec.enabled',
-      'dd.iast.enabled',
-      'dd.integration.grizzly-filterchain.enabled',
-    ]
+    def allowlist = ['dd.appsec.enabled', 'dd.iast.enabled',]
     System.getProperties()
       .findAll { key, value -> !allowlist.contains(key as String) }
   }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,3 @@ dependencies {`
`33`	`33`	`latestDepTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '2.+'`
`34`	`34`	`latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'`
`35`	`35`	`}`
`36`		`-`
`37`		`-tasks.withType(Test) {`
`38`		`- jvmArgs += ['-Ddd.integration.grizzly-filterchain.enabled=true']`
`39`		`-}`