fix error - sed command

open-telemetry · Jan 3, 2025 · df61362 · df61362
1 parent 10fe839
commit df61362
Show file tree

Hide file tree

Showing 16 changed files with 5,355 additions and 6,089 deletions.
diff --git a/pkg/translator/jaeger/Makefile.Thrift.mk b/pkg/translator/jaeger/Makefile.Thrift.mk
@@ -7,6 +7,16 @@ THRIFT=docker run --rm -u ${shell id -u} -v "${PWD}:/data" $(THRIFT_IMG) thrift
 THRIFT_GO_ARGS=thrift_import="github.com/apache/thrift/lib/go/thrift"
 THRIFT_GEN_DIR=thrift-gen
 
+JAEGER_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger
+
+# sed on Mac does not support the same syntax for in-place updates as sed on Linux
+# When running on MacOS it's best to install gsed and run Makefile with SED=gsed
+ifeq ($(GOOS),darwin)
+	SED=gsed
+else
+	SED=sed
+endif
+
 .PHONY: thrift-image
 thrift-image:
 	$(THRIFT) -version

diff --git a/pkg/translator/jaeger/thrift-gen/agent/GoUnusedProtection__.go b/pkg/translator/jaeger/thrift-gen/agent/GoUnusedProtection__.go
diff --git a/pkg/translator/jaeger/thrift-gen/agent/agent-consts.go b/pkg/translator/jaeger/thrift-gen/agent/agent-consts.go