Rename opentelemetry-instrumentation-api module to v1.14 and add v1_14 subpackage#18887
Merged
trask merged 1 commit intoJun 4, 2026
Conversation
…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`).
ff0e5f4 to
13073bb
Compare
Contributor
There was a problem hiding this comment.
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
testingsubproject under the new versioned module, including anAgentSpanTestinghelper and its bytecode instrumentation. - Updated instrumentation-api javaagent sources/tests to the new
io.opentelemetry.javaagent.instrumentation.instrumentationapi.v1_14package 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. |
laurit
approved these changes
Jun 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #18428
Renames the directory to introduce a base version (
opentelemetry-instrumentation-api-1.14, matching the muzzle floor of1.14.0-alpha) and moves the javaagent classes into av1_14subpackage, 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).