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

[otelcol] Preserve internal representation for components' configurations #10897

Merged
merged 6 commits into from
Aug 16, 2024

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Aug 16, 2024

Description

The custom unmarshalling for components copied a map without preserving the internal representation. This led to the issues mentioned on #10552 not being fully fixed (they were only fixed if they happened in the service::telemetry section for example).

Link to tracking issue

Fixes issues mentioned on #10552

Testing

This adds one unit test at the otelcol level. Since we didn't catch this with our current confmap/internal/e2e tests, we likely also want to refactor those.

Copy link

codecov bot commented Aug 16, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 91.59%. Comparing base (dec435a) to head (92951ab).
Report is 2 commits behind head on main.

Files Patch % Lines
otelcol/internal/configunmarshaler/configs.go 60.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10897      +/-   ##
==========================================
- Coverage   91.60%   91.59%   -0.01%     
==========================================
  Files         404      404              
  Lines       18980    18983       +3     
==========================================
+ Hits        17387    17388       +1     
- Misses       1234     1235       +1     
- Partials      359      360       +1     

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

Copy link
Member

@crobert-1 crobert-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generated code is out of date, please run "make gogenerate" and commit the changes in this PR.

Just comments from failing check and lint.

otelcol/unmarshal_dry_run_test.go Outdated Show resolved Hide resolved
@dmitryax dmitryax merged commit 8506809 into open-telemetry:main Aug 16, 2024
48 of 49 checks passed
@github-actions github-actions bot added this to the next release milestone Aug 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants