Merge pull request #6958 from DataDog/bbujon/ci-flaky-integration-spark

PerfectSlayer · web-flow · commit 6bb68c469dbc · 2024-04-29T09:08:15.000+02:00
Mark Spark integration test as flaky
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy b/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy
@@ -1,6 +1,7 @@
 package datadog.trace.instrumentation.spark
 
 import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.test.util.Flaky
 import org.apache.spark.sql.SparkSession
 
 abstract class AbstractSpark32SqlTest extends AgentTestRunner {
@@ -97,6 +98,7 @@ abstract class AbstractSpark32SqlTest extends AgentTestRunner {
     }
   }
 
+  @Flaky("https://github.com/DataDog/dd-trace-java/issues/6957")
   def "compute a JOIN sql query plan"() {
     def sparkSession = SparkSession.builder()
       .config("spark.master", "local[2]")

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package datadog.trace.instrumentation.spark`
`2`	`2`
`3`	`3`	`import datadog.trace.agent.test.AgentTestRunner`
	`4`	`+import datadog.trace.test.util.Flaky`
`4`	`5`	`import org.apache.spark.sql.SparkSession`
`5`	`6`
`6`	`7`	`abstract class AbstractSpark32SqlTest extends AgentTestRunner {`
`@@ -97,6 +98,7 @@ abstract class AbstractSpark32SqlTest extends AgentTestRunner {`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`
	`101`	`+ @Flaky("https://github.com/DataDog/dd-trace-java/issues/6957")`
`100`	`102`	`def "compute a JOIN sql query plan"() {`
`101`	`103`	`def sparkSession = SparkSession.builder()`
`102`	`104`	`.config("spark.master", "local[2]")`