Skip to content

Normalize small javaagent package abbreviations - #18721

Merged
trask merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-small-abbreviations
May 13, 2026
Merged

trask merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-small-abbreviations

Conversation

@trask

@trask trask commented May 13, 2026 •

Copy link
Copy Markdown
Member

@trask
trask force-pushed the package-name-cleanup-small-abbreviations branch from aa93ef7 to 7ef6b22 Compare May 13, 2026 03:20
@trask
trask marked this pull request as ready for review May 13, 2026 03:41
@trask
trask requested a review from a team as a code owner May 13, 2026 03:41
Copilot AI review requested due to automatic review settings May 13, 2026 03:41

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR normalizes javaagent package naming by replacing a few abbreviated / legacy package names with versioned, path-aligned packages, supporting the broader package/module alignment effort referenced in #18428.

Changes:

  • Renamed Scala fork-join 2.8 javaagent (and test) packages from the legacy scalaexecutors namespace to scala.fork.join.v2_8.
  • Renamed Liberty dispatcher 20.0 javaagent packages to include the version segment dispatcher.v20_0.
  • Renamed Kotlinx coroutines flow 1.3 javaagent (and test / kotlin helper) packages from kotlinxcoroutines.v1_0.flow-style to kotlinx.coroutines.flow.v1_3.

Reviewed changes

Copilot reviewed 20 out of 20 changed files in this pull request and generated no comments.

Show a summary per file
File Description
instrumentation/scala-fork-join-2.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/ForkJoinPoolBridge.scala Updates test package to match the directory/versioned namespace.
instrumentation/scala-fork-join-2.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/ExecutorInstrumentationTest.scala Updates test package and adjusts the self-import to the new package.
instrumentation/scala-fork-join-2.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/AsyncChild.scala Updates test package to the versioned scala fork-join namespace.
instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/VirtualFields.java Moves VirtualFields into the new versioned scala fork-join package.
instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/ScalaForkJoinTaskInstrumentation.java Updates package and static imports to reference the relocated VirtualFields.
instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/ScalaForkJoinPoolInstrumentation.java Updates package and VirtualFields static import to the new namespace.
instrumentation/scala-fork-join-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/scala/fork/join/v2_8/ScalaConcurrentInstrumentationModule.java Updates module class package to the versioned scala fork-join namespace.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyResponse.java Aligns Liberty dispatcher package with the versioned folder path.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyRequest.java Aligns Liberty dispatcher package with the versioned folder path.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyDispatcherSingletons.java Updates Liberty dispatcher singletons package to include v20_0.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyDispatcherRequestGetter.java Updates package to the versioned Liberty dispatcher namespace.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyDispatcherLinkInstrumentation.java Updates package and static import to the relocated singletons class.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyDispatcherInstrumentationModule.java Updates module class package to include v20_0.
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/v20_0/LibertyDispatcherHttpAttributesGetter.java Updates package to the versioned Liberty dispatcher namespace.
instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinx/coroutines/v1_3/KotlinCoroutines13InstrumentationTest.kt Updates test package to the normalized kotlinx.coroutines.v1_3 namespace.
instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinx/coroutines/flow/v1_3/FlowWithSpanTest.kt Updates test package to the normalized kotlinx.coroutines.flow.v1_3 namespace.
instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinx/coroutines/flow/v1_3/KotlinCoroutinesFlowInstrumentationModule.java Updates module package to the normalized kotlinx.coroutines.flow.v1_3 namespace.
instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinx/coroutines/flow/v1_3/FlowInstrumentationHelper.java Updates helper package to the normalized kotlinx.coroutines.flow.v1_3 namespace.
instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinx/coroutines/flow/v1_3/AbstractFlowInstrumentation.java Updates instrumentation package to the normalized kotlinx.coroutines.flow.v1_3 namespace.
instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent-kotlin/src/main/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinx/coroutines/flow/v1_3/FlowUtil.kt Updates kotlin helper package to the normalized kotlinx.coroutines.flow.v1_3 namespace.

@trask
trask merged commit e7734cd into open-telemetry:main May 13, 2026
99 checks passed
@trask
trask deleted the package-name-cleanup-small-abbreviations branch May 13, 2026 13:09
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