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

[receiver/prometheusreceiver] Configuring httpSD http client from TAs clienthttp #34035

Conversation

ItielOlenick
Copy link
Contributor

Description:
Translating relevant fields from TargetAllocator's confighttps to be used in the service discovery http client config
This assures that the relevant config defiend for the TA is used by the service discovery jobs in addition to the scrape configs (as solved by #31449)

Link to tracking Issue: Resolves #33370

Testing:
Added unit tests.

Documentation:

@github-actions github-actions bot added the receiver/prometheus Prometheus receiver label Jul 11, 2024
@ItielOlenick ItielOlenick changed the title Configuring httpSD http client from TAs clienthttp, added changelog a… [receiver/prometheusreceiver] Configuring httpSD http client from TAs clienthttp, added changelog a… Jul 11, 2024
@ItielOlenick ItielOlenick marked this pull request as ready for review July 11, 2024 08:08
@ItielOlenick ItielOlenick requested a review from a team July 11, 2024 08:08
@ItielOlenick ItielOlenick changed the title [receiver/prometheusreceiver] Configuring httpSD http client from TAs clienthttp, added changelog a… [receiver/prometheusreceiver] Configuring httpSD http client from TAs clienthttp Jul 13, 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 Jul 28, 2024
@ItielOlenick
Copy link
Contributor Author

Keep alive

@github-actions github-actions bot removed the Stale label Jul 29, 2024
@crobert-1
Copy link
Member

From failing CI/CD action:

go.mod/go.sum deps changes detected, please run "make gotidy" and commit the changes in this PR.

@crobert-1
Copy link
Member

Failing connector test is unrelated to this change, I've filed #34487 to address it.

@ItielOlenick
Copy link
Contributor Author

@crobert-1 Ran make gotidy

@crobert-1 crobert-1 added the ready to merge Code review completed; ready to merge by maintainers label Aug 8, 2024
@crobert-1
Copy link
Member

crobert-1 commented Aug 8, 2024

Added ready to merge as this was approved by a code owner who is also an approver.

@dmitryax
Copy link
Member

dmitryax commented Aug 9, 2024

@ItielOlenick can you please rebase to fix the conflict?

@ItielOlenick
Copy link
Contributor Author

@dmitryax Done

@ItielOlenick
Copy link
Contributor Author

@dmitryax @crobert-1 Can we get this merged?
This PR introduces new imports, and by the time the GitHub checks get approval and pass there is a new conflict with the existing go.mod

Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

LGTM

.chloggen/httpSD-client-config-from-TA-confighttp.yaml Outdated Show resolved Hide resolved
@andrzej-stencel andrzej-stencel merged commit 6542ee5 into open-telemetry:main Aug 19, 2024
156 checks passed
@github-actions github-actions bot added this to the next release milestone Aug 19, 2024
f7o pushed a commit to f7o/opentelemetry-collector-contrib that referenced this pull request Sep 12, 2024
… clienthttp (open-telemetry#34035)

**Description:** 
Translating relevant fields from TargetAllocator's confighttps to be
used in the service discovery http client config
This assures that the relevant config defiend for the TA is used by the
service discovery jobs in addition to the scrape configs (as solved by
open-telemetry#31449)

**Link to tracking Issue:** Resolves
open-telemetry#33370

**Testing:**
Added unit tests.

**Documentation:**
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.

TLS config in TA receiver doesn't take effect
7 participants