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

Upgrade OTel dependencies to v0.42.0. #868

Merged
merged 2 commits into from
Jan 10, 2022

Conversation

jefchien
Copy link
Member

@jefchien jefchien commented Jan 7, 2022

Description: Re-defined ExpandConverter for environment variable expansion in config provider. Fixed tests that broke due to change.

Link to tracking Issue: #867

Testing: Ran unit tests and built without issue.

@jefchien jefchien requested a review from a team as a code owner January 7, 2022 23:27
@codecov-commenter
Copy link

Codecov Report

Merging #868 (cc689d6) into main (94d47a0) will increase coverage by 2.97%.
The diff coverage is 88.57%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #868      +/-   ##
==========================================
+ Coverage   50.38%   53.36%   +2.97%     
==========================================
  Files          11       12       +1     
  Lines         385      416      +31     
==========================================
+ Hits          194      222      +28     
- Misses        175      177       +2     
- Partials       16       17       +1     
Impacted Files Coverage Δ
cmd/awscollector/main.go 12.50% <0.00%> (ø)
pkg/config/flags.go 83.33% <ø> (ø)
pkg/config/expand.go 89.28% <89.28%> (ø)
pkg/config/config_factory.go 100.00% <100.00%> (ø)

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 94d47a0...cc689d6. Read the comment docs.

Copy link
Contributor

@khanhntd khanhntd left a comment

Choose a reason for hiding this comment

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

Nice catch on license. LGTM

@@ -102,21 +100,18 @@ func TestGetMapProviderContainer(t *testing.T) {
os.Setenv("PPROF_ENDPOINT", expectedEndpoint)
defer os.Unsetenv("PPROF_ENDPOINT")

os.Setenv("AOT_CONFIG_CONTENT", "extensions:\n health_check:\n pprof:\n endpoint: '${PPROF_ENDPOINT}'\nreceivers:\n otlp:\n protocols:\n grpc:\n endpoint: 0.0.0.0:4317\nprocessors:\n batch:\nexporters:\n logging:\n loglevel: debug\n awsxray:\n local_mode: true\n region: 'us-west-2'\n awsemf:\n region: 'us-west-2'\nservice:\n pipelines:\n traces:\n receivers: [prometheusreceiver]\n exporters: [logging,awsxray]\n metrics:\n receivers: [prometheusreceiver]\n exporters: [awsemf]\n extensions: [pprof]")
defer os.Unsetenv("AOT_CONFIG_CONTENT")
os.Setenv(envKey, "extensions:\n health_check:\n pprof:\n endpoint: '${PPROF_ENDPOINT}'\nreceivers:\n otlp:\n protocols:\n grpc:\n endpoint: 0.0.0.0:4317\nprocessors:\n batch:\nexporters:\n logging:\n loglevel: debug\n awsxray:\n local_mode: true\n region: 'us-west-2'\n awsemf:\n region: 'us-west-2'\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n exporters: [logging,awsxray]\n metrics:\n receivers: [otlp]\n exporters: [awsemf]\n extensions: [pprof]")
Copy link
Member

@sethAmazon sethAmazon Jan 10, 2022

Choose a reason for hiding this comment

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

good catch

@jefchien
Copy link
Member Author

@Aneurysm9 Do we want to pull in the changes to flags.go (https://github.com/open-telemetry/opentelemetry-collector/blob/v0.42.0/service/flags.go)? Right now, we only allow the config/set flags. Pulling in this change would include 3 additional flags (feature-gates, metrics-addr, metrics-level).

@Aneurysm9
Copy link
Member

metrics-addr and metrics-level are deprecated and can be set through configuration, so we don't want to reintroduce them. We should bring in support for feature-gates though.

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