Merge pull request #6953 from DataDog/bbujon/ci-flaky-integration-play-scala

Mark Play Scala integration test as flaky

Author: PerfectSlayer

dd-java-agent/instrumentation/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy

@@ -8,6 +8,7 @@ import datadog.trace.api.DDTags
 import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.instrumentation.play25.PlayController
+import datadog.trace.test.util.Flaky
 import groovy.transform.CompileStatic
 import scala.concurrent.ExecutionContext$
 import spock.lang.Shared
@@ -53,6 +54,12 @@ class PlayScalaRoutesServerTest extends PlayServerTest {
     '/path/?/param'
   }
 
+  @Flaky("https://github.com/DataDog/dd-trace-java/issues/6952")
+  @Override
+  boolean testUserBlocking() {
+    "false" != System.getProperty("run.flaky.tests") // Set when using -PskipFlakyTests gradle parameter
+  }
+
   @Override
   Map<String, ?> expectedIGPathParams() {
     [path: '123']