Merge branch 'master' into alejandro.gonzalez/rc-waf-rules-dup-bug

Author: jandro996

.gitlab-ci.yml

@@ -1002,7 +1002,7 @@ validate_supported_configurations_v2_local_file:
   extends: .validate_supported_configurations_v2_local_file
   variables:
     LOCAL_JSON_PATH: "metadata/supported-configurations.json"
-    BACKFILLED: "true"
+    BACKFILLED: "false"
 
 update_central_configurations_version_range_v2:
   extends: .update_central_configurations_version_range_v2

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

@@ -5,6 +5,7 @@ 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/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) {

settings.gradle.kts

@@ -627,7 +627,7 @@ include(
 )
 
 // Optional `akka-http-10.6` instrumentation (see BUILDING.md for how to enable it):
-if (providers.gradleProperty("akkaRepositoryToken").isPresent) {
+if (providers.gradleProperty("akkaRepositoryToken").getOrElse("").isNotBlank()) {
   include(
     ":dd-java-agent:instrumentation:akka:akka-http:akka-http-10.6"
   )