From 8b14ef2bdb5797442b3c29ad153aaea2f20b84b4 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Wed, 5 Jun 2024 10:43:26 -0700 Subject: [PATCH] disable go.work; run build-tools crosslink --- Makefile | 2 -- collector/cmd/otelarrowcol/go.mod | 20 +++++++++++++++++++ .../connector/validationconnector/go.mod | 2 ++ collector/exporter/fileexporter/go.mod | 2 ++ collector/exporter/otelarrowexporter/go.mod | 4 ++++ collector/receiver/otelarrowreceiver/go.mod | 4 ++++ collector/test/go.mod | 8 ++++++++ go.work => go.work.save | 0 8 files changed, 40 insertions(+), 2 deletions(-) rename go.work => go.work.save (100%) diff --git a/Makefile b/Makefile index 9386f019..34655388 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ multimod-prerelease: $(MULTIMOD) $(MULTIMOD) prerelease -s=true -b=false -v ./versions.yaml -m ${MODSET} # this is a hack to sync the otelarrowreceiver during this process # to avoid gomod ambigious imports. - (cd collector/receiver/otelarrowreceiver/ && $(GOCMD) work sync) $(MAKE) gotidy COMMIT?=HEAD @@ -123,7 +122,6 @@ genotelarrowcol: builder GOWORK="off" $(GOCMD) run ./tools/replacer fix GOWORK="off" $(BUILDER) --skip-compilation --config collector/otelarrowcol-build.yaml GOWORK="off" $(GOCMD) run ./tools/replacer fix - $(GOCMD) work sync $(MAKE) gotidy GOWORK="off" $(GOCMD) run ./tools/replacer unfix $(MAKE) gotidy diff --git a/collector/cmd/otelarrowcol/go.mod b/collector/cmd/otelarrowcol/go.mod index d47eb9cf..84fca59e 100644 --- a/collector/cmd/otelarrowcol/go.mod +++ b/collector/cmd/otelarrowcol/go.mod @@ -170,3 +170,23 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow/collector => ../.. + +replace github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor => ../../processor/concurrentbatchprocessor + +replace github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter => ../../exporter/otelarrowexporter + +replace github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter => ../../exporter/fileexporter + +replace github.com/open-telemetry/otel-arrow/collector/connector/validationconnector => ../../connector/validationconnector + +replace github.com/open-telemetry/otel-arrow => ../../.. + +replace github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver => ../../receiver/otelarrowreceiver + +replace github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver => ../../receiver/filereceiver + +replace github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor => ../../processor/obfuscationprocessor + +replace github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor => ../../processor/experimentprocessor diff --git a/collector/connector/validationconnector/go.mod b/collector/connector/validationconnector/go.mod index de0f47fd..66d45125 100644 --- a/collector/connector/validationconnector/go.mod +++ b/collector/connector/validationconnector/go.mod @@ -43,3 +43,5 @@ require ( google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow => ../../.. diff --git a/collector/exporter/fileexporter/go.mod b/collector/exporter/fileexporter/go.mod index 6fe36790..bf41f413 100644 --- a/collector/exporter/fileexporter/go.mod +++ b/collector/exporter/fileexporter/go.mod @@ -61,3 +61,5 @@ require ( google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow/collector => ../.. diff --git a/collector/exporter/otelarrowexporter/go.mod b/collector/exporter/otelarrowexporter/go.mod index 4cba229b..a842dcdc 100644 --- a/collector/exporter/otelarrowexporter/go.mod +++ b/collector/exporter/otelarrowexporter/go.mod @@ -93,3 +93,7 @@ require ( golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow/collector => ../.. + +replace github.com/open-telemetry/otel-arrow => ../../.. diff --git a/collector/receiver/otelarrowreceiver/go.mod b/collector/receiver/otelarrowreceiver/go.mod index eb92e690..f5d6f261 100644 --- a/collector/receiver/otelarrowreceiver/go.mod +++ b/collector/receiver/otelarrowreceiver/go.mod @@ -95,3 +95,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow/collector => ../.. + +replace github.com/open-telemetry/otel-arrow => ../../.. diff --git a/collector/test/go.mod b/collector/test/go.mod index ab791f24..86ad0795 100644 --- a/collector/test/go.mod +++ b/collector/test/go.mod @@ -96,3 +96,11 @@ require ( google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver => ../receiver/otelarrowreceiver + +replace github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter => ../exporter/otelarrowexporter + +replace github.com/open-telemetry/otel-arrow/collector => ../ + +replace github.com/open-telemetry/otel-arrow => ../.. diff --git a/go.work b/go.work.save similarity index 100% rename from go.work rename to go.work.save