Commit c9fd1ae
* chore: update OTel Collector dependencies to `v0.155.0`/`v1.61.0` (#51684)
* chore: update OTel Collector dependencies to `v0.155.0`/`v1.61.0`
sed -i '' "s/\(go\.opentelemetry\.io\/collector.*\) v0\.154.0/\1 v0.155.0/" go.mod
sed -i '' "s/\(go\.opentelemetry\.io\/collector.*\) v1\.60.0/\1 v1.61.0/" go.mod
sed -i '' "s/\(github.com\/open-telemetry\/opentelemetry-collector-contrib\/.*\) v0\.154.0/\1 v0.155.0/" go.mod
* go mod tidy && make notice
* chore: update distro version
(cherry picked from commit 539bc0e)
# Conflicts:
# NOTICE.txt
# go.mod
# go.sum
* fix: resolve go.mod conflicts keeping v0.155.0/v1.61.0 versions, run go mod tidy and make notice
---------
Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 6154486 commit c9fd1ae
5 files changed
Lines changed: 586 additions & 551 deletions
File tree
- .buildkite/x-pack
- x-pack/otel/distributions/beats-otel-collector
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
0 commit comments