make getInstrumentationConfig non-null#7954
Merged
jkwatson merged 2 commits intoopen-telemetry:mainfrom Jan 6, 2026
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #7954 +/- ##
============================================
- Coverage 90.11% 90.10% -0.01%
+ Complexity 7463 7462 -1
============================================
Files 834 834
Lines 22586 22585 -1
Branches 2240 2239 -1
============================================
- Hits 20353 20351 -2
Misses 1532 1532
- Partials 701 702 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
trask
approved these changes
Jan 5, 2026
Member
|
As @trask mentioned in a duplicate PR, this is against the spec. However, as this comment mentioned, we're ok with this because its an incubating module. Should reconcile the spec or the code before stabilizing. Tracking in #7958 |
github-merge-queue bot
pushed a commit
to open-telemetry/opentelemetry-specification
that referenced
this pull request
Jan 26, 2026
Fixes open-telemetry/opentelemetry-java#7958 ## Changes While working on Java, it has turned out to be more convenient to work with empty config objects rather than null/nil. - null requires an explicit if, making the code more verbose - it doesn't matter if the `.instrumentation` is missing or is empty, which is a different question than "is declarative config used") * [x] Related issues: open-telemetry/opentelemetry-java#7927 (comment) * [ ] Related [OTEP(s)](https://github.com/open-telemetry/oteps) # * [x] Links to the prototypes (when adding or changing features): open-telemetry/opentelemetry-java#7954 * [ ] [`CHANGELOG.md`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/CHANGELOG.md) file updated for non-trivial changes * [ ] [Spec compliance matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix/template.yaml) updated if necessary --------- Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Jack Berg <34418638+jack-berg@users.noreply.github.com> Co-authored-by: Carlos Alberto Cortez <calberto.cortez@gmail.com>
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
4 participants
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.
See #7927 (comment)
Spec PR: open-telemetry/opentelemetry-specification#4817