chore: Upgrade otel core to v114 #1714

rnishtala-sumo · 2024-11-27T23:27:00Z

Upgrade otel core to v114. Notable changes include

Remove the sumologicexporter (Deprecated) There are upstream API breaking changes that cause errors in this deprecated module. Removing it.
Remove the syslog exporter (Deprecated)
Remove loggingexporter (Deprecated)
Remove ballastextension (Deprecated)
Changes to the processhelper function names because of API breaking changes
Remove deprecated flags from OtelColBuilder
- --go
- --version
- otel_version renamed to version

chan-tim-sumo · 2024-11-28T01:06:23Z

oh yeah for v108 I removed ensure-correct-builder-version in the Makefile cause there was a build version format error from upstream which was stopping the v108 upgrade from happening. That build version format fix was merged in starting v110, should this be added back?

ef1d4d4#diff-e8782025fe5d59d3c20654fab229e808933fbb3941c607950f88c694a58051dcL81

rnishtala-sumo · 2024-12-02T19:17:36Z

@chan-tim-sumo I have added the check for ensuring builder version back in the Makefile.

rnishtala-sumo · 2024-12-03T16:48:07Z

.github/workflows/workflow-build.yml

@@ -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}"


The script doesn't have an otc argument. This wasn't working before

echlebek

I’m a little confused by the change from otelcol_version to version in the yaml. Are you sure about it?

echlebek · 2024-12-03T17:16:36Z

Makefile

 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


As discussed, let’s not use sed for editing yaml files 😅

yeah, it was sed originally, I changed to use yq in some places. I'll change this too.

@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.

I was able replace sed with yq for the builder config here - 182cf62

rnishtala-sumo · 2024-12-03T18:03:23Z

I’m a little confused by the change from otelcol_version to version in the yaml. Are you sure about it?

@echlebek yes I'm pretty sure, otelcol_version isn't recognized as a config option anymore. We're expected to use version instead.

rnishtala-sumo · 2024-12-03T19:35:16Z

otelcolbuilder/Makefile

@@ -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//'))


Remove the prefix (v) from the version

cc: @amdprophet

This it out of date: https://github.com/SumoLogic/sumologic-otel-collector/blob/main/otelcolbuilder/Makefile. You may want to merge main into this branch before merging as there are quite a few changes to the Makefile.

I rebased and pushed the changes.

chan-tim-sumo

💪 approved, but quick question:

i'm assuming ensure-correct-builder-version isn't needed anymore? since probably after this ugrade, we're gonna be moving to the packaging to let it do this for us? 🤔

…ic exporter will be used

…nges

… (v) prefix

rnishtala-sumo requested a review from a team as a code owner November 27, 2024 23:27

rnishtala-sumo force-pushed the update-otel-114 branch 2 times, most recently from bb06233 to 4217617 Compare December 3, 2024 03:05

rnishtala-sumo commented Dec 3, 2024

View reviewed changes

echlebek requested changes Dec 3, 2024

View reviewed changes

rnishtala-sumo added the do-not-merge/hold label Dec 3, 2024

rnishtala-sumo commented Dec 3, 2024

View reviewed changes

rnishtala-sumo removed the do-not-merge/hold label Dec 3, 2024

rnishtala-sumo requested a review from echlebek December 3, 2024 21:47

rnishtala-sumo force-pushed the update-otel-114 branch 2 times, most recently from 2bc695f to ac2a0e8 Compare December 16, 2024 17:21

rnishtala-sumo requested a review from a team December 17, 2024 16:19

chan-tim-sumo approved these changes Dec 17, 2024

View reviewed changes

rnishtala-sumo force-pushed the update-otel-114 branch from fa95a95 to 182cf62 Compare December 18, 2024 16:45

rnishtala-sumo added 12 commits December 18, 2024 13:18

chore: Upgrade otel core to v114

add3147

Remove the sumologic exporter after deprecation. The upstream sumolog…

f3511d4

…ic exporter will be used

Remove the deprecated syslog exporter after upstream API breaking cha…

ab0ac66

…nges

Address API breaking changes in the collector processor

413cd4c

Ensure that the otelcol builder version is correct

fc93191

Address API breaking changes in the receiver factory

b4ce645

Removing deprecated links from Readme

e252466

Get the correct version from the binary

bdb94bc

Fix an issue with the arguments passed to get_version_from_binary

faf6369

Use yq to edit the version in builder config. Also remove the version…

024a859

… (v) prefix

Adding the awskinesisexporter and updating go toolchain to 1.22.8

b16bec0

Replace SED with YQ for updating the version in builder config

3d85003

rnishtala-sumo force-pushed the update-otel-114 branch from 182cf62 to 3d85003 Compare December 18, 2024 18:19

echlebek approved these changes Dec 18, 2024

View reviewed changes

rnishtala-sumo merged commit c36e934 into main Dec 18, 2024
42 checks passed

rnishtala-sumo deleted the update-otel-114 branch December 18, 2024 20:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Upgrade otel core to v114 #1714

chore: Upgrade otel core to v114 #1714

rnishtala-sumo commented Nov 27, 2024 •

edited

Loading

chan-tim-sumo commented Nov 28, 2024

rnishtala-sumo commented Dec 2, 2024

rnishtala-sumo Dec 3, 2024

echlebek left a comment

echlebek Dec 3, 2024

rnishtala-sumo Dec 3, 2024 •

edited

Loading

rnishtala-sumo Dec 3, 2024 •

edited

Loading

rnishtala-sumo Dec 18, 2024 •

edited

Loading

rnishtala-sumo commented Dec 3, 2024

rnishtala-sumo Dec 3, 2024

rnishtala-sumo Dec 3, 2024

amdprophet Dec 18, 2024

rnishtala-sumo Dec 18, 2024

chan-tim-sumo left a comment •

edited

Loading

chore: Upgrade otel core to v114 #1714

chore: Upgrade otel core to v114 #1714

Conversation

rnishtala-sumo commented Nov 27, 2024 • edited Loading

chan-tim-sumo commented Nov 28, 2024

rnishtala-sumo commented Dec 2, 2024

rnishtala-sumo Dec 3, 2024

Choose a reason for hiding this comment

echlebek left a comment

Choose a reason for hiding this comment

echlebek Dec 3, 2024

Choose a reason for hiding this comment

rnishtala-sumo Dec 3, 2024 • edited Loading

Choose a reason for hiding this comment

rnishtala-sumo Dec 3, 2024 • edited Loading

Choose a reason for hiding this comment

rnishtala-sumo Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

rnishtala-sumo commented Dec 3, 2024

rnishtala-sumo Dec 3, 2024

Choose a reason for hiding this comment

rnishtala-sumo Dec 3, 2024

Choose a reason for hiding this comment

amdprophet Dec 18, 2024

Choose a reason for hiding this comment

rnishtala-sumo Dec 18, 2024

Choose a reason for hiding this comment

chan-tim-sumo left a comment • edited Loading

Choose a reason for hiding this comment

rnishtala-sumo commented Nov 27, 2024 •

edited

Loading

rnishtala-sumo Dec 3, 2024 •

edited

Loading

rnishtala-sumo Dec 3, 2024 •

edited

Loading

rnishtala-sumo Dec 18, 2024 •

edited

Loading

chan-tim-sumo left a comment •

edited

Loading