From aa40245b02c6f3bd7ac208e33cb8f8333d0eb0bd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 12 May 2026 10:29:41 -0700 Subject: [PATCH] Normalize internal osgi and kotlin extension packages --- .../{osgi => eclipse/osgi/v3_6}/EclipseOsgiInstrumentation.java | 2 +- .../osgi/v3_6}/EclipseOsgiInstrumentationModule.java | 2 +- .../extension/kotlin}/v1_0/ContextExtensionInstrumentation.java | 2 +- .../kotlin}/v1_0/ContextExtensionInstrumentationModule.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/{osgi => eclipse/osgi/v3_6}/EclipseOsgiInstrumentation.java (97%) rename instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/{osgi => eclipse/osgi/v3_6}/EclipseOsgiInstrumentationModule.java (91%) rename instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{extensionkotlin => opentelemetry/extension/kotlin}/v1_0/ContextExtensionInstrumentation.java (98%) rename instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{extensionkotlin => opentelemetry/extension/kotlin}/v1_0/ContextExtensionInstrumentationModule.java (92%) diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/eclipse/osgi/v3_6/EclipseOsgiInstrumentation.java similarity index 97% rename from instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java rename to instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/eclipse/osgi/v3_6/EclipseOsgiInstrumentation.java index 7f5f0e9c8d2b..d0a601f244c9 100644 --- a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java +++ b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/eclipse/osgi/v3_6/EclipseOsgiInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.internal.osgi; +package io.opentelemetry.javaagent.instrumentation.internal.eclipse.osgi.v3_6; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.returns; diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/eclipse/osgi/v3_6/EclipseOsgiInstrumentationModule.java similarity index 91% rename from instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java rename to instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/eclipse/osgi/v3_6/EclipseOsgiInstrumentationModule.java index aff92b075061..e22be3d7c2ed 100644 --- a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java +++ b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/eclipse/osgi/v3_6/EclipseOsgiInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.internal.osgi; +package io.opentelemetry.javaagent.instrumentation.internal.eclipse.osgi.v3_6; import static java.util.Collections.singletonList; diff --git a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/v1_0/ContextExtensionInstrumentation.java b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentation.java similarity index 98% rename from instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/v1_0/ContextExtensionInstrumentation.java rename to instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentation.java index 34995f2785c8..7d14fdb9042f 100644 --- a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/v1_0/ContextExtensionInstrumentation.java +++ b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extensionkotlin.v1_0; +package io.opentelemetry.javaagent.instrumentation.opentelemetry.extension.kotlin.v1_0; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; diff --git a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/v1_0/ContextExtensionInstrumentationModule.java b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java similarity index 92% rename from instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/v1_0/ContextExtensionInstrumentationModule.java rename to instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java index 955d68dc0f77..367e499bc7e8 100644 --- a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/v1_0/ContextExtensionInstrumentationModule.java +++ b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetry/extension/kotlin/v1_0/ContextExtensionInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extensionkotlin.v1_0; +package io.opentelemetry.javaagent.instrumentation.opentelemetry.extension.kotlin.v1_0; import static java.util.Collections.singletonList;