Bump ratpack to 1.7

open-telemetry · Dec 4, 2021 · b444afd · b444afd
1 parent 30b2316
commit b444afd
Show file tree

Hide file tree

Showing 47 changed files with 47 additions and 89 deletions.
diff --git a/instrumentation/ratpack-1.4/javaagent/build.gradle.kts b/instrumentation/ratpack-1.4/javaagent/build.gradle.kts
diff --git a/instrumentation/ratpack-1.4/library/build.gradle.kts b/instrumentation/ratpack-1.4/library/build.gradle.kts
diff --git a/instrumentation/ratpack-1.7/javaagent/build.gradle.kts b/instrumentation/ratpack-1.7/javaagent/build.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+muzzle {
+  pass {
+    group.set("io.ratpack")
+    module.set("ratpack-core")
+    versions.set("[1.7.0,)")
+  }
+}
+
+dependencies {
+  library("io.ratpack:ratpack-core:1.7.0")
+
+  implementation(project(":instrumentation:netty:netty-4.1:javaagent"))
+
+  testImplementation(project(":instrumentation:ratpack-1.7:testing"))
+
+  testLibrary("io.ratpack:ratpack-test:1.7.0")
+
+  if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
+    testImplementation("com.sun.activation:jakarta.activation:1.2.2")
+  }
+}
diff --git a/...nstrumentation/ratpack/ActionWrapper.java → ...nstrumentation/ratpack/ActionWrapper.java b/...nstrumentation/ratpack/ActionWrapper.java → ...nstrumentation/ratpack/ActionWrapper.java
diff --git a/...instrumentation/ratpack/BlockWrapper.java → ...instrumentation/ratpack/BlockWrapper.java b/...instrumentation/ratpack/BlockWrapper.java → ...instrumentation/ratpack/BlockWrapper.java
diff --git a/.../ratpack/ContinuationInstrumentation.java → .../ratpack/ContinuationInstrumentation.java b/.../ratpack/ContinuationInstrumentation.java → .../ratpack/ContinuationInstrumentation.java
diff --git a/...ck/DefaultExecStarterInstrumentation.java → ...ck/DefaultExecStarterInstrumentation.java b/...ck/DefaultExecStarterInstrumentation.java → ...ck/DefaultExecStarterInstrumentation.java
diff --git a/...pack/DefaultExecutionInstrumentation.java → ...pack/DefaultExecutionInstrumentation.java b/...pack/DefaultExecutionInstrumentation.java → ...pack/DefaultExecutionInstrumentation.java
diff --git a/...atpack/RatpackIgnoredTypesConfigurer.java → ...atpack/RatpackIgnoredTypesConfigurer.java b/...atpack/RatpackIgnoredTypesConfigurer.java → ...atpack/RatpackIgnoredTypesConfigurer.java
diff --git a/...ratpack/RatpackInstrumentationModule.java → ...ratpack/RatpackInstrumentationModule.java b/...ratpack/RatpackInstrumentationModule.java → ...ratpack/RatpackInstrumentationModule.java
diff --git a/...umentation/ratpack/RatpackSingletons.java → ...umentation/ratpack/RatpackSingletons.java b/...umentation/ratpack/RatpackSingletons.java → ...umentation/ratpack/RatpackSingletons.java
diff --git a/...ck/ServerErrorHandlerInstrumentation.java → ...ck/ServerErrorHandlerInstrumentation.java b/...ck/ServerErrorHandlerInstrumentation.java → ...ck/ServerErrorHandlerInstrumentation.java
diff --git a/...atpack/ServerRegistryInstrumentation.java → ...atpack/ServerRegistryInstrumentation.java b/...atpack/ServerRegistryInstrumentation.java → ...atpack/ServerRegistryInstrumentation.java
diff --git a/...strumentation/ratpack/TracingHandler.java → ...strumentation/ratpack/TracingHandler.java b/...strumentation/ratpack/TracingHandler.java → ...strumentation/ratpack/TracingHandler.java
diff --git a/.../server/RatpackAsyncHttpServerTest.groovy → .../server/RatpackAsyncHttpServerTest.groovy b/.../server/RatpackAsyncHttpServerTest.groovy → .../server/RatpackAsyncHttpServerTest.groovy
diff --git a/...server/RatpackForkedHttpServerTest.groovy → ...server/RatpackForkedHttpServerTest.groovy b/...server/RatpackForkedHttpServerTest.groovy → ...server/RatpackForkedHttpServerTest.groovy
diff --git a/...roovy/server/RatpackHttpServerTest.groovy → ...roovy/server/RatpackHttpServerTest.groovy b/...roovy/server/RatpackHttpServerTest.groovy → ...roovy/server/RatpackHttpServerTest.groovy
diff --git a/...st/groovy/server/RatpackRoutesTest.groovy → ...st/groovy/server/RatpackRoutesTest.groovy b/...st/groovy/server/RatpackRoutesTest.groovy → ...st/groovy/server/RatpackRoutesTest.groovy
diff --git a/.../ratpack/RatpackForkedHttpClientTest.java → .../ratpack/RatpackForkedHttpClientTest.java b/.../ratpack/RatpackForkedHttpClientTest.java → .../ratpack/RatpackForkedHttpClientTest.java
diff --git a/...tation/ratpack/RatpackHttpClientTest.java → ...tation/ratpack/RatpackHttpClientTest.java b/...tation/ratpack/RatpackHttpClientTest.java → ...tation/ratpack/RatpackHttpClientTest.java
diff --git a/.../ratpack/RatpackPooledHttpClientTest.java → .../ratpack/RatpackPooledHttpClientTest.java b/.../ratpack/RatpackPooledHttpClientTest.java → .../ratpack/RatpackPooledHttpClientTest.java
diff --git a/instrumentation/ratpack-1.7/library/build.gradle.kts 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.7: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/...ratpack/OpenTelemetryExecInterceptor.java → ...ratpack/OpenTelemetryExecInterceptor.java b/...ratpack/OpenTelemetryExecInterceptor.java → ...ratpack/OpenTelemetryExecInterceptor.java
diff --git a/...ck/OpenTelemetryFallbackErrorHandler.java → ...ck/OpenTelemetryFallbackErrorHandler.java b/...ck/OpenTelemetryFallbackErrorHandler.java → ...ck/OpenTelemetryFallbackErrorHandler.java
diff --git a/...pack/OpenTelemetryServerErrorHandler.java → ...pack/OpenTelemetryServerErrorHandler.java b/...pack/OpenTelemetryServerErrorHandler.java → ...pack/OpenTelemetryServerErrorHandler.java
diff --git a/...n/ratpack/OpenTelemetryServerHandler.java → ...n/ratpack/OpenTelemetryServerHandler.java b/...n/ratpack/OpenTelemetryServerHandler.java → ...n/ratpack/OpenTelemetryServerHandler.java
diff --git a/...nstrumentation/ratpack/RatpackGetter.java → ...nstrumentation/ratpack/RatpackGetter.java b/...nstrumentation/ratpack/RatpackGetter.java → ...nstrumentation/ratpack/RatpackGetter.java
diff --git a/...tpack/RatpackHttpAttributesExtractor.java → ...tpack/RatpackHttpAttributesExtractor.java b/...tpack/RatpackHttpAttributesExtractor.java → ...tpack/RatpackHttpAttributesExtractor.java
diff --git a/...strumentation/ratpack/RatpackTracing.java → ...strumentation/ratpack/RatpackTracing.java b/...strumentation/ratpack/RatpackTracing.java → ...strumentation/ratpack/RatpackTracing.java
diff --git a/...tation/ratpack/RatpackTracingBuilder.java → ...tation/ratpack/RatpackTracingBuilder.java b/...tation/ratpack/RatpackTracingBuilder.java → ...tation/ratpack/RatpackTracingBuilder.java
diff --git a/...ternal/RatpackNetAttributesExtractor.java → ...ternal/RatpackNetAttributesExtractor.java b/...ternal/RatpackNetAttributesExtractor.java → ...ternal/RatpackNetAttributesExtractor.java
diff --git a/...tion/ratpack/RatpackFunctionalTest.groovy → ...tion/ratpack/RatpackFunctionalTest.groovy b/...tion/ratpack/RatpackFunctionalTest.groovy → ...tion/ratpack/RatpackFunctionalTest.groovy
diff --git a/.../server/RatpackAsyncHttpServerTest.groovy → .../server/RatpackAsyncHttpServerTest.groovy b/.../server/RatpackAsyncHttpServerTest.groovy → .../server/RatpackAsyncHttpServerTest.groovy
diff --git a/...server/RatpackForkedHttpServerTest.groovy → ...server/RatpackForkedHttpServerTest.groovy b/...server/RatpackForkedHttpServerTest.groovy → ...server/RatpackForkedHttpServerTest.groovy
diff --git a/...tpack/server/RatpackHttpServerTest.groovy → ...tpack/server/RatpackHttpServerTest.groovy b/...tpack/server/RatpackHttpServerTest.groovy → ...tpack/server/RatpackHttpServerTest.groovy
diff --git a/...n/ratpack/server/RatpackRoutesTest.groovy → ...n/ratpack/server/RatpackRoutesTest.groovy b/...n/ratpack/server/RatpackRoutesTest.groovy → ...n/ratpack/server/RatpackRoutesTest.groovy
diff --git a/...erver/RatpackServerApplicationTest.groovy → ...erver/RatpackServerApplicationTest.groovy b/...erver/RatpackServerApplicationTest.groovy → ...erver/RatpackServerApplicationTest.groovy
diff --git a/...n/ratpack/server/RatpackServerTest.groovy → ...n/ratpack/server/RatpackServerTest.groovy b/...n/ratpack/server/RatpackServerTest.groovy → ...n/ratpack/server/RatpackServerTest.groovy
diff --git a/...tion/ratpack-1.4/testing/build.gradle.kts → ...tion/ratpack-1.7/testing/build.gradle.kts b/...tion/ratpack-1.4/testing/build.gradle.kts → ...tion/ratpack-1.7/testing/build.gradle.kts
@@ -7,8 +7,8 @@ dependencies {
 
   // it's important for these to not be api dependencies, because api dependencies pull in their
   // transitive dependencies as well, which causes issues for testLatestDep
-  implementation("io.ratpack:ratpack-core:1.4.0")
-  implementation("io.ratpack:ratpack-test:1.4.0")
+  implementation("io.ratpack:ratpack-core:1.7.0")
+  implementation("io.ratpack:ratpack-test:1.7.0")
 
   implementation("org.codehaus.groovy:groovy-all")
   implementation("io.opentelemetry:opentelemetry-api")

diff --git a/...AbstractRatpackAsyncHttpServerTest.groovy → ...AbstractRatpackAsyncHttpServerTest.groovy b/...AbstractRatpackAsyncHttpServerTest.groovy → ...AbstractRatpackAsyncHttpServerTest.groovy
diff --git a/...bstractRatpackForkedHttpServerTest.groovy → ...bstractRatpackForkedHttpServerTest.groovy b/...bstractRatpackForkedHttpServerTest.groovy → ...bstractRatpackForkedHttpServerTest.groovy
diff --git a/...rver/AbstractRatpackHttpServerTest.groovy → ...rver/AbstractRatpackHttpServerTest.groovy b/...rver/AbstractRatpackHttpServerTest.groovy → ...rver/AbstractRatpackHttpServerTest.groovy
diff --git a/...k/server/AbstractRatpackRoutesTest.groovy → ...k/server/AbstractRatpackRoutesTest.groovy b/...k/server/AbstractRatpackRoutesTest.groovy → ...k/server/AbstractRatpackRoutesTest.groovy
diff --git a/.../AbstractRatpackForkedHttpClientTest.java → .../AbstractRatpackForkedHttpClientTest.java b/.../AbstractRatpackForkedHttpClientTest.java → .../AbstractRatpackForkedHttpClientTest.java
diff --git a/...client/AbstractRatpackHttpClientTest.java → ...client/AbstractRatpackHttpClientTest.java b/...client/AbstractRatpackHttpClientTest.java → ...client/AbstractRatpackHttpClientTest.java
diff --git a/.../AbstractRatpackPooledHttpClientTest.java → .../AbstractRatpackPooledHttpClientTest.java b/.../AbstractRatpackPooledHttpClientTest.java → .../AbstractRatpackPooledHttpClientTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -305,9 +305,9 @@ include(":instrumentation:quartz-2.0:javaagent")
 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:javaagent")
+include(":instrumentation:ratpack-1.7:library")
+include(":instrumentation:ratpack-1.7:testing")
 include(":instrumentation:reactor-3.1:javaagent")
 include(":instrumentation:reactor-3.1:library")
 include(":instrumentation:reactor-3.1:testing")