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 added the backport label Apr 24, 2025
@mergify mergify bot requested a review from a team as a code owner April 24, 2025 08:48
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 24, 2025
@mergify mergify bot requested review from michel-laterman and swiatekm 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.18/pr-7936
Your branch is up to date with 'origin/8.18'.

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/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md
	deleted by us:   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

@elasticmachine
Copy link
Contributor

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

@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7936 branch 2 times, most recently from e6a666a to 5d8afe8 Compare April 24, 2025 13:28
@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7936 branch from 5d8afe8 to 7d14063 Compare April 24, 2025 13:52
@elasticmachine
Copy link
Contributor

elasticmachine commented Apr 24, 2025

@swiatekm
Copy link
Contributor

We've decided not to do this in 8.18, as we don't want to bump the Otel libraries.

@swiatekm swiatekm closed this Apr 24, 2025
@mergify mergify bot deleted the mergify/bp/8.18/pr-7936 branch April 24, 2025 15:37
@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

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

Labels

backport Cleanup conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants