Skip to content

Rename JAX-WS 2.0 javaagent modules to spec-scoped names and hierarchical packages#18184

Merged
trask merged 13 commits into
mainfrom
copilot/rename-jaxws-modules
Apr 30, 2026
Merged

Rename JAX-WS 2.0 javaagent modules to spec-scoped names and hierarchical packages#18184
trask merged 13 commits into
mainfrom
copilot/rename-jaxws-modules

Conversation

Copilot AI commented Apr 22, 2026

Copy link
Copy Markdown
Contributor
  • Module renames

    • jaxws-cxf-3.0jaxws-2.0-cxf-3.0
    • jaxws-metro-2.2jaxws-2.0-metro-2.2
  • Package layout normalization

    • Moved CXF sources/tests from io.opentelemetry.javaagent.instrumentation.cxf to io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.cxf.v3_0
    • Moved Metro sources/tests from io.opentelemetry.javaagent.instrumentation.metro to io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2

Handles backcompat for the module name change.

@otelbot-java-instrumentation otelbot-java-instrumentation Bot added the test native This label can be applied to PRs to trigger them to run native tests label Apr 22, 2026
@trask trask force-pushed the copilot/rename-jaxws-modules branch 2 times, most recently from 29ca9b0 to 285a4ed Compare April 24, 2026 20:24
@laurit

laurit commented Apr 29, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Apr 29, 2026

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Conflicts are already resolved on this branch in 2f75401.

Copilot AI requested a review from laurit April 29, 2026 13:20
@trask trask force-pushed the copilot/rename-jaxws-modules branch 3 times, most recently from deb071b to 9f71038 Compare April 29, 2026 23:16
@trask trask force-pushed the copilot/rename-jaxws-modules branch from 9f71038 to d6d7589 Compare April 29, 2026 23:17

public CxfInstrumentationModule() {
super("cxf", "cxf-3.0", "jaxws");
super("cxf", expandDeprecatedNames("jaxws-2.0-cxf-3.0|deprecated:jaxws-cxf-3.0", "jaxws"));

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the interesting part of this PR... (backcompat)

@trask trask marked this pull request as ready for review April 29, 2026 23:39
@trask trask requested a review from a team as a code owner April 29, 2026 23:39
…s-modules

# Conflicts:
#	instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent-unit-tests/build.gradle.kts
@trask trask enabled auto-merge (squash) April 30, 2026 20:31
@trask trask merged commit 5ef2fa1 into main Apr 30, 2026
95 checks passed
@trask trask deleted the copilot/rename-jaxws-modules branch April 30, 2026 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

test native This label can be applied to PRs to trigger them to run native tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants