Skip to content

[9.2] (backport #11671) Upgrade otel to 0.141.0 and 1.37.0 #11780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
dmathieu merged 2 commits into from
Dec 17, 2025
Merged

[9.2] (backport #11671) Upgrade otel to 0.141.0 and 1.37.0 #11780

dmathieu merged 2 commits into from
Dec 17, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2025

This runs the .ci/scripts/update-otel.sh script so it is upgraded to the latest release.

This is an automatic backport of pull request #11671 done by Mergify.

@dmathieu @mergify
Upgrade otel to 0.141.0 and 1.37.0 (#11671)
936564e 
* upgrade otel to 0.141.0 and 1.37.0

* upgrade components

* upgrade custom collector manifest too

* upgrade more docs

* restore the docs upgrade

* set telemetry factory

* upgrade profiling metrics

* remove now defunct profilingmetrics metrics

(cherry picked from commit ee439f1)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/edot/go.mod
#	internal/edot/go.sum
#	internal/pkg/otel/README.md
@mergify mergify bot requested review from a team as code owners December 12, 2025 18:07
@mergify mergify bot added the backport label Dec 12, 2025
@mergify mergify bot requested a review from a team as a code owner December 12, 2025 18:07
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 12, 2025
@mergify mergify bot requested review from pchila and ycombinator and removed request for a team December 12, 2025 18:07
@mergify
Copy link
Contributor Author

mergify bot commented Dec 12, 2025

Cherry-pick of ee439f1 has failed:

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

You are currently cherry-picking commit ee439f134.
  (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:
	new file:   changelog/fragments/1765186217-update-otel-components-to-v0.141.0.yaml
	modified:   internal/edot/otelcol/components.go
	modified:   internal/pkg/otel/samples/linux/profiles_metrics.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/edot/go.mod
	both modified:   internal/edot/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

@mergify mergify bot mentioned this pull request Dec 12, 2025
Merged
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Docs Label for the Observability docs team labels Dec 12, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 12, 2025

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 12, 2025

Pinging @elastic/ingest-docs (Team:Docs)

@mergify
Copy link
Contributor Author

mergify bot commented Dec 15, 2025

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 15, 2025 •
edited
Loading

💔 Build Failed

Failed CI Steps

History

cc @dmathieu

@ycombinator ycombinator force-pushed the mergify/bp/9.2/pr-11671 branch from 76467e7 to 3eef9dd Compare December 15, 2025 23:24
@dmathieu dmathieu merged commit 74c4ffb into 9.2 Dec 17, 2025
22 checks passed
@dmathieu dmathieu deleted the mergify/bp/9.2/pr-11671 branch December 17, 2025 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ycombinator ycombinator ycombinator approved these changes

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@dmathieu dmathieu

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @ycombinator @dmathieu