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

Merge pull request #754 from DataDog/mar-kolya/increase-docker-timeout 

Increase docker container timeout in tests to help with stability on …
This commit is contained in:
Nikolay Martynov 2019-03-04 14:40:27 -05:00 committed by GitHub
parent 44919b4dbe 9272f88fe6
commit d054790161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
View File

@ -22,6 +22,7 @@ import org.testcontainers.containers.GenericContainer
import spock.lang.Requires import spock.lang.Requires
import spock.lang.Shared import spock.lang.Shared
import java.time.Duration
import java.util.concurrent.Phaser import java.util.concurrent.Phaser
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
@ -56,6 +57,7 @@ class RabbitMQTest extends AgentTestRunner {
if ("true" != System.getenv("CI")) { if ("true" != System.getenv("CI")) {
rabbbitMQContainer = new GenericContainer('rabbitmq:latest') rabbbitMQContainer = new GenericContainer('rabbitmq:latest')
.withExposedPorts(defaultRabbitMQPort) .withExposedPorts(defaultRabbitMQPort)
.withStartupTimeout(Duration.ofSeconds(120))
// .withLogConsumer { output -> // .withLogConsumer { output ->
// print output.utf8String // print output.utf8String
// } // }

2
dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy
View File

@ -17,6 +17,7 @@ import org.testcontainers.containers.GenericContainer
import spock.lang.Requires import spock.lang.Requires
import spock.lang.Shared import spock.lang.Shared
import java.time.Duration
import java.util.concurrent.ArrayBlockingQueue import java.util.concurrent.ArrayBlockingQueue
import java.util.concurrent.BlockingQueue import java.util.concurrent.BlockingQueue
import java.util.concurrent.ExecutorService import java.util.concurrent.ExecutorService
@ -63,6 +64,7 @@ class SpymemcachedTest extends AgentTestRunner {
if ("true" != System.getenv("CI")) { if ("true" != System.getenv("CI")) {
memcachedContainer = new GenericContainer('memcached:latest') memcachedContainer = new GenericContainer('memcached:latest')
.withExposedPorts(defaultMemcachedPort) .withExposedPorts(defaultMemcachedPort)
.withStartupTimeout(Duration.ofSeconds(120))
memcachedContainer.start() memcachedContainer.start()
memcachedAddress = new InetSocketAddress( memcachedAddress = new InetSocketAddress(
memcachedContainer.containerIpAddress, memcachedContainer.containerIpAddress,