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 ratpack 1.4.1 for testing (#4748) 

* Use ratpack 1.4.1 for testing

* don't force netty version in ratpack tests

* spotless

* Apply suggestions from code review

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

* enable https test

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
Lauri Tulmin 2021-12-01 01:02:23 +02:00 committed by GitHub
parent d20961621e
commit 95f3d37b3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
instrumentation/ratpack-1.4/javaagent/build.gradle.kts
View File

@ -17,7 +17,9 @@ dependencies {
testImplementation(project(":instrumentation:ratpack-1.4:testing")) testImplementation(project(":instrumentation:ratpack-1.4:testing"))
testLibrary("io.ratpack:ratpack-test:1.4.0") // 1.4.0 has a bug which makes tests flaky
// (https://github.com/ratpack/ratpack/commit/dde536ac138a76c34df03a0642c88d64edde688e)
testLibrary("io.ratpack:ratpack-test:1.4.1")
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
testImplementation("com.sun.activation:jakarta.activation:1.2.2") testImplementation("com.sun.activation:jakarta.activation:1.2.2")
@ -26,3 +28,19 @@ dependencies {
// Requires old Guava. Can't use enforcedPlatform since predates BOM // Requires old Guava. Can't use enforcedPlatform since predates BOM
configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0") configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0")
// to allow all tests to pass we need to choose a specific netty version
if (!(findProperty("testLatestDeps") as Boolean)) {
configurations.configureEach {
if (!name.contains("muzzle")) {
resolutionStrategy {
eachDependency {
// specifying a fixed version for all libraries with io.netty group
if (requested.group == "io.netty") {
useVersion("4.1.31.Final")
}
}
}
}
}
}

20
instrumentation/ratpack-1.4/library/build.gradle.kts
View File

@ -8,7 +8,9 @@ dependencies {
testImplementation(project(":instrumentation:ratpack-1.4:testing")) testImplementation(project(":instrumentation:ratpack-1.4:testing"))
testLibrary("io.ratpack:ratpack-test:1.4.0") // 1.4.0 has a bug which makes tests flaky
// (https://github.com/ratpack/ratpack/commit/dde536ac138a76c34df03a0642c88d64edde688e)
testLibrary("io.ratpack:ratpack-test:1.4.1")
testLibrary("io.ratpack:ratpack-guice:1.4.0") testLibrary("io.ratpack:ratpack-guice:1.4.0")
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
@ -18,3 +20,19 @@ dependencies {
// Requires old Guava. Can't use enforcedPlatform since predates BOM // Requires old Guava. Can't use enforcedPlatform since predates BOM
configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0") configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0")
// to allow all tests to pass we need to choose a specific netty version
if (!(findProperty("testLatestDeps") as Boolean)) {
configurations.configureEach {
if (!name.contains("muzzle")) {
resolutionStrategy {
eachDependency {
// specifying a fixed version for all libraries with io.netty group
if (requested.group == "io.netty") {
useVersion("4.1.31.Final")
}
}
}
}
}
}