From 3c4a6b545c615fd723b00cf230c4df83309b5f65 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 28 Apr 2020 13:42:16 -0700 Subject: [PATCH] Fix Ratpack instrumentation for newer versions of Guava. (#360) Ratpack 1.4 should still work if you increase your guava version to 20+ (instead of 19). Co-authored-by: Tyler Benson --- .../ratpack-1.5.gradle} | 14 +++++--------- .../ratpack/ContinuationInstrumentation.java | 6 +++++- .../ratpack/DefaultExecutionInstrumentation.java | 6 +++++- .../ratpack/ServerErrorHandlerInstrumentation.java | 0 .../ratpack/ServerRegistryInstrumentation.java | 0 .../instrumentation/ratpack/ActionWrapper.java | 0 .../auto/instrumentation/ratpack/BlockWrapper.java | 0 .../ratpack/ErrorHandlerAdvice.java | 0 .../ratpack/RatpackServerDecorator.java | 2 +- .../ratpack/ServerRegistryAdvice.java | 0 .../instrumentation/ratpack/TracingHandler.java | 0 .../src/test/groovy/RatpackOtherTest.groovy | 0 .../client/RatpackForkedHttpClientTest.groovy | 0 .../groovy/client/RatpackHttpClientTest.groovy | 0 .../server/NettyServerTestInstrumentation.java | 0 .../server/RatpackAsyncHttpServerTest.groovy | 0 .../server/RatpackForkedHttpServerTest.groovy | 0 .../groovy/server/RatpackHttpServerTest.groovy | 0 settings.gradle | 2 +- 19 files changed, 17 insertions(+), 13 deletions(-) rename instrumentation/{ratpack-1.4/ratpack-1.4.gradle => ratpack-1.5/ratpack-1.5.gradle} (73%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java (92%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java (92%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryInstrumentation.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java (98%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/RatpackOtherTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/client/RatpackForkedHttpClientTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/client/RatpackHttpClientTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/server/NettyServerTestInstrumentation.java (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/server/RatpackAsyncHttpServerTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/server/RatpackForkedHttpServerTest.groovy (100%) rename instrumentation/{ratpack-1.4 => ratpack-1.5}/src/test/groovy/server/RatpackHttpServerTest.groovy (100%) diff --git a/instrumentation/ratpack-1.4/ratpack-1.4.gradle b/instrumentation/ratpack-1.5/ratpack-1.5.gradle similarity index 73% rename from instrumentation/ratpack-1.4/ratpack-1.4.gradle rename to instrumentation/ratpack-1.5/ratpack-1.5.gradle index c669a26494..f9adf743af 100644 --- a/instrumentation/ratpack-1.4/ratpack-1.4.gradle +++ b/instrumentation/ratpack-1.5/ratpack-1.5.gradle @@ -11,13 +11,9 @@ muzzle { pass { group = "io.ratpack" module = 'ratpack-core' - versions = "[1.4.0,)" - } - // Some maven dependencies are missing for pre 1.0 ratpack, so we can't assertInverse. - fail { - group = "io.ratpack" - module = 'ratpack-core' - versions = "[1.0,1.4.0)" + versions = "[1.5.0,)" + skipVersions += ["0.9.12", "0.9.13", "0.9.14",] + assertInverse = true } } @@ -28,9 +24,9 @@ testSets { } dependencies { - main_java8CompileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.4.0' + main_java8CompileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.5.0' testCompile project(':instrumentation:netty:netty-4.1') - testCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.0' + testCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0' latestDepTestCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+' } diff --git a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java similarity index 92% rename from instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java index fbbf54f6fc..6c79174d57 100644 --- a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java +++ b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ContinuationInstrumentation.java @@ -23,6 +23,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import com.google.common.net.HostAndPort; import io.opentelemetry.auto.tooling.Instrumenter; import java.util.Map; import net.bytebuddy.asm.Advice; @@ -70,9 +71,12 @@ public final class ContinuationInstrumentation extends Instrumenter.Default { block = BlockWrapper.wrapIfNeeded(block); } - public void muzzleCheck(final PathBinding binding) { + public void muzzleCheck(final PathBinding binding, final HostAndPort host) { // This was added in 1.4. Added here to ensure consistency with other instrumentation. binding.getDescription(); + + // This is available in Guava 20 which was required starting in 1.5 + host.getHost(); } } } diff --git a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java similarity index 92% rename from instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java index fa2a8f9770..3fe5ed16de 100644 --- a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java +++ b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/DefaultExecutionInstrumentation.java @@ -21,6 +21,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import com.google.common.net.HostAndPort; import io.opentelemetry.auto.tooling.Instrumenter; import java.util.Map; import net.bytebuddy.asm.Advice; @@ -67,9 +68,12 @@ public final class DefaultExecutionInstrumentation extends Instrumenter.Default segment = ActionWrapper.wrapIfNeeded(segment); } - public void muzzleCheck(final PathBinding binding) { + public void muzzleCheck(final PathBinding binding, final HostAndPort host) { // This was added in 1.4. Added here to ensure consistency with other instrumentation. binding.getDescription(); + + // This is available in Guava 20 which was required starting in 1.5 + host.getHost(); } } } diff --git a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java similarity index 100% rename from instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java diff --git a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryInstrumentation.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryInstrumentation.java similarity index 100% rename from instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryInstrumentation.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryInstrumentation.java diff --git a/instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java similarity index 100% rename from instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java rename to instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java diff --git a/instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java similarity index 100% rename from instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java rename to instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java diff --git a/instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java similarity index 100% rename from instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java rename to instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java diff --git a/instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java similarity index 98% rename from instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java rename to instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java index 297622d930..a98dfa8a0c 100644 --- a/instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java +++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java @@ -54,7 +54,7 @@ public class RatpackServerDecorator extends HttpServerDecorator