Normalize JAX-RS 2.0 annotation and common javaagent packages#18748
Merged
trask merged 1 commit intoMay 16, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Aligns JAX-RS 2.0 javaagent package structure by separating shared “common” helpers and JAX-RS-annotations instrumentation into clearer, normalized packages (part of the broader package/module alignment in #18428).
Changes:
- Moved shared JAX-RS 2.0 helper types into
io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.commonand updated downstream imports. - Moved JAX-RS 2.0 annotations instrumentation (and its tests) into
io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations. - Updated instrumentation classes across RESTEasy/Jersey/CXF and annotations modules to reference the new package locations.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/v3_1/Resteasy31RequestContextInstrumentation.java | Updates imports to use the new v2_0.common shared helpers. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/v3_0/Resteasy30RequestContextInstrumentation.java | Updates imports to use the new v2_0.common shared helpers. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/jersey/v2_0/JerseyRequestContextInstrumentation.java | Updates imports to use the new v2_0.common shared helpers. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/cxf/v3_2/CxfRequestContextInstrumentation.java | Updates imports to use the new v2_0.common shared helpers. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/common/Jaxrs2RequestContextHelper.java | Changes package declaration to v2_0.common. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/common/Jaxrs2HandlerData.java | Changes package declaration to v2_0.common. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/common/AbstractRequestContextInstrumentation.java | Changes package declaration to v2_0.common. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxRs2AnnotationsInstrumentationTest.java | Moves test package to v2_0.annotations and updates nested-type import. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JavaInterfaces.java | Moves test helper package to v2_0.annotations. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAsyncResponseInstrumentation.java | Moves instrumentation package to v2_0.annotations and updates singleton static imports. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAnnotationsSingletons.java | Moves singleton holder package to v2_0.annotations. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAnnotationsInstrumentationModule.java | Moves module class package to v2_0.annotations. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAnnotationsInstrumentation.java | Moves instrumentation package to v2_0.annotations and imports Jaxrs2HandlerData from v2_0.common. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/DefaultRequestContextInstrumentation.java | Moves default request-context instrumentation into v2_0.annotations and imports common base/data types. |
| instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/ContainerRequestFilterInstrumentation.java | Moves filter instrumentation into v2_0.annotations. |
trask
force-pushed
the
package-name-cleanup-jaxrs-2-common-annotations
branch
2 times, most recently
from
3346168 to
101e1b6
Compare
steverao
approved these changes
May 16, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of