From 87ae10a48f43babf55ca6d4fb5e7da0a7605ad31 Mon Sep 17 00:00:00 2001
From: "Janik K." <10290002+led0nk@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:51:01 +0200
Subject: [PATCH] make update-otel (#34694)

**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 #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:

https://github.com/open-telemetry/opentelemetry-collector-contrib/commit/cfd83af71471ae54f6489355c47cac56c5f746e1#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6

I changed the source-file to `cmd/otelcontribcol/go.mod`
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1a94410d93c9..8c2bfa9ae94c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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