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

[chore] [receiver/simpleprometheus] Use confighttp.NewDefaultClientConfig instead of manually creating struct #35652

Merged

Conversation

mackjmr
Copy link
Member

@mackjmr mackjmr commented Oct 7, 2024

Description:
This PR makes usage of NewDefaultClientConfig instead of manually creating the confighttp.ClientConfig struct.

Link to tracking Issue: #35457

…nfig instead of manually creating struct

**Description:**
This PR makes usage of `NewDefaultClientConfig` instead of manually creating the confighttp.ClientConfig struct.

**Link to tracking Issue:** open-telemetry#35457
Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@github-actions github-actions bot added the Stale label Oct 22, 2024
@mackjmr
Copy link
Member Author

mackjmr commented Oct 28, 2024

@fatsheep9146 can you please take a look ?

@github-actions github-actions bot removed the Stale label Oct 29, 2024
Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@github-actions github-actions bot added the Stale label Nov 13, 2024
Copy link
Contributor

github-actions bot commented Dec 8, 2024

This PR was marked stale due to lack of activity. It will be closed in 14 days.

Copy link
Contributor

@fatsheep9146 fatsheep9146 left a comment

Choose a reason for hiding this comment

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

I think integration test is broken, could you please check this?

=== FAIL: . TestGetPrometheusConfigWrapper/Test_TLSEnable_false_but_tls_configured (re-run 1) (0.00s)
receiver_test.go:437:
Error Trace: /home/runner/work/opentelemetry-collector-contrib/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver/receiver_test.go:437
Error: Not equal:
expected: &prometheusreceiver.Config{PrometheusConfig:(*prometheusreceiver.PromConfig)(0xc00057e788), TrimMetricSuffixes:false, UseStartTimeMetric:false, StartTimeMetricRegex:"", ReportExtraScrapeMetrics:false, TargetAllocator:(*targetallocator.Config)(nil)}
actual : &prometheusreceiver.Config{PrometheusConfig:(*prometheusreceiver.PromConfig)(0xc00057ec88), TrimMetricSuffixes:false, UseStartTimeMetric:false, StartTimeMetricRegex:"", ReportExtraScrapeMetrics:false, TargetAllocator:(*targetallocator.Config)(nil)}
Diff:
--- Expected
+++ Actual
@@ -48,3 +48,3 @@
MetricsPath: (string) (len=7) "/metric",
- Scheme: (string) (len=5) "https",
+ Scheme: (string) (len=4) "http",
EnableCompression: (bool) false,

@fatsheep9146 fatsheep9146 added the ready to merge Code review completed; ready to merge by maintainers label Dec 17, 2024
@fatsheep9146
Copy link
Contributor

@open-telemetry/collector-contrib-maintainers Could any maintainers help merge this pr please? Thanks!

@mx-psi mx-psi merged commit 08e0bb4 into open-telemetry:main Dec 20, 2024
171 checks passed
@github-actions github-actions bot added this to the next release milestone Dec 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Code review completed; ready to merge by maintainers receiver/simpleprometheus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants