Merge branch 'master' into mhlidd/migrate_config-utils_tests

mhlidd · web-flow · commit 8fd87fbedd54 · 2025-09-24T11:41:04.000-07:00
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
@@ -411,6 +411,7 @@ private AgentSpan getOrCreateSqlSpan(
             .withTag("query_id", sqlExecutionId)
             .withTag("description", queryStart.description())
             .withTag("details", queryStart.details())
+            .withTag("_dd.spark.physical_plan", queryStart.physicalPlanDescription())
             .withTag(DDTags.RESOURCE_NAME, queryStart.description());
 
     if (batchKey != null) {
diff --git a/utils/config-utils/build.gradle.kts b/utils/config-utils/build.gradle.kts
@@ -56,3 +56,7 @@ dependencies {
   testImplementation(project(":utils:test-utils"))
   testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
 }
+
+tasks.named("javadoc") {
+  dependsOn("generateSupportedConfigurations")
+}

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,7 @@ dependencies {`
`56`	`56`	`testImplementation(project(":utils:test-utils"))`
`57`	`57`	`testImplementation("org.snakeyaml:snakeyaml-engine:2.9")`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+tasks.named("javadoc") {`
	`61`	`+ dependsOn("generateSupportedConfigurations")`
	`62`	`+}`