Skip to content

Commit 269bad9

Browse files
Trying to fix hanging tests by relaxing useStrictTraceWrites (#9380)
1 parent def5c6a commit 269bad9

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ tasks.named("check").configure {
4646

4747
dependencies {
4848
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
49-
50-
// Using Spock 2.4-M6 because it contains fix for deadlock when blocking in mock response generators.
51-
// See: https://github.com/spockframework/spock/pull/1910
52-
testImplementation libs.spock24.core
53-
testImplementation libs.spock24.junit4
5449
}
5550

5651
// Set all compile tasks to use JDK21 but let instrumentation code targets 1.8 compatibility

dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/previewTest/groovy/StructuredConcurrencyTest.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTrace
99
import static java.time.Instant.now
1010

1111
class StructuredConcurrencyTest extends AgentTestRunner {
12+
@Override
13+
boolean useStrictTraceWrites() {
14+
// TODO: Monitor in CI to validate fix effectiveness against freezes.
15+
return false
16+
}
17+
1218
/**
1319
* Tests the structured task scope with a single task.
1420
*/

dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4ClientTestBase.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,10 @@ abstract class Lettuce4ClientTestBase extends VersionedNamingTestBase {
8383
redisClient.shutdown()
8484
redisServer.stop()
8585
}
86+
87+
@Override
88+
boolean useStrictTraceWrites() {
89+
// TODO: Monitor in CI to validate fix effectiveness against freezes.
90+
return false
91+
}
8692
}

0 commit comments

Comments
 (0)