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

Bump otel collector contrib dependancy #276

Merged
merged 1 commit into from
Apr 15, 2021
Merged

Bump otel collector contrib dependancy #276

merged 1 commit into from
Apr 15, 2021

Conversation

dmitryax
Copy link
Contributor

@dmitryax dmitryax commented Apr 14, 2021

Also apply changes to adapt for a breaking change in contrib to custom unmarshalling

Need to pick up these commits:

@dmitryax dmitryax force-pushed the bump-contrib branch 2 times, most recently from f6da1fd to f08338c Compare April 15, 2021 05:49
Also apply changes to adapt for a breaking change in contrib to custom unmarshalling
@codecov
Copy link

codecov bot commented Apr 15, 2021

Codecov Report

Merging #276 (75404f4) into main (d429f36) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #276      +/-   ##
==========================================
- Coverage   86.93%   86.89%   -0.04%     
==========================================
  Files          20       20              
  Lines        1492     1488       -4     
==========================================
- Hits         1297     1293       -4     
  Misses        160      160              
  Partials       35       35              
Impacted Files Coverage Δ
internal/extension/smartagentextension/factory.go 72.72% <ø> (-0.61%) ⬇️
internal/receiver/smartagentreceiver/factory.go 100.00% <ø> (ø)
internal/extension/smartagentextension/config.go 92.30% <100.00%> (-0.10%) ⬇️
internal/receiver/smartagentreceiver/config.go 92.91% <100.00%> (-0.06%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d429f36...75404f4. Read the comment docs.

allSettings := componentViperSection.AllSettings()
extensionCfg := intoCfg.(*Config)
func (cfg *Config) Unmarshal(componentParser *config.Parser) error {
allSettings := componentParser.Viper().AllSettings()
Copy link
Contributor

Choose a reason for hiding this comment

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

This isn't technically a transparent change, but works coincidentally by the default config (intoCfg) sharing values with config, err := smartAgentConfigFromSettingsMap(allSettings).

Copy link
Contributor

@rmfitzpatrick rmfitzpatrick Apr 15, 2021

Choose a reason for hiding this comment

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

I'm more caught up on the signature/parser changes and see this isn't the case (invocation is about the same https://github.com/open-telemetry/opentelemetry-collector/pull/2867/files#diff-9c00f8edbdec0493154b28fa17b5f69bdcd8097bcf96cd3bd7d664e145c9b8f6R549)

@dmitryax dmitryax merged commit 7d85cb1 into main Apr 15, 2021
@delete-merged-branch delete-merged-branch bot deleted the bump-contrib branch April 15, 2021 15:20
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.

3 participants