Skip to content

Rename remaining javaagent instrumentation packages to versioned paths#18180

Merged
trask merged 15 commits into
mainfrom
copilot/rename-javaagent-instrumentation-packages
Apr 29, 2026
Merged

Rename remaining javaagent instrumentation packages to versioned paths#18180
trask merged 15 commits into
mainfrom
copilot/rename-javaagent-instrumentation-packages

Conversation

Copilot AI commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

Several javaagent modules still used unversioned or inconsistent package paths relative to their module version. This PR moves those packages to version-scoped paths within their owning modules and updates every repository reference that embeds the old names.

  • Renamed package roots

    • akka-http-10.0io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0
    • camel-2.20io.opentelemetry.javaagent.instrumentation.camel.v2_20
    • kotlinx-coroutines-1.0io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0
    • opentelemetry-extension-annotations-1.0io.opentelemetry.javaagent.instrumentation.extensionannotations.v1_0
    • opentelemetry-extension-kotlin-1.0io.opentelemetry.javaagent.instrumentation.extensionkotlin.v1_0
    • opentelemetry-instrumentation-annotations-1.16io.opentelemetry.javaagent.instrumentation.instrumentationannotations.v1_16
    • play-mvc-2.4io.opentelemetry.javaagent.instrumentation.playmvc.v2_4
    • play-mvc-2.6io.opentelemetry.javaagent.instrumentation.playmvc.v2_6
  • Directory moves

    • Moves were done with git mv inside each module so package layout matches the new namespace.
    • Nested subpackages moved with the versioned root in one pass, e.g. Akka client, server, and server.route, Camel decorators, and coroutines instrumentationannotations.
  • Repository-wide reference updates

    • Updated package, import, and FQCN references across Java, Kotlin, Scala, Groovy, resources, service descriptors, properties/yaml, and docs.
    • This includes places that embed slash-based package paths in resource files and generated/package-check inputs.
  • Collision cleanup

    • Applied the kotlinx-coroutines-1.0 rename before opentelemetry-instrumentation-annotations-1.16 so the top-level instrumentationannotations package became unambiguous.
    • Also moved the remaining coroutines test package path under v1_0 to keep the module fully aligned.
// before
package io.opentelemetry.javaagent.instrumentation.akkahttp.client;

// after
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;

Copilot AI and others added 9 commits April 22, 2026 19:46
@trask

trask commented Apr 22, 2026

Copy link
Copy Markdown
Member

@copilot fix CI

trask added 2 commits April 22, 2026 14:07
Commit 93ff118 updated the package declarations for the flow-1.3
javaagent sources and its test to 'kotlinxcoroutines.v1_0.flow' but did
not move the files to the matching directory, causing Error Prone's
PackageLocation check to fail and breaking compileJava (and every
downstream CI job).
@trask trask marked this pull request as ready for review April 23, 2026 18:48
@trask trask requested a review from a team as a code owner April 23, 2026 18:48
@laurit

laurit commented Apr 29, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

…rename-javaagent-instrumentation-packages

Co-authored-by: laurit <1997823+laurit@users.noreply.github.com>

Copilot AI commented Apr 29, 2026

Copy link
Copy Markdown
Contributor Author

@copilot fix CI

Fixed by 88648b8. I checked the failing CI logs and the stale WithSpanSingletons import in WithSpanInstrumentation was the breakage; the branch now passes the targeted package-name check and affected module compiles.

@copilot resolve the merge conflicts in this pull request

Resolved in 2b59933 by merging the latest main into this branch. The branch is clean and the targeted package-name/compile validation passed afterwards.

Copilot AI requested a review from laurit April 29, 2026 13:20
@trask trask enabled auto-merge (squash) April 29, 2026 13:51
@trask trask merged commit fa9bb9e into main Apr 29, 2026
94 checks passed
@trask trask deleted the copilot/rename-javaagent-instrumentation-packages branch April 29, 2026 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants