Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2025

What does this PR do?

Updates the OTel components to v1.28.0/v0.122.0.

This update was performed using following command:

.ci/scripts/otel-update.sh v0.122.0 v1.28.0 v0.122.0 

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

How to test this PR locally

go build . sudo ./elastic-agent otel 

This is an automatic backport of pull request #7725 done by [Mergify](https://mergify.com).
* chore: update OTel components to v0.122.0 * add PR link * tentative fix for 'must not specify both logs_index and logs_dynamic_index' * add prometheusreceiver to gomoddirectives * Fix TestGetOtelConfig * explicitly set mapping mode otherwise it defaults to otel * add missing logs_index to expected test config (cherry picked from commit fb3a575) # Conflicts: #	go.mod #	go.sum #	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner April 25, 2025 13:36
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 25, 2025
@mergify mergify bot requested review from pchila and ycombinator and removed request for a team April 25, 2025 13:36
@mergify
Copy link
Contributor Author

mergify bot commented Apr 25, 2025

Cherry-pick of fb3a575 has failed:

On branch mergify/bp/9.0/pr-7725 Your branch is up to date with 'origin/9.0'. You are currently cherry-picking commit fb3a5755f. (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: NOTICE.txt	new file: changelog/fragments/1744022264-update-otel-components-to-v0.122.0.yaml	modified: internal/pkg/otel/configtranslate/otelconfig.go	modified: internal/pkg/otel/configtranslate/otelconfig_test.go	modified: testing/integration/otel_test.go Unmerged paths: (use "git add <file>..." to mark resolution)	both modified: go.mod	both modified: go.sum	both modified: internal/pkg/otel/README.md 

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

@github-actions github-actions bot added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Apr 25, 2025
@elasticmachine
Copy link
Contributor

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

@swiatekm
Copy link
Contributor

I don't think we want to update otel dependencies in patch releases. @mauri870

@mergify
Copy link
Contributor Author

mergify bot commented Apr 28, 2025

This pull request has not been merged yet. Could you please review and merge it @mauri870? 🙏

@mauri870 mauri870 enabled auto-merge (squash) April 28, 2025 11:37
@mauri870 mauri870 disabled auto-merge April 28, 2025 12:08
@mauri870
Copy link
Member

mauri870 commented Apr 28, 2025

I don't think we want to update otel dependencies in patch releases. @mauri870

I was not aware of this. Looks like the previous updates were backported #7718, #6774.

@swiatekm
Copy link
Contributor

I don't think we want to update otel dependencies in patch releases. @mauri870

I was not aware of this. Looks like the previous updates were backported #7718, #6774.

The second one probably shouldn't have been. The first one went in before the final build candidate, which is fine. This is my understanding of our current policy, correct me if I'm wrong @cmacknz.

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @mauri870

@mauri870
Copy link
Member

@swiatekm Thanks for bringing this up today! Given the rationale about breaking changes, I agree that we shouldn't backport this to 9.0, as the breaking changes from elasticsearchexporter mapping::mode could break configuration that was previously working fine, which is not something a user would expect from a patch release.

@mauri870 mauri870 closed this Apr 29, 2025
@mergify mergify bot deleted the mergify/bp/9.0/pr-7725 branch April 29, 2025 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

4 participants