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.

Sign up for GitHub

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

Jump to bottom

Use target and metadata from context #8780

Merged
merged 10 commits into from
Apr 5, 2022
Merged

Use target and metadata from context #8780

merged 10 commits into from
Apr 5, 2022

Conversation

gouthamve
Copy link
Member

@gouthamve gouthamve commented Mar 22, 2022 •
edited
Loading

Description: This uses the target and metadata info passed in through context instead of looking them up via instance and job labels.

Link to tracking Issue: This fixes #5757 and #5663

Testing: I've done a Prometheus --> OTel Collector --> Another Prometheus with honor_labels: true and Prometheus federation. It used to fail before but now it works!

TODO:

@gouthamve gouthamve requested a review from a team March 22, 2022 09:12
@gouthamve
Copy link
Member Author

I'll resolve the conflicts once upstream PR is merged.

@gouthamve gouthamve force-pushed the get-scrape-cache-from-context branch from 2e9273f to 4a57155 Compare March 22, 2022 09:21
@dashpole
Copy link
Contributor

Looks good once the prerequisites are complete

@gouthamve gouthamve force-pushed the get-scrape-cache-from-context branch from 8c840d6 to 4cd8f8f Compare March 24, 2022 16:48
@pmm-sumo
Copy link
Contributor

I think the rebase resulted in a bunch of go.mod/go.sum modified in components unrelated to changes

@gouthamve gouthamve force-pushed the get-scrape-cache-from-context branch from 4cd8f8f to b52d3e1 Compare March 29, 2022 17:19
@gouthamve gouthamve requested a review from mx-psi as a code owner March 29, 2022 17:19
@gouthamve gouthamve force-pushed the get-scrape-cache-from-context branch 3 times, most recently from ae7dd0c to e57a529 Compare March 30, 2022 20:08
@gouthamve
Copy link
Member Author

@dashpole @Aneurysm9 @pmm-sumo Thanks for the initial review, I think I have addressed all the comments now. Could you take another look when you have some time?

@jpkrohling jpkrohling force-pushed the get-scrape-cache-from-context branch from edaadf0 to a0a4501 Compare March 31, 2022 12:24
@jpkrohling
Copy link
Member

PR updated to account for the v0.48.0 changes

@gouthamve gouthamve force-pushed the get-scrape-cache-from-context branch from 3d0b4a4 to 7db0c68 Compare March 31, 2022 15:39
@jpkrohling
Copy link
Member

Nice, github now allows us to restart only the failed jobs. Once we have a green build, I'll merge this.

gouthamve and others added 10 commits April 5, 2022 08:11
@gouthamve
Use target and metadata from context
f858034 
This fixes #5757 and #5663

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve
Add tests for relabeling working
3c22a06 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve
Use Prometheus main branch
b9b3381 
prometheus/prometheus#10473 has been merged

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve
Add back the tests
06a0b85 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve
Fix flaky test
b6d1c69 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve
Add Changelog entry
a1cd94c 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve
Add relabel test with the e2e framework
20f7eb7 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve @Aneurysm9
Update receiver/prometheusreceiver/metrics_receiver_labels_test.go
de6a070 
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
@jpkrohling @gouthamve
Move changelog entry to unreleased
cdb54e4 
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@gouthamve
Make lint pass
a26bd10 
Needed to run make gotidy; make golint

strings.Title is deprecated

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@gouthamve gouthamve force-pushed the get-scrape-cache-from-context branch from 7db0c68 to a26bd10 Compare April 5, 2022 12:14
@jpkrohling jpkrohling merged commit e0ba61c into open-telemetry:main Apr 5, 2022
@gouthamve gouthamve deleted the get-scrape-cache-from-context branch April 5, 2022 15:45
@ahayworth ahayworth mentioned this pull request May 16, 2022
Closed
This was referenced Jun 20, 2022
Closed
Closed
@shacharSirotkin
Copy link

Hi,
I know it's a pretty old PR but I would be happy if you can upload a working config for Prometheus federation.
I'm struggling with it for a long time.
Thanks 🙏

@mx-psi
Copy link
Member

mx-psi commented Feb 5, 2024

Hi, I know it's a pretty old PR but I would be happy if you can upload a working config for Prometheus federation. I'm struggling with it for a long time. Thanks 🙏

Please open a new issue for this, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pmm-sumo pmm-sumo pmm-sumo approved these changes

@dashpole dashpole dashpole approved these changes

@Aneurysm9 Aneurysm9 Aneurysm9 approved these changes

@dmitryax dmitryax Awaiting requested review from dmitryax

@jpkrohling jpkrohling Awaiting requested review from jpkrohling

@jsuereth jsuereth Awaiting requested review from jsuereth

@punya punya Awaiting requested review from punya

@mx-psi mx-psi Awaiting requested review from mx-psi

Assignees

@mx-psi mx-psi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prometheus Receiver - honor_labels set to true doesnt work with federation
7 participants
@gouthamve @dashpole @pmm-sumo @jpkrohling @shacharSirotkin @mx-psi @Aneurysm9