From d14cbd3e749ea1de2ab86f96ffbb09cadb62f9b1 Mon Sep 17 00:00:00 2001
From: Bruce Bujon <bruce.bujon@datadoghq.com>
Date: Fri, 26 Apr 2024 11:13:52 +0200
Subject: [PATCH] chore: Mark test as flaky

See #6933
---
 .../grizzly-http-2.3.20/src/test/groovy/GrizzlyTest.groovy    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/test/groovy/GrizzlyTest.groovy b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/test/groovy/GrizzlyTest.groovy
index af3acd6717a..8b1c2f39920 100644
--- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/test/groovy/GrizzlyTest.groovy
+++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/test/groovy/GrizzlyTest.groovy
@@ -1,5 +1,6 @@
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.instrumentation.grizzlyhttp232.GrizzlyDecorator
+import datadog.trace.test.util.Flaky
 import org.glassfish.grizzly.http.server.HttpServer
 
 class GrizzlyTest extends HttpServerTest<HttpServer> {
@@ -53,9 +54,10 @@ class GrizzlyTest extends HttpServerTest<HttpServer> {
     true
   }
 
+  @Flaky("https://github.com/DataDog/dd-trace-java/issues/6933")
   @Override
   boolean testBlocking() {
-    true
+    "false" != System.getProperty("run.flaky.tests") // Set when using -PskipFlakyTests gradle parameter
   }
 
   //@Ignore("https://github.com/DataDog/dd-trace-java/pull/5213")