Skip to content

Normalize small javaagent package abbreviations #18721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 1 commit into from
May 13, 2026
Merged

Normalize small javaagent package abbreviations #18721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...n/kotlinxcoroutines/v1_0/flow/FlowUtil.kt → .../kotlinx/coroutines/flow/v1_3/FlowUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0.flow
package io.opentelemetry.javaagent.instrumentation.kotlinx.coroutines.flow.v1_3

import io.opentelemetry.context.Context
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
Expand Down
2 changes: 1 addition & 1 deletion ...1_0/flow/AbstractFlowInstrumentation.java → ...low/v1_3/AbstractFlowInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0.flow;
package io.opentelemetry.javaagent.instrumentation.kotlinx.coroutines.flow.v1_3;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
Expand Down
2 changes: 1 addition & 1 deletion .../v1_0/flow/FlowInstrumentationHelper.java → .../flow/v1_3/FlowInstrumentationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0.flow;
package io.opentelemetry.javaagent.instrumentation.kotlinx.coroutines.flow.v1_3;

import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategies;
Expand Down
2 changes: 1 addition & 1 deletion ...nCoroutinesFlowInstrumentationModule.java → ...nCoroutinesFlowInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0.flow;
package io.opentelemetry.javaagent.instrumentation.kotlinx.coroutines.flow.v1_3;

import static java.util.Collections.singletonList;

Expand Down
2 changes: 1 addition & 1 deletion ...xcoroutines/v1_0/flow/FlowWithSpanTest.kt → .../coroutines/flow/v1_3/FlowWithSpanTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0.flow
package io.opentelemetry.javaagent.instrumentation.kotlinx.coroutines.flow.v1_3

import io.opentelemetry.instrumentation.annotations.WithSpan
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension
Expand Down
2 changes: 1 addition & 1 deletion .../KotlinCoroutines13InstrumentationTest.kt → .../KotlinCoroutines13InstrumentationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines.v1_0
package io.opentelemetry.javaagent.instrumentation.kotlinx.coroutines.v1_3

import io.opentelemetry.context.Context
import io.opentelemetry.extension.kotlin.asContextElement
Expand Down
2 changes: 1 addition & 1 deletion ...ibertyDispatcherHttpAttributesGetter.java → ...ibertyDispatcherHttpAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...bertyDispatcherInstrumentationModule.java → ...bertyDispatcherInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import static java.util.Collections.singletonList;

Expand Down
4 changes: 2 additions & 2 deletions ...LibertyDispatcherLinkInstrumentation.java → ...LibertyDispatcherLinkInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import static io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.LibertyDispatcherSingletons.instrumenter;
import static io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0.LibertyDispatcherSingletons.instrumenter;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

Expand Down
2 changes: 1 addition & 1 deletion ...tcher/LibertyDispatcherRequestGetter.java → ...v20_0/LibertyDispatcherRequestGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import static java.util.Collections.emptyIterator;

Expand Down
2 changes: 1 addition & 1 deletion ...spatcher/LibertyDispatcherSingletons.java → ...er/v20_0/LibertyDispatcherSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
Expand Down
2 changes: 1 addition & 1 deletion ...on/liberty/dispatcher/LibertyRequest.java → ...erty/dispatcher/v20_0/LibertyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import static java.util.Collections.emptyList;

Expand Down
2 changes: 1 addition & 1 deletion ...n/liberty/dispatcher/LibertyResponse.java → ...rty/dispatcher/v20_0/LibertyResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher.v20_0;

import static java.util.Collections.emptyList;

Expand Down
2 changes: 1 addition & 1 deletion ...ScalaConcurrentInstrumentationModule.java → ...ScalaConcurrentInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8;

import static java.util.Arrays.asList;

Expand Down
4 changes: 2 additions & 2 deletions ...ors/ScalaForkJoinPoolInstrumentation.java → ...2_8/ScalaForkJoinPoolInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8;

import static io.opentelemetry.javaagent.instrumentation.scalaexecutors.VirtualFields.FORK_JOIN_TASK_PROPAGATED_CONTEXT;
import static io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8.VirtualFields.FORK_JOIN_TASK_PROPAGATED_CONTEXT;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
Expand Down
8 changes: 4 additions & 4 deletions ...ors/ScalaForkJoinTaskInstrumentation.java → ...2_8/ScalaForkJoinTaskInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static io.opentelemetry.javaagent.instrumentation.scalaexecutors.VirtualFields.CALLABLE_PROPAGATED_CONTEXT;
import static io.opentelemetry.javaagent.instrumentation.scalaexecutors.VirtualFields.FORK_JOIN_TASK_PROPAGATED_CONTEXT;
import static io.opentelemetry.javaagent.instrumentation.scalaexecutors.VirtualFields.RUNNABLE_PROPAGATED_CONTEXT;
import static io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8.VirtualFields.CALLABLE_PROPAGATED_CONTEXT;
import static io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8.VirtualFields.FORK_JOIN_TASK_PROPAGATED_CONTEXT;
import static io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8.VirtualFields.RUNNABLE_PROPAGATED_CONTEXT;
import static net.bytebuddy.matcher.ElementMatchers.isAbstract;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.not;
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/scalaexecutors/VirtualFields.java → ...n/scala/fork/join/v2_8/VirtualFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8;

import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
Expand Down
2 changes: 1 addition & 1 deletion ...mentation/scalaexecutors/AsyncChild.scala → ...ion/scala/fork/join/v2_8/AsyncChild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8

import io.opentelemetry.api.GlobalOpenTelemetry
import io.opentelemetry.api.trace.Tracer
Expand Down
4 changes: 2 additions & 2 deletions ...ecutors/ExecutorInstrumentationTest.scala → ...in/v2_8/ExecutorInstrumentationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8

import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension
import io.opentelemetry.javaagent.instrumentation.executors.AbstractExecutorServiceTest
import io.opentelemetry.javaagent.instrumentation.scalaexecutors.ExecutorInstrumentationTest.testing
import io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8.ExecutorInstrumentationTest.testing
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.RegisterExtension
import org.junit.jupiter.api.function.ThrowingConsumer
Expand Down
2 changes: 1 addition & 1 deletion ...n/scalaexecutors/ForkJoinPoolBridge.scala → ...a/fork/join/v2_8/ForkJoinPoolBridge.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.scalaexecutors
package io.opentelemetry.javaagent.instrumentation.scala.fork.join.v2_8

import java.util.concurrent._
import scala.concurrent.forkjoin.{ForkJoinPool, ForkJoinTask}
Expand Down
Loading