Repository navigation
Remove reverse declarative config bridge compatibility - #20771
Merged
Merged
Conversation
Pull request dashboard statusMerged · refreshed 2026-10-21 08:49 UTC Status above doesn't look right?
|
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Implement updated support for API example as per issue #18903
Remove reverse declarative config bridge compatibility
Oct 20, 2026
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The fallback still exposes flat/default configuration through otelProperties in an enabled declarative context.
1 open issue
What changed in this PR
Removes deprecated declarative-to-flat configuration compatibility while preserving the flat-to-declarative bridge and flat-property Spring configuration.
Changes:
- Removes the reverse bridge, its tests, and unused dependencies.
- Removes the declarative Spring compatibility bean and updates configuration tests.
- Updates documentation and breaking-change notes.
| File | Description |
|---|---|
| instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java | Reads configuration through ConfigProvider. |
| instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java | Removes declarative compatibility bean. |
| declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java | Deletes reverse-bridge tests. |
| declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilderTest.java | Deletes builder tests. |
| declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilder.java | Deletes deprecated builder. |
| declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java | Deletes reverse-bridge implementation. |
| declarative-config-bridge/README.md | Describes the remaining bridge. |
| declarative-config-bridge/build.gradle.kts | Removes unused dependencies. |
| CHANGELOG.md | Records removals and migration guidance. |
Review effort: Balanced
Gate FallbackConfigProperties on DeclarativeConfigDisabled so a custom OpenTelemetry bean cannot reintroduce flat configuration in declarative mode. Cover custom and auto-configured SDK contexts while retaining flat configuration support. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
reviewed
Oct 20, 2026
trask
marked this pull request as ready for review
October 20, 2026 22:05
trask
approved these changes
Oct 20, 2026
laurit
approved these changes
Oct 21, 2026
laurit
enabled auto-merge (squash)
October 21, 2026 08:08
14 of 16 tasks
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.
Remove the deprecated declarative-to-flat bridge and declarative Spring Boot
ConfigPropertiescompatibility bean. The supported flat-to-declarative bridge and flat-property Spring configuration remain available.ConfigProviderandDeclarativeConfigProperties:ConfigPropertiesbean.