Skip to content

Conversation

@mauri870
Copy link
Member

@mauri870 mauri870 commented Apr 7, 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

@mauri870 mauri870 added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-8.x Automated backport to the 8.x branch with mergify backport-9.0 Automated backport to the 9.0 branch labels Apr 7, 2025
@mauri870 mauri870 self-assigned this Apr 7, 2025
@mauri870 mauri870 marked this pull request as ready for review April 7, 2025 10:57
@mauri870 mauri870 requested a review from a team as a code owner April 7, 2025 10:57
@mauri870 mauri870 requested review from blakerouse and kaanyalti April 7, 2025 10:57
@elasticmachine
Copy link
Contributor

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

@kaanyalti
Copy link

@mauri870 Can you please take a look at the failing CI steps? The changes look good to me, but need passing CI before approving.

@mauri870
Copy link
Member Author

mauri870 commented Apr 16, 2025

@mauri870 Can you please take a look at the failing CI steps? The changes look good to me, but need passing CI before approving.

Thanks for the preliminary review. The CI failures seems to be related with the update, I'm still sorting these out.

@mauri870 mauri870 marked this pull request as draft April 16, 2025 20:46
@mergify
Copy link
Contributor

mergify bot commented Apr 17, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b otel-122 upstream/otel-122
git merge upstream/main
git push upstream otel-122

@mauri870
Copy link
Member Author

/test

@swiatekm
Copy link
Contributor

It may be simpler to wait for #7936 first.

@mauri870 mauri870 marked this pull request as ready for review April 24, 2025 15:30
@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @mauri870

@mauri870 mauri870 requested a review from swiatekm April 24, 2025 18:39
@mauri870 mauri870 merged commit fb3a575 into elastic:main Apr 25, 2025
12 checks passed
mergify bot pushed a commit that referenced this pull request Apr 25, 2025
* 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 bot pushed a commit that referenced this pull request Apr 25, 2025
* 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
pierrehilbert pushed a commit that referenced this pull request Apr 29, 2025
)

* chore: update OTel components to v0.122.0 (#7725)

* 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

* fix conflicts

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.0 Automated backport to the 9.0 branch 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.

4 participants