Revert "[chore] Use crosslink tidylist in make gotidy (#37142)" (#37173)

Reverts
#37142
as something with this change is not working as expected. Reverting for
now to unblock PRs.

See
#37170
and
#37172

Author: TylerHelmuth

.github/workflows/build-and-test.yml

@@ -221,10 +221,6 @@ jobs:
         run: |
           make crosslink
           git diff --exit-code || (echo 'Replace statements are out of date, please run "make crosslink" and commit the changes in this PR.' && exit 1)
-      - name: tidylist
-        run: |
-          make tidylist
-          git diff --exit-code || (echo 'Tidylist is out of date, please run "make tidylist" and commit the changes in this PR.' && exit 1)
       - name: Check for go mod dependency changes
         run: |
           make gotidy

Makefile

@@ -115,22 +115,9 @@ stability-tests: otelcontribcol
 gogci:
 	$(MAKE) $(FOR_GROUP_TARGET) TARGET="gci"
 
-# `internal/tidylist/tidylist.txt` lists modules in topological order, to ensure `go mod tidy` converges.
-# `make tidylist` will update this list.
-# We exclude otelcontribcol and oteltestbedcol as those modules are not gitted and may not be present.
-.PHONY: tidylist
-tidylist: $(CROSSLINK)
-	cd internal/tidylist && \
-	$(CROSSLINK) tidylist --validate --allow-circular allow-circular.txt tidylist.txt && \
-	sed -i.bak -E '/cmd\/otel(contrib|testbed)col/d' tidylist.txt && \
-	rm tidylist.txt.bak
-
 .PHONY: gotidy
 gotidy:
-	@for mod in $$(cat internal/tidylist/tidylist.txt); do \
-		echo "Tidying $$mod"; \
-		(cd $$mod && rm -rf go.sum && $(GOCMD) mod tidy -compat=1.22.0) || exit $?; \
-	done
+	$(MAKE) $(FOR_GROUP_TARGET) TARGET="tidy"
 
 .PHONY: remove-toolchain
 remove-toolchain:

internal/tidylist/allow-circular.txt

@@ -13,7 +13,7 @@ require (
 	github.com/jstemmer/go-junit-report v1.0.0
 	go.opentelemetry.io/build-tools/checkfile v0.15.0
 	go.opentelemetry.io/build-tools/chloggen v0.15.0
-	go.opentelemetry.io/build-tools/crosslink v0.16.0
+	go.opentelemetry.io/build-tools/crosslink v0.15.0
 	go.opentelemetry.io/build-tools/issuegenerator v0.15.0
 	go.opentelemetry.io/build-tools/multimod v0.15.0
 	go.opentelemetry.io/collector/cmd/builder v0.117.0
@@ -233,7 +233,7 @@ require (
 	gitlab.com/bosi/decorder v0.4.2 // indirect
 	go-simpler.org/musttag v0.13.0 // indirect
 	go-simpler.org/sloglint v0.7.2 // indirect
-	go.opentelemetry.io/build-tools v0.16.0 // indirect
+	go.opentelemetry.io/build-tools v0.15.0 // indirect
 	go.opentelemetry.io/collector/component v0.117.0 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect
 	go.opentelemetry.io/collector/confmap v1.23.0 // indirect