chore: Upgrade otel core to v114 #1714
Conversation
|
oh yeah for v108 I removed ef1d4d4#diff-e8782025fe5d59d3c20654fab229e808933fbb3941c607950f88c694a58051dcL81 |
|
@chan-tim-sumo I have added the check for ensuring builder version back in the Makefile. |
rnishtala-sumo
force-pushed
the
update-otel-114
branch
from
0a98a1e to
ea9c936
Compare
rnishtala-sumo
force-pushed
the
update-otel-114
branch
from
bb06233 to
4217617
Compare
| @@ -193,7 +193,7 @@ jobs: | |||
| run: | | |||
| binary=${{ steps.set-binary-name.outputs.binary_name }} | |||
| binary_path=otelcolbuilder/cmd/${binary} | |||
| ./ci/get_version_from_binary.sh otc "${binary_path}" | |||
| ./ci/get_version_from_binary.sh core "${binary_path}" | |||
There was a problem hiding this comment.
The script doesn't have an otc argument. This wasn't working before
Makefile
Outdated
| OT_CONTRIB_VERSION := $(shell grep --max-count=1 '^ - gomod: github\.com/open-telemetry/opentelemetry-collector-contrib/' otelcolbuilder/.otelcol-builder.yaml | cut -d " " -f 6 | $(SED) "s/v//") | ||
| # usage: make update-ot OT_CORE_NEW=x.x.x OT_CONTRIB_NEW=y.y.y | ||
| .PHONY: update-ot | ||
| update-ot: install-gsed | ||
| @test $(OT_CORE_NEW) || (echo "usage: make update-ot OT_CORE_NEW=x.x.x OT_CONTRIB_NEW=y.y.y"; exit 1); | ||
| @test $(OT_CONTRIB_NEW) || (echo "usage: make update-ot OT_CORE_NEW=x.x.x OT_CONTRIB_NEW=y.y.y"; exit 1); | ||
| @echo "Updating OT core from $(OT_CORE_VERSION) to $(OT_CORE_NEW) and OT contrib from $(OT_CONTRIB_VERSION) to $(OT_CONTRIB_NEW)" | ||
| $(SED) -i "s/\(otelcol_version:\) $(OT_CORE_VERSION)$$/\1 $(OT_CORE_NEW)/" otelcolbuilder/.otelcol-builder.yaml | ||
| $(SED) -i "s/\(version:\) $(OT_CORE_VERSION)$$/\1 $(OT_CORE_NEW)/" otelcolbuilder/.otelcol-builder.yaml |
There was a problem hiding this comment.
As discussed, let’s not use sed for editing yaml files 😅
There was a problem hiding this comment.
yeah, it was sed originally, I changed to use yq in some places. I'll change this too.
There was a problem hiding this comment.
@echlebek I used yq to edit the version in the builder config. Replacing the version in all the dependencies listed in the builder config using yq seems tricky. Open to suggestions. Seems like we need to use regex along with yq which defeats the purpose of using it maybe? The alternative is to replace each dep line by line which seems inefficient.
@echlebek yes I'm pretty sure, |
| @@ -102,7 +102,7 @@ endif | |||
|
|
|||
| .PHONY: _builder | |||
| _builder: | |||
| $(eval VERSION ?= $(shell git describe --tags --abbrev=5 --match "v[0-9]*")) | |||
| $(eval VERSION ?= $(shell git describe --tags --abbrev=5 --match "v[0-9]*"| sed 's/^v//')) | |||
There was a problem hiding this comment.
Remove the prefix (v) from the version
There was a problem hiding this comment.
cc: @amdprophet
Upgrade otel core to v114. Notable changes include
otel_versionrenamed toversion