Skip to content

Commit

Permalink
[8.17](backport #6384) Update OTel v0.116.0 (#6391)
Browse files Browse the repository at this point in the history 
* Update OTel v0.116.0 (#6384)

* sed -i 's/\(go\.opentelemetry\.io\/collector.*\) v0\.115\.0/\1 v0.116.0/' go.mod

* sed -i 's/\(go\.opentelemetry\.io\/collector.*\) v1\.21\.0/\1 v1.22.0/' go.mod

* sed -i 's/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) v0\.115\.0/\1 v0.116.0/' go.mod

* go mod tidy

* mage notice

* mage otel:readme

* add changelog entry

(cherry picked from commit b1fa909)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md

* fix backport conflicts in go.mod

* go mod tidy

* mage notice

* mage otel:readme

---------

Co-authored-by: Andrzej Stencel <[email protected]>
  • Loading branch information
@mergify @andrzej-stencel
mergify[bot] and andrzej-stencel authored Dec 19, 2024
1 parent 8bb538e commit c12de54
Show file tree
Hide file tree
Showing 5 changed files with 893 additions and 647 deletions.
Loading

0 comments on commit c12de54

Please sign in to comment.