Skip to content

Commit ebe4c65

Browse files
jsalinaspolojsalinaspolo
authored
Bump ratpack to 1.7 (#4796)
1 parent b4784c8 commit ebe4c65

19 files changed

+18
-39
lines changed

‎instrumentation/ratpack-1.4/library/build.gradle.kts

-38
This file was deleted.

‎instrumentation/ratpack-1.7/library/build.gradle.kts

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
plugins {
2+
id("otel.library-instrumentation")
3+
id("otel.nullaway-conventions")
4+
}
5+
6+
dependencies {
7+
library("io.ratpack:ratpack-core:1.7.0")
8+
9+
testImplementation(project(":instrumentation:ratpack-1.4:testing"))
10+
11+
testLibrary("io.ratpack:ratpack-test:1.7.0")
12+
testLibrary("io.ratpack:ratpack-guice:1.7.0")
13+
14+
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
15+
testImplementation("com.sun.activation:jakarta.activation:1.2.2")
16+
}
17+
}

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryExecInterceptor.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryFallbackErrorHandler.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerErrorHandler.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/OpenTelemetryServerHandler.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackGetter.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesExtractor.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracing.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java ‎instrumentation/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetAttributesExtractor.java

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/RatpackFunctionalTest.groovy

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackAsyncHttpServerTest.groovy

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackForkedHttpServerTest.groovy

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackHttpServerTest.groovy

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackRoutesTest.groovy

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerApplicationTest.groovy

File renamed without changes.

‎instrumentation/ratpack-1.4/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy ‎instrumentation/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/server/RatpackServerTest.groovy

File renamed without changes.

‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ include(":instrumentation:quartz-2.0:library")
309309
include(":instrumentation:quartz-2.0:testing")
310310
include(":instrumentation:rabbitmq-2.7:javaagent")
311311
include(":instrumentation:ratpack-1.4:javaagent")
312-
include(":instrumentation:ratpack-1.4:library")
313312
include(":instrumentation:ratpack-1.4:testing")
313+
include(":instrumentation:ratpack-1.7:library")
314314
include(":instrumentation:reactor-3.1:javaagent")
315315
include(":instrumentation:reactor-3.1:library")
316316
include(":instrumentation:reactor-3.1:testing")

0 commit comments

Comments
 (0)