Merge branch 'master' into bdu/fix-jetty-leaking-out-of-testing

Author: bric3

.gitlab-ci.yml

@@ -565,7 +565,7 @@ muzzle-dep-report:
       export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
       fi
     - *prepare_test_env
-    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djava.util.prefs.userRoot=/tmp/.java/.userPrefs-${CI_JOB_ID}' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
     - ./gradlew --version
     - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -Pslot=$CI_NODE_INDEX/$CI_NODE_TOTAL $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
   after_script:

dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle

@@ -5,7 +5,6 @@ muzzle {
     module = "redisson"
     versions = "[3.10.3,)"
     skipVersions += "0.9.0"
-    skipVersions += "4.0.0" // FIXME: Temporary skip `4.0.0` as we need more time to support it.
     assertInverse = true
   }
 }

dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java

@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import net.bytebuddy.asm.Advice;
-import org.redisson.api.RFuture;
+import org.redisson.api.RTransaction;
 import org.redisson.client.RedisConnection;
 import org.redisson.client.protocol.CommandData;
 import org.redisson.client.protocol.CommandsData;
@@ -86,9 +86,9 @@ public static void after(@Advice.Enter final AgentScope scope) {
       }
     }
 
-    public static void muzzleCheck(final RFuture<?> future) {
+    public static void muzzleCheck(final RTransaction b) {
       // added on 3.10.3
-      future.onComplete(null);
+      b.getBuckets();
     }
   }
 

dd-java-agent/instrumentation/spark/spark_2.13/build.gradle

@@ -16,7 +16,6 @@ muzzle {
     group = "org.apache.spark"
     module = "spark-sql_$scalaVersion"
     versions = "[4.0.0,)"
-    skipVersions += "4.1.0" // FIXME: Temporary skip `4.1.0` as we need more time to support it.
     javaVersion = 17
   }
 }

dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java

@@ -58,7 +58,6 @@
 import org.apache.spark.sql.execution.SQLExecution;
 import org.apache.spark.sql.execution.SparkPlanInfo;
 import org.apache.spark.sql.execution.metric.SQLMetricInfo;
-import org.apache.spark.sql.execution.streaming.StreamExecution;
 import org.apache.spark.sql.execution.ui.SparkListenerSQLExecutionEnd;
 import org.apache.spark.sql.execution.ui.SparkListenerSQLExecutionStart;
 import org.apache.spark.sql.streaming.SourceProgress;
@@ -1264,7 +1263,7 @@ private static String getStreamingBatchKey(Properties properties) {
       return null;
     }
 
-    Object queryId = properties.get(StreamExecution.QUERY_ID_KEY());
+    Object queryId = properties.get("sql.streaming.queryId");
     Object batchId = properties.get("streaming.sql.batchId");
 
     if (queryId == null || batchId == null) {