Skip to content

Commit

Permalink
make update-otel (open-telemetry#34694)
Browse files Browse the repository at this point in the history
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

**Link to tracking Issue:** <Issue number if applicable>
- Resolves open-telemetry#21632 

**Testing:** <Describe what testing was performed and which tests were
added.>

**Documentation:** <Describe the documentation added.>

So at first i reordered the `update-otel` command, because there was no
sense in first updating the builder-configs (with the use of go.mod
file) and then updating `go.mod`-files.

Furthermore since the main `go.mod`-file has moved:

open-telemetry@cfd83af#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6

I changed the source-file to `cmd/otelcontribcol/go.mod`
  • Loading branch information
led0nk authored and jriguera committed Oct 4, 2024
1 parent 7716bf9 commit 87ae10a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OTEL_STABLE_VERSION=main
VERSION=$(shell git describe --always --match "v[0-9]*" HEAD)
TRIMMED_VERSION=$(shell grep -o 'v[^-]*' <<< "$(VERSION)" | cut -c 2-)
CORE_VERSIONS=$(SRC_PARENT_DIR)/opentelemetry-collector/versions.yaml
GOMOD=$(SRC_ROOT)/go.mod
GOMOD=$(SRC_ROOT)/cmd/otelcontribcol/go.mod

COMP_REL_PATH=cmd/otelcontribcol/components.go
MOD_NAME=github.com/open-telemetry/opentelemetry-collector-contrib
Expand Down Expand Up @@ -387,9 +387,9 @@ update-otel:$(MULTIMOD)
git add . && git commit -s -m "[chore] multimod update stable modules" ; \
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash $(OTEL_VERSION)
git add . && git commit -s -m "[chore] multimod update beta modules" ; \
$(MAKE) gotidy
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml)
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/oteltestbedcol/builder-config.yaml)
$(MAKE) gotidy
$(MAKE) genotelcontribcol
$(MAKE) genoteltestbedcol
$(MAKE) oteltestbedcol
Expand Down

0 comments on commit 87ae10a

Please sign in to comment.