normalize column ref and plan_id num before assert equal

aboitreaud · aboitreaud · commit 38446b2b6f3c · 2026-03-06T18:16:12.000+01:00
diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy
@@ -1310,7 +1310,13 @@ abstract class AbstractSpark32SqlTest extends InstrumentationSpecification {
         }
 
         def normalizedActual = normalizeNodeIds(actualParsed, actualToNormalized)
-        AbstractSpark24SqlTest.assertSQLPlanEquals(expectedParsed, normalizedActual, names[i])
+
+        // Normalize environment-dependent column ref IDs (#N, #NL) and plan_id values
+        // which vary across test runs and environments
+        def normalizedExpected = normalizeColumnRefs(expectedParsed)
+        normalizedActual = normalizeColumnRefs(normalizedActual)
+
+        AbstractSpark24SqlTest.assertSQLPlanEquals(normalizedExpected, normalizedActual, names[i])
       }
     }
   }
@@ -1353,4 +1359,15 @@ abstract class AbstractSpark32SqlTest extends InstrumentationSpecification {
     }
     return plan
   }
+
+  private static Object normalizeColumnRefs(Object plan) {
+    if (plan instanceof String) {
+      return plan.replaceAll(/#\d+L?/, '#N').replaceAll(/plan_id=\d+/, 'plan_id=N')
+    } else if (plan instanceof List) {
+      return plan.collect { normalizeColumnRefs(it) }
+    } else if (plan instanceof Map) {
+      return plan.collectEntries { k, v -> [k, normalizeColumnRefs(v)] }
+    }
+    return plan
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1310,7 +1310,13 @@ abstract class AbstractSpark32SqlTest extends InstrumentationSpecification {`
`1310`	`1310`	`}`
`1311`	`1311`
`1312`	`1312`	`def normalizedActual = normalizeNodeIds(actualParsed, actualToNormalized)`
`1313`		`- AbstractSpark24SqlTest.assertSQLPlanEquals(expectedParsed, normalizedActual, names[i])`
	`1313`	`+`
	`1314`	`+ // Normalize environment-dependent column ref IDs (#N, #NL) and plan_id values`
	`1315`	`+ // which vary across test runs and environments`
	`1316`	`+ def normalizedExpected = normalizeColumnRefs(expectedParsed)`
	`1317`	`+ normalizedActual = normalizeColumnRefs(normalizedActual)`
	`1318`	`+`
	`1319`	`+ AbstractSpark24SqlTest.assertSQLPlanEquals(normalizedExpected, normalizedActual, names[i])`
`1314`	`1320`	`}`
`1315`	`1321`	`}`
`1316`	`1322`	`}`
`@@ -1353,4 +1359,15 @@ abstract class AbstractSpark32SqlTest extends InstrumentationSpecification {`
`1353`	`1359`	`}`
`1354`	`1360`	`return plan`
`1355`	`1361`	`}`
	`1362`	`+`
	`1363`	`+ private static Object normalizeColumnRefs(Object plan) {`
	`1364`	`+ if (plan instanceof String) {`
	`1365`	`+ return plan.replaceAll(/#\d+L?/, '#N').replaceAll(/plan_id=\d+/, 'plan_id=N')`
	`1366`	`+ } else if (plan instanceof List) {`
	`1367`	`+ return plan.collect { normalizeColumnRefs(it) }`
	`1368`	`+ } else if (plan instanceof Map) {`
	`1369`	`+ return plan.collectEntries { k, v -> [k, normalizeColumnRefs(v)] }`
	`1370`	`+ }`
	`1371`	`+ return plan`
	`1372`	`+ }`
`1356`	`1373`	`}`