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 #734 from DataDog/mar-kolya/increase-smok-tests-timeout 

Increase time we wait for smoke tests servers to start up
This commit is contained in:
Nikolay Martynov 2019-02-26 14:55:55 -05:00 committed by GitHub
parent 0cdc80aa14 c1914da54f
commit 1a19437885
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dd-smoke-tests/play/play.gradle
View File

@ -84,6 +84,7 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
// these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput // these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput
waitForPort = playHttpPort waitForPort = playHttpPort
waitForOutput = "Listening for HTTP on /127.0.0.1:${playHttpPort}" waitForOutput = "Listening for HTTP on /127.0.0.1:${playHttpPort}"
timeout = 240
environment = [ environment = [
'JAVA_OPTS' : "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}" 'JAVA_OPTS' : "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}"
+ " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app" + " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app"

1
dd-smoke-tests/springboot/springboot.gradle
View File

@ -48,6 +48,7 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
standardOutput "${buildDir}/reports/server.log" standardOutput "${buildDir}/reports/server.log"
waitForPort = springbootHttpPort waitForPort = springbootHttpPort
waitForOutput = "datadog.smoketest.springboot.SpringbootApplication - Started SpringbootApplication" waitForOutput = "datadog.smoketest.springboot.SpringbootApplication - Started SpringbootApplication"
timeout = 240
stopAfter = test stopAfter = test
} }

1
dd-smoke-tests/wildfly/wildfly.gradle
View File

@ -72,6 +72,7 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
// these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput // these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput
waitForPort = wildflyHttpPort waitForPort = wildflyHttpPort
waitForOutput = "Undertow HTTP listener default listening on 127.0.0.1:${wildflyHttpPort}" waitForOutput = "Undertow HTTP listener default listening on 127.0.0.1:${wildflyHttpPort}"
timeout = 240
environment = [ environment = [
'JAVA_OPTS': "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}" 'JAVA_OPTS': "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}"
+ " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app" + " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app"