Skip to content

Commit c9fd1ae

Browse files
mergify[bot]andrzej-stencelCopilot
authored
[9.4](backport #51684) chore: update OTel Collector dependencies to v0.155.0/v1.61.0 (#51702)
* 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/pipeline.xpack.otel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ steps:
5555
- label: ":ubuntu: x-pack/otel: Build OTel Collector Distribution"
5656
key: "x-pack-otel-mandatory-build-distro"
5757
command: |
58-
go install go.opentelemetry.io/collector/cmd/builder@v0.150.0
58+
go install go.opentelemetry.io/collector/cmd/builder@v0.155.0
5959
mv $(go env GOPATH)/bin/builder $(go env GOPATH)/bin/ocb
6060
cd x-pack/otel
6161
RACE=1 mage buildOtelDistro

0 commit comments

Comments
 (0)