From ebe4c6538c59929d4c6cd5ee2f7df681fea12e4f Mon Sep 17 00:00:00 2001 From: Javier Salinas Date: Tue, 7 Dec 2021 16:27:03 +0100 Subject: [PATCH] Bump ratpack to 1.7 (#4796) --- .../ratpack-1.4/library/build.gradle.kts | 38 ------------------- .../ratpack-1.7/library/build.gradle.kts | 17 +++++++++ .../ratpack/OpenTelemetryExecInterceptor.java | 0 .../OpenTelemetryFallbackErrorHandler.java | 0 .../OpenTelemetryServerErrorHandler.java | 0 .../ratpack/OpenTelemetryServerHandler.java | 0 .../ratpack/RatpackGetter.java | 0 .../RatpackHttpAttributesExtractor.java | 0 .../ratpack/RatpackTracing.java | 0 .../ratpack/RatpackTracingBuilder.java | 0 .../RatpackNetAttributesExtractor.java | 0 .../ratpack/RatpackFunctionalTest.groovy | 0 .../server/RatpackAsyncHttpServerTest.groovy | 0 .../server/RatpackForkedHttpServerTest.groovy | 0 .../server/RatpackHttpServerTest.groovy | 0 .../ratpack/server/RatpackRoutesTest.groovy | 0 .../RatpackServerApplicationTest.groovy | 0 .../ratpack/server/RatpackServerTest.groovy | 0 settings.gradle.kts | 2 +- 19 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 instrumentation/ratpack-1.4/library/build.gradle.kts create mode 100644 instrumentation/ratpack-1.7/library/build.gradle.kts rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.7}/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy (100%) diff --git a/instrumentation/ratpack-1.4/library/build.gradle.kts b/instrumentation/ratpack-1.4/library/build.gradle.kts deleted file mode 100644 index 300ad6a6c9..0000000000 --- a/instrumentation/ratpack-1.4/library/build.gradle.kts +++ /dev/null @@ -1,38 +0,0 @@ -plugins { - id("otel.library-instrumentation") - id("otel.nullaway-conventions") -} - -dependencies { - library("io.ratpack:ratpack-core:1.4.0") - - testImplementation(project(":instrumentation:ratpack-1.4:testing")) - - // 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") - - if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { - testImplementation("com.sun.activation:jakarta.activation:1.2.2") - } -} - -// Requires old Guava. Can't use enforcedPlatform since predates BOM -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") - } - } - } - } - } -} diff --git a/instrumentation/ratpack-1.7/library/build.gradle.kts b/instrumentation/ratpack-1.7/library/build.gradle.kts new file mode 100644 index 0000000000..efff40972f --- /dev/null +++ b/instrumentation/ratpack-1.7/library/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("otel.library-instrumentation") + id("otel.nullaway-conventions") +} + +dependencies { + library("io.ratpack:ratpack-core:1.7.0") + + testImplementation(project(":instrumentation:ratpack-1.4:testing")) + + testLibrary("io.ratpack:ratpack-test:1.7.0") + testLibrary("io.ratpack:ratpack-guice:1.7.0") + + if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { + testImplementation("com.sun.activation:jakarta.activation:1.2.2") + } +} diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java b/instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java similarity index 100% rename from instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java rename to instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy diff --git a/instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy b/instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy similarity index 100% rename from instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy rename to instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy diff --git a/settings.gradle.kts b/settings.gradle.kts index d68d5d77c7..8ed9f25843 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -309,8 +309,8 @@ include(":instrumentation:quartz-2.0:library") include(":instrumentation:quartz-2.0:testing") include(":instrumentation:rabbitmq-2.7:javaagent") include(":instrumentation:ratpack-1.4:javaagent") -include(":instrumentation:ratpack-1.4:library") include(":instrumentation:ratpack-1.4:testing") +include(":instrumentation:ratpack-1.7:library") include(":instrumentation:reactor-3.1:javaagent") include(":instrumentation:reactor-3.1:library") include(":instrumentation:reactor-3.1:testing")