fix test

aboitreaud · aboitreaud · commit 4a4cea5fb5f2 · 2025-12-05T16:51:38.000+01:00
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy b/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy
@@ -668,26 +668,26 @@ abstract class AbstractSparkTest extends InstrumentationSpecification {
             operationName "spark.application"
             spanType "spark"
             assert span.serviceName ==~ expectedService
-            assert span.tags["service_name"] == expectedServiceNameTag
+            assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
           }
         }
         span {
           operationName "spark.sql"
           spanType "spark"
           assert span.serviceName ==~ expectedService
-          assert span.tags["service_name"] == expectedServiceNameTag
+          assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
         }
         span {
           operationName "spark.job"
           spanType "spark"
           assert span.serviceName ==~ expectedService
-          assert span.tags["service_name"] == expectedServiceNameTag
+          assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
         }
         span {
           operationName "spark.stage"
           spanType "spark"
           assert span.serviceName ==~ expectedService
-          assert span.tags["service_name"] == expectedServiceNameTag
+          assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
         }
       }
     }
@@ -700,7 +700,7 @@ abstract class AbstractSparkTest extends InstrumentationSpecification {
     null      | true                  | "some_app" | true                  | "(?!.*some_app).*"     | null
     null      | true                  | "some_app" | false                 | "some_app"             | "some_app"
     null      | false                 | "some_app" | false                 | "(?!.*some_app).*"     | null
-    null      | true                  | null       | false                 | "(?!.*some_app).*"     | null
+    null      | true                  | null       | false                 | "(?!.*some_app).*"     | ".+"
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -668,26 +668,26 @@ abstract class AbstractSparkTest extends InstrumentationSpecification {`
`668`	`668`	`operationName "spark.application"`
`669`	`669`	`spanType "spark"`
`670`	`670`	`assert span.serviceName ==~ expectedService`
`671`		`- assert span.tags["service_name"] == expectedServiceNameTag`
	`671`	`+ assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag`
`672`	`672`	`}`
`673`	`673`	`}`
`674`	`674`	`span {`
`675`	`675`	`operationName "spark.sql"`
`676`	`676`	`spanType "spark"`
`677`	`677`	`assert span.serviceName ==~ expectedService`
`678`		`- assert span.tags["service_name"] == expectedServiceNameTag`
	`678`	`+ assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag`
`679`	`679`	`}`
`680`	`680`	`span {`
`681`	`681`	`operationName "spark.job"`
`682`	`682`	`spanType "spark"`
`683`	`683`	`assert span.serviceName ==~ expectedService`
`684`		`- assert span.tags["service_name"] == expectedServiceNameTag`
	`684`	`+ assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag`
`685`	`685`	`}`
`686`	`686`	`span {`
`687`	`687`	`operationName "spark.stage"`
`688`	`688`	`spanType "spark"`
`689`	`689`	`assert span.serviceName ==~ expectedService`
`690`		`- assert span.tags["service_name"] == expectedServiceNameTag`
	`690`	`+ assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag`
`691`	`691`	`}`
`692`	`692`	`}`
`693`	`693`	`}`
`@@ -700,7 +700,7 @@ abstract class AbstractSparkTest extends InstrumentationSpecification {`
`700`	`700`	`null \| true \| "some_app" \| true \| "(?!.some_app)." \| null`
`701`	`701`	`null \| true \| "some_app" \| false \| "some_app" \| "some_app"`
`702`	`702`	`null \| false \| "some_app" \| false \| "(?!.some_app)." \| null`
`703`		`- null \| true \| null \| false \| "(?!.some_app)." \| null`
	`703`	`+ null \| true \| null \| false \| "(?!.some_app)." \| ".+"`
`704`	`704`	`}`
`705`	`705`
`706`	`706`