Merge branch 'master' into alexeyk/fixed-flaky-pekko-test

Author: AlexeyKuznetsov-DD

benchmark/load/petclinic/benchmark.json

@@ -30,12 +30,6 @@
         "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.appsec.enabled=true"
       }
     },
-    "appsec_no_iast": {
-      "env": {
-        "VARIANT": "appsec_no_iast",
-        "JAVA_OPTS": "-javaagent:${TRACER} -Ddd.appsec.enabled=true -Ddd.iast.enabled=false"
-      }
-    },
     "iast": {
       "env": {
         "VARIANT": "iast",

benchmark/startup/petclinic/benchmark.json

@@ -24,12 +24,6 @@
         "JAVA_OPTS": "-Ddd.appsec.enabled=true"
       }
     },
-    "appsec_no_iast": {
-      "env": {
-        "VARIANT": "appsec",
-        "JAVA_OPTS": "-Ddd.appsec.enabled=true -Ddd.iast.enabled=false"
-      }
-    },
     "iast": {
       "env": {
         "VARIANT": "iast",

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java

@@ -27,6 +27,7 @@
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -49,6 +50,7 @@ protected String getAppId() {
   @ParameterizedTest(name = "Process tags enabled ''{0}''")
   @ValueSource(booleans = {true, false})
   @DisplayName("testTracer")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testTracer(boolean processTagsEnabled) throws Exception {
     LogProbe logProbe =
         LogProbe.builder()
@@ -79,6 +81,7 @@ void testTracer(boolean processTagsEnabled) throws Exception {
 
   @Test
   @DisplayName("testTracerDynamicLog")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testTracerDynamicLog() throws Exception {
     LogProbe logProbe =
         LogProbe.builder()
@@ -101,6 +104,7 @@ void testTracerDynamicLog() throws Exception {
 
   @Test
   @DisplayName("testTracerSameMethod")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testTracerSameMethod() throws Exception {
     LogProbe logProbe =
         LogProbe.builder()
@@ -120,6 +124,7 @@ void testTracerSameMethod() throws Exception {
 
   @Test
   @DisplayName("testTracerLineSnapshotProbe")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testTracerLineSnapshotProbe() throws Exception {
     LogProbe logProbe =
         LogProbe.builder()
@@ -139,6 +144,7 @@ void testTracerLineSnapshotProbe() throws Exception {
 
   @Test
   @DisplayName("testTracerLineDynamicLogProbe")
+  @DisabledIf(value = "datadog.trace.api.Platform#isJ9", disabledReason = "Flaky on J9 JVMs")
   void testTracerLineDynamicLogProbe() throws Exception {
     final String LOG_TEMPLATE = "processWithArg {argInt}";
     LogProbe logProbe =