[chore] re-enabled multimod sync for make update-otel

This was reverted during the last release due to a bug that was fixed in multimod

Makefile

@@ -3,7 +3,6 @@ include ./Makefile.Common
 RUN_CONFIG?=local/config.yaml
 CMD?=
 OTEL_VERSION=main
-OTEL_RC_VERSION=main
 OTEL_STABLE_VERSION=main
 
 VERSION=$(shell git describe --always --match "v[0-9]*" HEAD)
@@ -286,14 +285,13 @@ 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:
- $(MAKE) update-dep MODULE=go.opentelemetry.io/collector VERSION=$(OTEL_VERSION) RC_VERSION=$(OTEL_RC_VERSION) STABLE_VERSION=$(OTEL_STABLE_VERSION)
+update-otel:$(MULTIMOD)
+ $(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m stable --commit-hash $(OTEL_STABLE_VERSION)
+ 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
 
 .PHONY: otel-from-tree
 otel-from-tree:

Makefile.Common

@@ -204,8 +204,3 @@ 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

internal/tools/go.mod

@@ -14,7 +14,7 @@ require (
  go.opentelemetry.io/build-tools/chloggen v0.12.0
  go.opentelemetry.io/build-tools/crosslink v0.12.0
  go.opentelemetry.io/build-tools/issuegenerator v0.12.0
- go.opentelemetry.io/build-tools/multimod v0.12.1-0.20231124155756-0ec5f4bfc9d9
+ go.opentelemetry.io/build-tools/multimod v0.12.1-0.20231204163844-65cb44949ef5
  go.opentelemetry.io/collector/cmd/builder v0.90.1
  golang.org/x/tools v0.15.0
  golang.org/x/vuln v1.0.1
@@ -77,7 +77,7 @@ require (
  github.com/go-critic/go-critic v0.9.0 // indirect
  github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
  github.com/go-git/go-billy/v5 v5.5.0 // indirect
- github.com/go-git/go-git/v5 v5.10.0 // indirect
+ github.com/go-git/go-git/v5 v5.10.1 // indirect
  github.com/go-toolsmith/astcast v1.1.0 // indirect
  github.com/go-toolsmith/astcopy v1.1.0 // indirect
  github.com/go-toolsmith/astequal v1.1.0 // indirect
@@ -183,7 +183,7 @@ require (
  github.com/sivchari/containedctx v1.0.3 // indirect
  github.com/sivchari/nosnakecase v1.7.0 // indirect
  github.com/sivchari/tenv v1.7.1 // indirect
- github.com/skeema/knownhosts v1.2.0 // indirect
+ github.com/skeema/knownhosts v1.2.1 // indirect
  github.com/sonatard/noctx v0.0.2 // indirect
  github.com/sourcegraph/conc v0.3.0 // indirect
  github.com/sourcegraph/go-diff v0.7.0 // indirect
@@ -226,7 +226,7 @@ require (
  golang.org/x/net v0.18.0 // indirect
  golang.org/x/oauth2 v0.12.0 // indirect
  golang.org/x/sync v0.5.0 // indirect
- golang.org/x/sys v0.14.0 // indirect
+ golang.org/x/sys v0.15.0 // indirect
  golang.org/x/text v0.14.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  google.golang.org/protobuf v1.31.0 // indirect