Skip to content

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 michalpristas and pchila 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/8.19/pr-7936
Your branch is up to date with 'origin/8.19'.

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)

Changes to be committed:
	modified:   internal/pkg/otel/README.md
	modified:   internal/pkg/otel/configtranslate/otelconfig_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

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

@elasticmachine
Copy link
Contributor

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

@swiatekm swiatekm force-pushed the mergify/bp/8.19/pr-7936 branch from 8571544 to ad10f45 Compare April 24, 2025 13:48
(cherry picked from commit 0c78a0f)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@swiatekm swiatekm force-pushed the mergify/bp/8.19/pr-7936 branch from ad10f45 to 23f1e53 Compare April 24, 2025 19:41
@swiatekm swiatekm enabled auto-merge (squash) April 24, 2025 19:41
@swiatekm swiatekm removed the conflicts There is a conflict in the backported pull request label Apr 24, 2025
@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @swiatekm

@swiatekm swiatekm merged commit 2766a4b into 8.19 Apr 25, 2025
13 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.19/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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants