File tree Expand file tree Collapse file tree 2 files changed +8
-6
lines changed
dd-java-agent/instrumentation/jedis-1.4 Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -13,10 +13,13 @@ addTestSuiteForDir('latestDepTest', 'test')
1313
1414dependencies {
1515 compileOnly group : ' redis.clients' , name : ' jedis' , version : ' 1.4.0'
16-
17- testImplementation group : ' com.github.kstyrc' , name : ' embedded-redis' , version : ' 0.6'
1816 testImplementation group : ' redis.clients' , name : ' jedis' , version : ' 1.4.0'
1917
18+ testImplementation (group : ' com.github.codemonstur' , name : ' embedded-redis' , version : ' 1.4.3' ) {
19+ // Excluding redis client to avoid conflicts in instrumentation code.
20+ exclude group : ' redis.clients' , module : ' jedis'
21+ }
22+
2023 // Jedis 3.0 has API changes that prevent instrumentation from applying
2124 latestDepTestImplementation group : ' redis.clients' , name : ' jedis' , version : ' 2.+'
2225}
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ abstract class JedisClientTest extends VersionedNamingTestBase {
1717 int port = PortUtils . randomOpenPort()
1818
1919 @Shared
20- RedisServer redisServer = RedisServer . builder ()
20+ RedisServer redisServer = RedisServer . newRedisServer ()
2121 // bind to localhost to avoid firewall popup
2222 .setting(" bind 127.0.0.1" )
2323 // set max memory to avoid problems in CI
@@ -36,7 +36,7 @@ abstract class JedisClientTest extends VersionedNamingTestBase {
3636 }
3737
3838 def setupSpec () {
39- println " Using redis: $redisServer . args "
39+ println " Using redis: $redisServer . @ args"
4040 redisServer. start()
4141 }
4242
@@ -169,7 +169,6 @@ abstract class JedisClientTest extends VersionedNamingTestBase {
169169}
170170
171171class JedisClientV0Test extends JedisClientTest {
172-
173172 @Override
174173 int version () {
175174 return 0
@@ -185,8 +184,8 @@ class JedisClientV0Test extends JedisClientTest {
185184 return " redis.query"
186185 }
187186}
188- class JedisClientV1ForkedTest extends JedisClientTest {
189187
188+ class JedisClientV1ForkedTest extends JedisClientTest {
190189 @Override
191190 int version () {
192191 return 1
You can’t perform that action at this time.
0 commit comments