Skip to content

Rename opentelemetry-instrumentation-api module to v1.14 and add v1_14 subpackage#18887

Merged
trask merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-opentelemetry-instrumentation-api
Jun 4, 2026
Merged

Rename opentelemetry-instrumentation-api module to v1.14 and add v1_14 subpackage#18887
trask merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-opentelemetry-instrumentation-api

Conversation

@trask

@trask trask commented Jun 3, 2026

Copy link
Copy Markdown
Member

Part of #18428

Renames the directory to introduce a base version (opentelemetry-instrumentation-api-1.14, matching the muzzle floor of 1.14.0-alpha) and moves the javaagent classes into a v1_14 subpackage, bringing this module in line with the convention used by the other self-instrumentation modules (opentelemetry-extension-annotations-1.0, opentelemetry-instrumentation-annotations-1.16).

…4 subpackage

Renames the directory to introduce a base version (`opentelemetry-instrumentation-api-1.14`,
matching the muzzle floor of `1.14.0-alpha`) and moves the javaagent classes into a
`v1_14` subpackage, bringing this module in line with the convention used by the other
self-instrumentation modules (`opentelemetry-extension-annotations-1.0`,
`opentelemetry-instrumentation-annotations-1.16`).
@trask trask force-pushed the package-name-cleanup-opentelemetry-instrumentation-api branch from ff0e5f4 to 13073bb Compare June 3, 2026 03:52
@trask trask requested a review from Copilot June 3, 2026 04:04

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 pull request renames the opentelemetry-instrumentation-api instrumentation module to a versioned directory (opentelemetry-instrumentation-api-1.14) and moves javaagent code into a v1_14 subpackage to align with the versioned-module conventions used by other self-instrumentation modules.

Changes:

  • Updated Gradle settings and javaagent aggregation to depend on the new :instrumentation:opentelemetry-instrumentation-api:opentelemetry-instrumentation-api-1.14:* project paths.
  • Introduced a dedicated testing subproject under the new versioned module, including an AgentSpanTesting helper and its bytecode instrumentation.
  • Updated instrumentation-api javaagent sources/tests to the new io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14 package and added an additional instrumentation module name alias.

Reviewed changes

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

Show a summary per file
File Description
settings.gradle.kts Updates included subprojects to point at the new versioned module path.
javaagent/build.gradle.kts Updates base javaagent libs to depend on the new versioned javaagent project.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java Adds an HTTP server attributes getter used for test instrumenter configuration.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumenter.java Adds instrumenters used by the test helper to start/end spans and set route state.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentationModule.java Registers the testing instrumentation module via AutoService.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentation.java Adds ByteBuddy advice to wrap AgentSpanTesting calls in spans.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTesting.java Adds the public test helper API methods to be instrumented.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/testing/build.gradle.kts Introduces the testing module Gradle configuration using otel.javaagent-testing.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/metadata.yaml Adds module metadata for the new versioned module directory.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/testOldServerSpan/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/LegacyServerSpanContextBridgeTest.java Updates test package to v1_14.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/ContextBridgeTest.java Updates test package to v1_14.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/SpanKeyInstrumentation.java Moves/renames javaagent instrumentation package to v1_14.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/SpanKeyBridging.java Moves/renames bridging logic package to v1_14.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/InstrumentationApiInstrumentationModule.java Updates package and adds an additional module-name alias reflecting -1.14.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/v1_14/HttpRouteStateInstrumentation.java Moves/renames route-state instrumentation package to v1_14.
instrumentation/opentelemetry-instrumentation-api/opentelemetry-instrumentation-api-1.14/javaagent/build.gradle.kts Updates test dependencies to the new versioned testing project path.
.fossa.yml Updates FOSSA Gradle target to the new versioned javaagent project.

@trask trask marked this pull request as ready for review June 3, 2026 18:00
@trask trask requested a review from a team as a code owner June 3, 2026 18:00
@trask trask merged commit ae8e1ec into open-telemetry:main Jun 4, 2026
187 of 191 checks passed
@trask trask deleted the package-name-cleanup-opentelemetry-instrumentation-api branch June 4, 2026 14:20
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