Skip to content

Commit

Permalink
disable go.work; run build-tools crosslink
Browse files Browse the repository at this point in the history
  • Loading branch information
jmacd committed Jun 5, 2024
1 parent 36e44dc commit 8b14ef2
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions collector/cmd/otelarrowcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions collector/connector/validationconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../../..
2 changes: 2 additions & 0 deletions collector/exporter/fileexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../..
4 changes: 4 additions & 0 deletions collector/exporter/otelarrowexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../../..
4 changes: 4 additions & 0 deletions collector/receiver/otelarrowreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../../..
8 changes: 8 additions & 0 deletions collector/test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../..
File renamed without changes.

0 comments on commit 8b14ef2

Please sign in to comment.