From c3d106f379ceedb37b94add39ee20e01ecaff84d Mon Sep 17 00:00:00 2001
From: Alex Boten <aboten@lightstep.com>
Date: Tue, 28 Nov 2023 08:36:14 -0800
Subject: [PATCH] [chore] revert make update-otel (#29537)

This is to unblock the release, will work on bringing it back after the
release.

Signed-off-by: Alex Boten <aboten@lightstep.com>
---
 Makefile        | 10 +++++++---
 Makefile.Common |  5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7edba78208e8..e121bec77122 100644
--- a/Makefile
+++ b/Makefile
@@ -286,10 +286,14 @@ telemetrygen:
 	cd ./cmd/telemetrygen && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/telemetrygen_$(GOOS)_$(GOARCH)$(EXTENSION) \
 		-tags $(GO_BUILD_TAGS) .
 
+.PHONY: update-dep
+update-dep:
+	$(MAKE) $(FOR_GROUP_TARGET) TARGET="updatedep"
+	$(MAKE) otelcontribcol
+
 .PHONY: update-otel
-update-otel:$(MULTIMOD)
-	$(MULTIMOD) sync -a=true -s=true -o ../opentelemetry-collector --commit-hash $(OTEL_STABLE_VERSION)
-	$(MAKE) gotidy
+update-otel:
+	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector VERSION=$(OTEL_VERSION) RC_VERSION=$(OTEL_RC_VERSION) STABLE_VERSION=$(OTEL_STABLE_VERSION)
 
 .PHONY: otel-from-tree
 otel-from-tree:
diff --git a/Makefile.Common b/Makefile.Common
index 248623af25cd..be080026e0cf 100644
--- a/Makefile.Common
+++ b/Makefile.Common
@@ -203,3 +203,8 @@ moddownload:
 gci: $(TOOLS_BIN_DIR)/gci
 	@echo "running $(GCI)"
 	@$(GCI) write -s standard -s default -s "prefix(github.com/open-telemetry/opentelemetry-collector-contrib)" $(ALL_SRC_AND_DOC)
+
+.PHONY: updatedep
+updatedep:
+	$(PWD)/internal/buildscripts/update-dep
+	@$(MAKE) tidy