Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 6155cc25ddaad253abcced4fcd8108d1be98e9c1 #9251

Conversation

codeboten
Copy link
Contributor

This reverts commit 6155cc2: Make the option WithErrorUnused enabled by default when unmarshaling configuration (#9154)".

I propose reverting this change as it's blocking the release. It's causing problems and i'm not sure if there's a way to fix these tests without further changes in core as they call UnmarshalConfig which doesn't provide a way to pass in WithIgnoreUnused

func UnmarshalConfig(conf *confmap.Conf, intoCfg Config) error {
if cu, ok := intoCfg.(confmap.Unmarshaler); ok {
return cu.Unmarshal(conf)
}
return conf.Unmarshal(intoCfg)
}

See
https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/7466429082/job/20317807463?pr=30167

…arshaling configuration (open-telemetry#9154)"

This reverts commit 6155cc2. I propose reverting this change as it's blocking the release. It's causing more problems and i'm not sure if there's a way to fix these tests as they call UnmarshalConfig which doesn't provide a way to pass in WithIgnoreUnused https://github.com/open-telemetry/opentelemetry-collector/blob/6a726c955a137f05f5d5ad402098f3220f42ceb6/component/config.go#L30-L36

See
https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/7466429082/job/20317807463?pr=30167
@codeboten codeboten requested review from a team and Aneurysm9 January 9, 2024 20:54
Copy link

codecov bot commented Jan 9, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (6a726c9) 90.76% compared to head (ac1747c) 90.76%.

Files Patch % Lines
component/config.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9251   +/-   ##
=======================================
  Coverage   90.76%   90.76%           
=======================================
  Files         341      341           
  Lines       18344    18340    -4     
=======================================
- Hits        16650    16647    -3     
+ Misses       1358     1356    -2     
- Partials      336      337    +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@codeboten codeboten added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Jan 9, 2024
@codeboten codeboten closed this Jan 9, 2024
@codeboten codeboten deleted the codeboten/revert-6155cc25ddaad253abcced4fcd8108d1be98e9c1 branch January 9, 2024 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant