open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1056 from DataDog/tyler/fix-jaxrsclient-version 

Fix jax-rs-client minimum supported version
This commit is contained in:
Tyler Benson 2019-10-23 14:02:26 -07:00
parent 29f7288954 7db4602253
commit 08ca0faeb7
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dd-java-agent/instrumentation/jax-rs-client-1.9/jax-rs-client-1.9.gradle → dd-java-agent/instrumentation/jax-rs-client-1.1/jax-rs-client-1.1.gradle
View File

@ -2,13 +2,7 @@ muzzle {
pass { pass {
group = "com.sun.jersey" group = "com.sun.jersey"
module = "jersey-client" module = "jersey-client"
versions = "[1.9,)" versions = "[,]"
// We can't assert inverse because 1.1.5.2 was a weird release that also works.
}
fail {
group = "com.sun.jersey"
module = "jersey-client"
versions = "[1.2,1.9)"
} }
} }
@ -23,9 +17,9 @@ testSets {
} }
dependencies { dependencies {
compileOnly group: 'com.sun.jersey', name: 'jersey-client', version: '1.9' compileOnly group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
testCompile group: 'com.sun.jersey', name: 'jersey-client', version: '1.9' testCompile group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
latestDepTestCompile group: 'com.sun.jersey', name: 'jersey-client', version: '+' latestDepTestCompile group: 'com.sun.jersey', name: 'jersey-client', version: '+'
} }

0
dd-java-agent/instrumentation/jax-rs-client-1.9/src/main/java/datadog/trace/instrumentation/jaxrs/v1/InjectAdapter.java → dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/InjectAdapter.java
View File

0
dd-java-agent/instrumentation/jax-rs-client-1.9/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java → dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java
View File

0
dd-java-agent/instrumentation/jax-rs-client-1.9/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java → dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java
View File

2
dd-java-agent/instrumentation/jax-rs-client-1.9/src/test/groovy/JaxRsClientV1Test.groovy → dd-java-agent/instrumentation/jax-rs-client-1.1/src/test/groovy/JaxRsClientV1Test.groovy
View File

@ -1,6 +1,5 @@
import com.sun.jersey.api.client.Client import com.sun.jersey.api.client.Client
import com.sun.jersey.api.client.ClientResponse import com.sun.jersey.api.client.ClientResponse
import com.sun.jersey.api.client.filter.CsrfProtectionFilter
import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter
import com.sun.jersey.api.client.filter.LoggingFilter import com.sun.jersey.api.client.filter.LoggingFilter
import datadog.trace.agent.test.base.HttpClientTest import datadog.trace.agent.test.base.HttpClientTest
@ -16,7 +15,6 @@ class JaxRsClientV1Test extends HttpClientTest<JaxRsClientV1Decorator> {
// Add filters to ensure spans aren't duplicated. // Add filters to ensure spans aren't duplicated.
client.addFilter(new LoggingFilter()) client.addFilter(new LoggingFilter())
client.addFilter(new GZIPContentEncodingFilter()) client.addFilter(new GZIPContentEncodingFilter())
client.addFilter(new CsrfProtectionFilter())
} }
@Override @Override

2
settings.gradle
View File

@ -53,7 +53,7 @@ include ':dd-java-agent:instrumentation:http-url-connection'
include ':dd-java-agent:instrumentation:hystrix-1.4' include ':dd-java-agent:instrumentation:hystrix-1.4'
include ':dd-java-agent:instrumentation:jax-rs-annotations-1' include ':dd-java-agent:instrumentation:jax-rs-annotations-1'
include ':dd-java-agent:instrumentation:jax-rs-annotations-2' include ':dd-java-agent:instrumentation:jax-rs-annotations-2'
include ':dd-java-agent:instrumentation:jax-rs-client-1.9' include ':dd-java-agent:instrumentation:jax-rs-client-1.1'
include ':dd-java-agent:instrumentation:jax-rs-client-2.0' include ':dd-java-agent:instrumentation:jax-rs-client-2.0'
include ':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-jersey' include ':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-jersey'
include ':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy' include ':dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy'