Skip to content

Commit dae1725

Browse files
authored
Remove jaxrs-client-1.1 instrumentation (#9213)
1 parent ea11c85 commit dae1725

File tree

9 files changed

+16
-262
lines changed

9 files changed

+16
-262
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
plugins {
2+
id("otel.javaagent-instrumentation")
3+
}
4+
5+
dependencies {
6+
testLibrary("com.sun.jersey:jersey-client:1.1.4")
7+
8+
testInstrumentation(project(":instrumentation:http-url-connection:javaagent"))
9+
}

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
import com.sun.jersey.api.client.Client
7+
import com.sun.jersey.api.client.ClientHandlerException
78
import com.sun.jersey.api.client.ClientResponse
89
import com.sun.jersey.api.client.WebResource
910
import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter
@@ -58,7 +59,11 @@ class JaxRsClientV1Test extends HttpClientTest<WebResource.Builder> implements A
5859
@Override
5960
int sendRequest(WebResource.Builder resource, String method, URI uri, Map<String, String> headers) {
6061
def body = BODY_METHODS.contains(method) ? "" : null
61-
return resource.method(method, ClientResponse, body).status
62+
try {
63+
return resource.method(method, ClientResponse, body).status
64+
} catch (ClientHandlerException exception) {
65+
throw exception.getCause()
66+
}
6267
}
6368

6469
@Override

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/build.gradle.kts

-18
This file was deleted.

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/ClientHandlerInstrumentation.java

-76
This file was deleted.

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/ClientRequestHeaderSetter.java

-18
This file was deleted.

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java

-66
This file was deleted.

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientInstrumentationModule.java

-26
This file was deleted.

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientSingletons.java

-56
This file was deleted.

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ include(":instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-common:javaagent")
285285
include(":instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-common:testing")
286286
include(":instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-jersey-3.0:javaagent")
287287
include(":instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-resteasy-6.0:javaagent")
288-
include(":instrumentation:jaxrs-client:jaxrs-client-1.1:javaagent")
288+
include(":instrumentation:jaxrs-client:jaxrs-client-1.1-testing")
289289
include(":instrumentation:jaxrs-client:jaxrs-client-2.0-testing")
290290
include(":instrumentation:jaxws:jaxws-2.0:javaagent")
291291
include(":instrumentation:jaxws:jaxws-2.0-arquillian-testing")

0 commit comments

Comments
 (0)