Changed order of clients and server shutdown to prevent freeze on GitLab CI.

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 827bf4a80067 · 2025-12-08T16:24:15.000-05:00
This follows the proper cleanup pattern: resources should be released in reverse order of their creation, and dependencies (clients) should be cleaned up before the things they depend on (the server).
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy
@@ -48,9 +48,9 @@ abstract class RedissonClientTest extends VersionedNamingTestBase {
   }
 
   def cleanupSpec() {
-    redisServer.stop()
-    lowLevelRedisClient.shutdown()
     redissonClient.shutdown()
+    lowLevelRedisClient.shutdown()
+    redisServer.stop()
   }
 
   def setup() {

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ abstract class RedissonClientTest extends VersionedNamingTestBase {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`def cleanupSpec() {`
`51`		`- redisServer.stop()`
`52`		`- lowLevelRedisClient.shutdown()`
`53`	`51`	`redissonClient.shutdown()`
	`52`	`+ lowLevelRedisClient.shutdown()`
	`53`	`+ redisServer.stop()`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`def setup() {`