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

Change smoketests to use testcontainers httpclient5 transport (#3112) 

* Change smoketest to use testcontainers httpclient5 transport

* Update smoke-tests/src/test/resources/testcontainers.properties

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
Lauri Tulmin 2021-05-27 22:40:52 +03:00 committed by GitHub
parent 165bc1e492
commit 6706dbfe53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark-e2e/benchmark-e2e.gradle
View File

@ -5,7 +5,7 @@ description = 'e2e benchmark'
dependencies { dependencies {
implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
implementation 'org.slf4j:slf4j-simple:1.6.1' implementation 'org.slf4j:slf4j-simple:1.6.1'
implementation 'org.testcontainers:testcontainers:1.15.2' implementation 'org.testcontainers:testcontainers:1.15.3'
} }
test { test {

2
examples/distro/smoke-tests/build.gradle
View File

@ -3,7 +3,7 @@ plugins {
} }
dependencies { dependencies {
testImplementation("org.testcontainers:testcontainers:1.15.2") testImplementation("org.testcontainers:testcontainers:1.15.3")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.11.2") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.11.2")
testImplementation("com.google.protobuf:protobuf-java-util:3.12.4") testImplementation("com.google.protobuf:protobuf-java-util:3.12.4")
testImplementation("com.squareup.okhttp3:okhttp:3.12.12") testImplementation("com.squareup.okhttp3:okhttp:3.12.12")

2
examples/extension/build.gradle
View File

@ -76,7 +76,7 @@ dependencies {
implementation 'org.apache.commons:commons-lang3:3.11' implementation 'org.apache.commons:commons-lang3:3.11'
//All dependencies below are only for tests //All dependencies below are only for tests
testImplementation("org.testcontainers:testcontainers:1.15.2") testImplementation("org.testcontainers:testcontainers:1.15.3")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.11.2") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.11.2")
testImplementation("com.google.protobuf:protobuf-java-util:3.12.4") testImplementation("com.google.protobuf:protobuf-java-util:3.12.4")
testImplementation("com.squareup.okhttp3:okhttp:3.12.12") testImplementation("com.squareup.okhttp3:okhttp:3.12.12")

2
gradle/dependencies.gradle
View File

@ -32,7 +32,7 @@ ext {
mockito : '3.6.0', mockito : '3.6.0',
// Caffeine 2.x to support Java 8+. 3.x is 11+. // Caffeine 2.x to support Java 8+. 3.x is 11+.
caffeine : '2.9.0', caffeine : '2.9.0',
testcontainers : '1.15.2', testcontainers : '1.15.3',
weaklockfree : '0.18' weaklockfree : '0.18'
] ]

2
smoke-tests/src/test/resources/testcontainers.properties Normal file
View File

@ -0,0 +1,2 @@
# https://github.com/testcontainers/testcontainers-java/issues/3531
transport.type=httpclient5