open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use random ports for embedded redis

This commit is contained in:
Brian Devins-Suresh 2019-12-05 16:23:22 -05:00
parent 00fb29f528
commit 2e5aff391d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy
View File

@ -1,4 +1,5 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.instrumentation.api.Tags
@ -8,7 +9,8 @@ import spock.lang.Shared
class JedisClientTest extends AgentTestRunner { class JedisClientTest extends AgentTestRunner {
public static final int PORT = 6399 @Shared
int port = PortUtils.randomOpenPort()
@Shared @Shared
RedisServer redisServer = RedisServer.builder() RedisServer redisServer = RedisServer.builder()
@ -16,9 +18,9 @@ class JedisClientTest extends AgentTestRunner {
.setting("bind 127.0.0.1") .setting("bind 127.0.0.1")
// set max memory to avoid problems in CI // set max memory to avoid problems in CI
.setting("maxmemory 128M") .setting("maxmemory 128M")
.port(PORT).build() .port(port).build()
@Shared @Shared
Jedis jedis = new Jedis("localhost", PORT) Jedis jedis = new Jedis("localhost", port)
def setupSpec() { def setupSpec() {
println "Using redis: $redisServer.args" println "Using redis: $redisServer.args"

8
dd-java-agent/instrumentation/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy
View File

@ -1,4 +1,5 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.instrumentation.api.Tags
@ -8,7 +9,8 @@ import spock.lang.Shared
class Jedis30ClientTest extends AgentTestRunner { class Jedis30ClientTest extends AgentTestRunner {
public static final int PORT = 6399 @Shared
int port = PortUtils.randomOpenPort()
@Shared @Shared
RedisServer redisServer = RedisServer.builder() RedisServer redisServer = RedisServer.builder()
@ -16,9 +18,9 @@ class Jedis30ClientTest extends AgentTestRunner {
.setting("bind 127.0.0.1") .setting("bind 127.0.0.1")
// set max memory to avoid problems in CI // set max memory to avoid problems in CI
.setting("maxmemory 128M") .setting("maxmemory 128M")
.port(PORT).build() .port(port).build()
@Shared @Shared
Jedis jedis = new Jedis("localhost", PORT) Jedis jedis = new Jedis("localhost", port)
def setupSpec() { def setupSpec() {
println "Using redis: $redisServer.args" println "Using redis: $redisServer.args"