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

Set desired providers/converters instead of relying on defaults #5543

Merged

Conversation

TylerHelmuth
Copy link
Contributor

@TylerHelmuth TylerHelmuth commented Jun 6, 2024

Which problem is this PR solving?

Related to open-telemetry/opentelemetry-collector#10290

Description of the changes

Updates the otelcol.CollectorSettings passed to otelcol.NewCommand to include desired providers and converters instead of relying on otelcol.NewCommand to provide defaults.

These providers/converters as the exact same being set by defaults here, which will probably stop getting set in the future.

How was this change tested?

  • unit tests

Checklist

@TylerHelmuth TylerHelmuth requested a review from a team as a code owner June 6, 2024 19:08
Signed-off-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
@@ -30,6 +37,20 @@ func Command() *cobra.Command {
settings := otelcol.CollectorSettings{
BuildInfo: info,
Factories: Components,
ConfigProviderSettings: otelcol.ConfigProviderSettings{
Copy link
Member

Choose a reason for hiding this comment

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

why couldn't this be the default?

Copy link

codecov bot commented Jun 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.20%. Comparing base (52473e7) to head (daaad63).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5543   +/-   ##
=======================================
  Coverage   96.20%   96.20%           
=======================================
  Files         327      327           
  Lines       16007    16021   +14     
=======================================
+ Hits        15399    15413   +14     
  Misses        432      432           
  Partials      176      176           
Flag Coverage Δ
badger_v1 8.05% <ø> (ø)
badger_v2 1.93% <ø> (ø)
cassandra-3.x-v1 16.45% <ø> (ø)
cassandra-3.x-v2 1.85% <ø> (ø)
cassandra-4.x-v1 16.45% <ø> (ø)
cassandra-4.x-v2 1.85% <ø> (ø)
elasticsearch-7-v1 18.88% <ø> (-0.02%) ⬇️
elasticsearch-8-v1 19.09% <ø> (ø)
elasticsearch-8-v2 19.09% <ø> (ø)
grpc_v1 9.48% <ø> (+0.01%) ⬆️
grpc_v2 7.53% <ø> (ø)
kafka 9.77% <ø> (ø)
opensearch-1-v1 18.94% <ø> (ø)
opensearch-2-v1 18.94% <ø> (ø)
opensearch-2-v2 18.94% <ø> (ø)
unittests 94.08% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@yurishkuro
Copy link
Member

Thanks!

@yurishkuro yurishkuro merged commit 6a20fd0 into jaegertracing:main Jun 7, 2024
40 of 41 checks passed
@TylerHelmuth TylerHelmuth deleted the set-collector-providers branch June 10, 2024 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants