From cb64af111ef8a5a447998cbe6077a5b49cb1c01c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 12 May 2026 10:33:05 -0700 Subject: [PATCH] Normalize external annotations javaagent package --- .../{extannotations => external/annotations}/IncludeTest.java | 4 ++-- .../external-annotations/javaagent/build.gradle.kts | 4 ++-- .../annotations}/ExternalAnnotationInstrumentation.java | 4 ++-- .../annotations}/ExternalAnnotationInstrumentationModule.java | 2 +- .../annotations}/ExternalAnnotationSingletons.java | 2 +- .../annotations}/ConfiguredTraceAnnotationsTest.java | 2 +- .../{extannotations => external/annotations}/OuterClass.java | 2 +- .../annotations}/SayTracedHello.java | 2 +- .../annotations}/TraceAnnotationsTest.java | 2 +- .../annotations}/TraceProvidersTest.java | 2 +- .../annotations}/TracedMethodsExclusionTest.java | 2 +- .../test/resources/declarative-config-exclude-methods.yaml | 2 +- .../src/test/resources/declarative-config-include.yaml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/IncludeTest.java (90%) rename instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/ExternalAnnotationInstrumentation.java (97%) rename instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/ExternalAnnotationInstrumentationModule.java (90%) rename instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/ExternalAnnotationSingletons.java (94%) rename instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/ConfiguredTraceAnnotationsTest.java (95%) rename instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/OuterClass.java (84%) rename instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/SayTracedHello.java (97%) rename instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/TraceAnnotationsTest.java (98%) rename instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/TraceProvidersTest.java (97%) rename instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{extannotations => external/annotations}/TracedMethodsExclusionTest.java (97%) diff --git a/instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/IncludeTest.java b/instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/IncludeTest.java similarity index 90% rename from instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/IncludeTest.java rename to instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/IncludeTest.java index 4b1f4b86bcb2..8a8a1b398d89 100644 --- a/instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/IncludeTest.java +++ b/instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/IncludeTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; -import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS; +import static io.opentelemetry.javaagent.instrumentation.external.annotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; diff --git a/instrumentation/external-annotations/javaagent/build.gradle.kts b/instrumentation/external-annotations/javaagent/build.gradle.kts index 3fa3bf87d398..1578f80b04ba 100644 --- a/instrumentation/external-annotations/javaagent/build.gradle.kts +++ b/instrumentation/external-annotations/javaagent/build.gradle.kts @@ -43,7 +43,7 @@ tasks { includeTestsMatching("ConfiguredTraceAnnotationsTest") } include("**/ConfiguredTraceAnnotationsTest.*") - jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass\$InterestingMethod") + jvmArgs("-Dotel.instrumentation.external-annotations.include=io.opentelemetry.javaagent.instrumentation.external.annotations.OuterClass\$InterestingMethod") } val testDeclarativeConfigInclude by registering(Test::class) { @@ -68,7 +68,7 @@ tasks { } include("**/TracedMethodsExclusionTest.*") jvmArgs( - "-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]" + "-Dotel.instrumentation.external-annotations.exclude-methods=io.opentelemetry.javaagent.instrumentation.external.annotations.TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]" ) } diff --git a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentation.java b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentation.java similarity index 97% rename from instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentation.java rename to instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentation.java index b986ee305cab..95d38c71bce7 100644 --- a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentation.java +++ b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentation.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; -import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationSingletons.instrumenter; +import static io.opentelemetry.javaagent.instrumentation.external.annotations.ExternalAnnotationSingletons.instrumenter; import static java.util.Arrays.asList; import static java.util.Collections.emptySet; import static java.util.logging.Level.WARNING; diff --git a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentationModule.java similarity index 90% rename from instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java rename to instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentationModule.java index 79c7d68ab18f..d47117358077 100644 --- a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentationModule.java +++ b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static java.util.Collections.singletonList; diff --git a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationSingletons.java b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationSingletons.java similarity index 94% rename from instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationSingletons.java rename to instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationSingletons.java index b3a0376c5025..2b25ebb4bd07 100644 --- a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationSingletons.java +++ b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationSingletons.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor; diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ConfiguredTraceAnnotationsTest.java similarity index 95% rename from instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java rename to instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ConfiguredTraceAnnotationsTest.java index e36d5a5f5822..a63139269bab 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ConfiguredTraceAnnotationsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/OuterClass.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/OuterClass.java similarity index 84% rename from instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/OuterClass.java rename to instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/OuterClass.java index 33949cfc7e67..0b0e98a42373 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/OuterClass.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/OuterClass.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/SayTracedHello.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/SayTracedHello.java similarity index 97% rename from instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/SayTracedHello.java rename to instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/SayTracedHello.java index f463706ef9aa..7bdeb9e72fb0 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/SayTracedHello.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/SayTracedHello.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import io.opentelemetry.api.trace.Span; import java.util.concurrent.Callable; diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceAnnotationsTest.java similarity index 98% rename from instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java rename to instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceAnnotationsTest.java index bfc4cd3e2988..40093d916011 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceAnnotationsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions; diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceProvidersTest.java similarity index 97% rename from instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java rename to instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceProvidersTest.java index 6ca8d5ac013d..b6b72253b576 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceProvidersTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TracedMethodsExclusionTest.java similarity index 97% rename from instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java rename to instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TracedMethodsExclusionTest.java index 8cadc85c9a44..36c4ae492fb2 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TracedMethodsExclusionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.extannotations; +package io.opentelemetry.javaagent.instrumentation.external.annotations; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-exclude-methods.yaml b/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-exclude-methods.yaml index 660f8caf687e..794007f639b0 100644 --- a/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-exclude-methods.yaml +++ b/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-exclude-methods.yaml @@ -3,7 +3,7 @@ instrumentation/development: java: external_annotations: exclude_methods: - - class: io.opentelemetry.javaagent.instrumentation.extannotations.TracedMethodsExclusionTest$TestClass + - class: io.opentelemetry.javaagent.instrumentation.external.annotations.TracedMethodsExclusionTest$TestClass methods: - excluded - annotatedButExcluded diff --git a/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-include.yaml b/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-include.yaml index 0e7ee0ef4acc..43af6ad67f2e 100644 --- a/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-include.yaml +++ b/instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-include.yaml @@ -3,4 +3,4 @@ instrumentation/development: java: external_annotations: include: - - io.opentelemetry.javaagent.instrumentation.extannotations.OuterClass$InterestingMethod + - io.opentelemetry.javaagent.instrumentation.external.annotations.OuterClass$InterestingMethod