[config] Deprecate component.UnmarshalConfig #9750
Merged
Conversation
This file contains 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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #9750 +/- ##
==========================================
+ Coverage 91.98% 92.48% +0.50%
==========================================
Files 361 387 +26
Lines 16965 18244 +1279
==========================================
+ Hits 15605 16873 +1268
- Misses 1020 1025 +5
- Partials 340 346 +6 ☔ View full report in Codecov by Sentry. |
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
2 times, most recently
from
0c0a748
to
311078f
Compare
|
Contrib tests fix: open-telemetry/opentelemetry-collector-contrib#31727 |
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
from
311078f
to
07fa33d
Compare
mx-psi
reviewed
Mar 14, 2024
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
2 times, most recently
from
ccbf4cc
to
f8f4fe6
Compare
atoulme
commented
Mar 14, 2024
atoulme
commented
Mar 14, 2024
dmitryax
pushed a commit
that referenced
this pull request
Mar 14, 2024
This is a split of #9750 that tries to work around mapstructure, which wraps an error around a decoding error. In the case when an error is returned from a top level construct, we get a not so helpful message that says: ``` error decoding '': error running encode hook: marshaling error ``` With this change, the error is unwrapped, giving the following string representation: ``` error running encode hook: marshaling error ``` Because #9750 enforces going through mapstructure, it would change errors returned with this not-so-helpful preamble. Adding this removes the problem.
dmitryax
pushed a commit
that referenced
this pull request
Mar 14, 2024
This change is required in preparation of #9750 This removes the call to `component.UnmarshalConfig` in preparation of its deprecation, and instead has the `Conf` object unmarshal itself into the `Config` struct.
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
from
51e5f78
to
dfa57f1
Compare
dmitryax
pushed a commit
that referenced
this pull request
Mar 15, 2024
|
Can you add 'Fixes #7101' to the PR description? |
dmitryax
reviewed
Mar 26, 2024
This was referenced Mar 27, 2024
mx-psi
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
Mar 27, 2024
**Description:** This is a companion PR to handle recursive state of unmarshalers with open-telemetry/opentelemetry-collector#9750. Changing this behavior will allow the confmap.Conf object to recognize that it has already run the `Unmarshal` method on the struct, and run the mapstructure decoding of fields.
|
This PR was marked stale due to lack of activity. It will be closed in 14 days. |
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
from
4445cc4
to
05a0d08
Compare
|
This PR was marked stale due to lack of activity. It will be closed in 14 days. |
|
Closed as inactive. Feel free to reopen if this PR is still being worked on. |
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
from
05a0d08
to
2d0837a
Compare
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
from
2d0837a
to
1757e25
Compare
atoulme
changed the title
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
2 times, most recently
from
bd90692
to
8e1360c
Compare
atoulme
force-pushed
the
embedded_struct_unmarshaler
branch
from
8e1360c
to
616b7ec
Compare
mx-psi
approved these changes
May 24, 2024
evan-bradley
approved these changes
May 24, 2024
andrzej-stencel
pushed a commit
to andrzej-stencel/opentelemetry-collector
that referenced
this pull request
May 27, 2024
…shalers. (open-telemetry#9862) This is a slice of open-telemetry#9750 focusing on removing the top level condition on unmarshaling structs. --------- Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
steves-canva
pushed a commit
to Canva/opentelemetry-collector
that referenced
this pull request
Jun 14, 2024
…shalers. (open-telemetry#9862) This is a slice of open-telemetry#9750 focusing on removing the top level condition on unmarshaling structs. --------- Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
steves-canva
pushed a commit
to Canva/opentelemetry-collector
that referenced
this pull request
Jun 14, 2024
**Description:** This PR removes the top level if/else in `component.UnmarshalConfig`, handling recursive state in the confmap.Conf object instead. This PR deprecates `component.UnmarshalConfig` in favor of calling directly `Unmarshal` on the confmap.Conf object. **Link to tracking Issue:** Fixes open-telemetry#7102 Fixes open-telemetry#7101 --------- Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
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.
Description:
This PR removes the top level if/else in
component.UnmarshalConfig, handling recursive state in the confmap.Conf object instead.This PR deprecates
component.UnmarshalConfigin favor of calling directlyUnmarshalon the confmap.Conf object.Link to tracking Issue:
Fixes #7102
Fixes #7101