Skip to content

[9.0] (backport #7936) Use upstream prometheus receiver again#7953

Merged
swiatekm merged 1 commit into9.0from
mergify/bp/9.0/pr-7936
Apr 25, 2025
Merged

[9.0] (backport #7936) Use upstream prometheus receiver again#7953
swiatekm merged 1 commit into9.0from
mergify/bp/9.0/pr-7936

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 24, 2025

What does this PR do?

Switches from our fork of the Otel prometheus receiver to the upstream version. This fork was driven by a dependency conflict with the prometheus library, which was resolved in elastic/beats#43540.

To achieve this, we bump the beats dependency version. I was also forced to downgrade github.com/elastic/cloud-on-k8s, as it depended on a version of github.com/prometheus/common which was incompatible with the new prometheus library. @pkoutsovasilis I hope that's ok.

Why is it important?

We want to use upstream components where possible.

Checklist

  • I have read and understood the pull request guidelines of this project.
    - [ ] My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
    - [ ] I have made corresponding change to the default configuration files
    - [] I have added tests that prove my fix is effective or that my feature works
    - [ ] I have added an entry in ./changelog/fragments using the changelog tool
    - [ ] I have added an integration test or an E2E test

This is an automatic backport of pull request #7936 done by [Mergify](https://mergify.com).
@mergify mergify bot requested a review from a team as a code owner April 24, 2025 08:48
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 24, 2025
@mergify mergify bot requested review from andrzej-stencel and blakerouse and removed request for a team April 24, 2025 08:48
@mergify
Copy link
Contributor Author

mergify bot commented Apr 24, 2025

Cherry-pick of 0c78a0f has failed:

On branch mergify/bp/9.0/pr-7936
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit 0c78a0fb2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md
	both modified:   internal/pkg/otel/configtranslate/otelconfig_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Apr 24, 2025
2 tasks
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@swiatekm swiatekm force-pushed the mergify/bp/9.0/pr-7936 branch 2 times, most recently from 60cd8c1 to a7f72e3 Compare April 24, 2025 15:58
@swiatekm swiatekm removed the conflicts There is a conflict in the backported pull request label Apr 24, 2025
(cherry picked from commit 0c78a0f)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/configtranslate/otelconfig_test.go
@swiatekm swiatekm force-pushed the mergify/bp/9.0/pr-7936 branch from a7f72e3 to 5d8f7fd Compare April 24, 2025 20:13
@swiatekm swiatekm enabled auto-merge (squash) April 24, 2025 20:13
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @swiatekm

@swiatekm swiatekm merged commit 12e7b05 into 9.0 Apr 25, 2025
12 checks passed
@swiatekm swiatekm deleted the mergify/bp/9.0/pr-7936 branch April 25, 2025 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

2 participants