Skip to content

Normalize external annotations javaagent package name#18715

Merged
laurit merged 1 commit into
open-telemetry:mainfrom
trask:upstream-package-name-external-annotations
May 12, 2026
Merged

Normalize external annotations javaagent package name#18715
laurit merged 1 commit into
open-telemetry:mainfrom
trask:upstream-package-name-external-annotations

Conversation

@trask

@trask trask commented May 12, 2026

Copy link
Copy Markdown
Member

@trask trask marked this pull request as ready for review May 12, 2026 18:07
@trask trask requested a review from a team as a code owner May 12, 2026 18:07
Copilot AI review requested due to automatic review settings May 12, 2026 18:07

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 the external-annotations javaagent instrumentation package name by renaming the legacy io.opentelemetry.javaagent.instrumentation.extannotations package to io.opentelemetry.javaagent.instrumentation.external.annotations, and updates all test/config references accordingly (aligned with the broader package/module alignment effort in #18428).

Changes:

  • Renamed javaagent (main + test) packages from ...extannotations to ...external.annotations.
  • Updated declarative config YAML test resources to reference the new fully-qualified test class names.
  • Updated Gradle test JVM args that reference the test classes in config properties.

Reviewed changes

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

Show a summary per file
File Description
instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-include.yaml Updates include list to the new test class package name.
instrumentation/external-annotations/javaagent/src/test/resources/declarative-config-exclude-methods.yaml Updates exclude-methods class reference to the new test class package name.
instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceProvidersTest.java Renames test package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TracedMethodsExclusionTest.java Renames test package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/TraceAnnotationsTest.java Renames test package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/SayTracedHello.java Renames test package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/OuterClass.java Renames test package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ConfiguredTraceAnnotationsTest.java Renames test package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationSingletons.java Renames main package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentationModule.java Renames main package declaration to the normalized package.
instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/external/annotations/ExternalAnnotationInstrumentation.java Renames main package declaration and updates static import to the new package.
instrumentation/external-annotations/javaagent/build.gradle.kts Updates test JVM args using fully-qualified test class names to the new package.
instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/external/annotations/IncludeTest.java Renames unit test package and updates static import to the new package.

@laurit laurit merged commit fc42e5d into open-telemetry:main May 12, 2026
97 checks passed
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