From 582c0af962f62d3fa418cf69d40518375ec492e1 Mon Sep 17 00:00:00 2001 From: Jon Mort Date: Wed, 4 Apr 2018 17:25:00 +0100 Subject: [PATCH] Rename to Ratpack 1.4 --- .../ratpack.gradle => ratpack-1.4/ratpack-1.4.gradle} | 6 +++--- .../ratpack/RatapckInstrumentationUtils.java | 0 .../ratpack/RatpackHttpClientInstrumentation.java | 0 .../instrumentation/ratpack/RatpackInstrumentation.java | 0 .../ratpack/RatpackRequestExtractAdapter.java | 0 .../trace/instrumentation/ratpack/RatpackScopeManager.java | 0 .../instrumentation/ratpack/RequestSpecInjectAdapter.java | 0 .../trace/instrumentation/ratpack/TracingHandler.java | 0 .../trace/instrumentation/ratpack/WrappedRequestSpec.java | 0 .../src/test/groovy/RatpackTest.groovy | 0 settings.gradle | 2 +- 11 files changed, 4 insertions(+), 4 deletions(-) rename dd-java-agent/instrumentation/{ratpack/ratpack.gradle => ratpack-1.4/ratpack-1.4.gradle} (96%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/RatapckInstrumentationUtils.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/RatpackScopeManager.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/RequestSpecInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/main/java/datadog/trace/instrumentation/ratpack/WrappedRequestSpec.java (100%) rename dd-java-agent/instrumentation/{ratpack => ratpack-1.4}/src/test/groovy/RatpackTest.groovy (100%) diff --git a/dd-java-agent/instrumentation/ratpack/ratpack.gradle b/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle similarity index 96% rename from dd-java-agent/instrumentation/ratpack/ratpack.gradle rename to dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle index 7d078fde88..e41579acc5 100644 --- a/dd-java-agent/instrumentation/ratpack/ratpack.gradle +++ b/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle @@ -3,7 +3,7 @@ apply plugin: 'version-scan' versionScan { group = "io.ratpack" module = 'ratpack' - versions = "[1.4.6,)" + versions = "[1.4.0,)" verifyPresent = [ "ratpack.exec.ExecStarter" : null, "ratpack.exec.Execution" : null, @@ -31,7 +31,7 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8) { } dependencies { - compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.4.6' + compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.4.0' compile project(':dd-trace-ot') compile project(':dd-java-agent:agent-tooling') @@ -41,7 +41,7 @@ dependencies { compile deps.autoservice testCompile project(':dd-java-agent:testing') - testCompile group: 'io.ratpack', name: 'ratpack-test', version: '1.4.6' + testCompile group: 'io.ratpack', name: 'ratpack-test', version: '1.4.0' testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' } diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatapckInstrumentationUtils.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatapckInstrumentationUtils.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatapckInstrumentationUtils.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatapckInstrumentationUtils.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackInstrumentation.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestExtractAdapter.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestExtractAdapter.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestExtractAdapter.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackScopeManager.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackScopeManager.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RatpackScopeManager.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackScopeManager.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RequestSpecInjectAdapter.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RequestSpecInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/RequestSpecInjectAdapter.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RequestSpecInjectAdapter.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java diff --git a/dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/WrappedRequestSpec.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/WrappedRequestSpec.java similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/main/java/datadog/trace/instrumentation/ratpack/WrappedRequestSpec.java rename to dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/WrappedRequestSpec.java diff --git a/dd-java-agent/instrumentation/ratpack/src/test/groovy/RatpackTest.groovy b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/ratpack/src/test/groovy/RatpackTest.groovy rename to dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackTest.groovy diff --git a/settings.gradle b/settings.gradle index 45e184c872..9ad0a72bdc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,7 +34,7 @@ include ':dd-java-agent:instrumentation:play-2.4:play-2.6-testing' include ':dd-java-agent:instrumentation:servlet-2' include ':dd-java-agent:instrumentation:servlet-3' include ':dd-java-agent:instrumentation:spring-web' -include ':dd-java-agent:instrumentation:ratpack' +include ':dd-java-agent:instrumentation:ratpack-1.4' include ':dd-java-agent:instrumentation:trace-annotation' // benchmark