diff options
| author | Shulhan <ms@kilabit.info> | 2025-05-18 09:57:08 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2025-05-18 12:33:14 +0700 |
| commit | abe93f71e3f2f608c72db37b21f5c42460088250 (patch) | |
| tree | 24b9f965fae59faaf1af3378ae2a5cd142979a30 /0002-builds_otel.sh.patch | |
| parent | d8c85bf1963fe4135b9e62f5d0933a7df2b4ea36 (diff) | |
| download | google-cloud-ops-agent-git-abe93f71e3f2f608c72db37b21f5c42460088250.tar.xz | |
all: fix building otel due to fixed go binary path
Diffstat (limited to '0002-builds_otel.sh.patch')
| -rw-r--r-- | 0002-builds_otel.sh.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/0002-builds_otel.sh.patch b/0002-builds_otel.sh.patch new file mode 100644 index 0000000..72bc5e6 --- /dev/null +++ b/0002-builds_otel.sh.patch @@ -0,0 +1,22 @@ +diff --git a/builds/otel.sh b/builds/otel.sh +index bcb48744f..53eb8cd3d 100755 +--- a/builds/otel.sh ++++ b/builds/otel.sh +@@ -48,8 +48,8 @@ if [ "$SKIP_OTEL_JAVA" != "true" ]; then + fi + + cd submodules/opentelemetry-operations-collector/otelopscol +-ARCH=$(/usr/local/go/bin/go env GOARCH) +-GO_BIN=/usr/local/go/bin/go \ ++ARCH=$(/usr/bin/go env GOARCH) ++GO_BIN=/usr/bin/go \ + BUILDARCH=$ARCH \ + TARGETARCH=$ARCH \ + COLLECTOR_LD_FLAGS="$LDFLAGS" \ +diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector +index 01c0ad26a..4024ba501 160000 +--- a/submodules/opentelemetry-operations-collector ++++ b/submodules/opentelemetry-operations-collector +@@ -1 +1 @@ +-Subproject commit 01c0ad26ae5cc512632d1a6f8908dcd69aa5f840 ++Subproject commit 4024ba501448a4b312932fb213fc562f4388d1f0 |