fix(opentelemetry-core): add extra checks on internal merge function for safety#6587
Merged
maryliag merged 2 commits intoopen-telemetry:mainfrom Apr 16, 2026
Merged
fix(opentelemetry-core): add extra checks on internal merge function for safety#6587maryliag merged 2 commits intoopen-telemetry:mainfrom
maryliag merged 2 commits intoopen-telemetry:mainfrom
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6587 +/- ##
==========================================
- Coverage 95.75% 95.74% -0.02%
==========================================
Files 375 375
Lines 12725 12735 +10
Branches 3013 3021 +8
==========================================
+ Hits 12185 12193 +8
- Misses 540 542 +2
🚀 New features to boost your workflow:
|
trentm
approved these changes
Apr 15, 2026
Contributor
trentm
left a comment
There was a problem hiding this comment.
Looks good, thanks.
(I'd also welcome a separate PR to remove this export from the "core" package -- a breaking change that would need to be part of the coming SDK 3.0 -- and update the only place that currently uses this:
;)
Contributor
I opened #6597 for this. |
maryliag
added a commit
to maryliag/opentelemetry-js
that referenced
this pull request
Apr 17, 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.
The
mergeTwoObjectsfunction iterates over keys from untrusted objects without filtering proto, constructor, or prototype, which would allow someone controlling a config object to pollute Object.prototype.Fix: Add a key check before processing