fix: make the collector architecture match the image architecture (#154)

Co-authored-by: CircleCI <[email protected]>

Author: harelmo-lumigo

.circleci/config.yml

@@ -24,6 +24,7 @@ workflows:
 
     - lumigo-orb/prep-it-resources:
         context: common
+        venv_python_version: "3.9"
         requires:
           - lumigo-orb/is_environment_available
 

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

@@ -569,7 +569,7 @@ jobs:
         env:
           PROXY_IMG: ${{ matrix.ecr-registry }}/lumigo/lumigo-kubernetes-telemetry-proxy:${{ needs.validate-release-increment.outputs.version }}
         run: |
-          make docker-buildx-telemetry-proxy
+          make verify-telemetry-proxy-arch docker-buildx-telemetry-proxy
 
   publish-watchdog-ecr-image:
     strategy:

Makefile

@@ -15,6 +15,8 @@ ENVTEST_K8S_VERSION = 1.28.0
 
 GOCMD?= go
 
+POST_BUILD_FLAG ?= --push
+
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell $(GOCMD) env GOBIN))
 GOBIN=$(shell $(GOCMD)go env GOPATH)/bin
@@ -122,7 +124,10 @@ docker-push: ## Push docker image with the manager.
 # - have enable BuildKit, More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 # - be able to push the image for your registry (i.e. if you do not inform a valid value via CONTROLLER_IMG=<myregistry/image:<tag>> than the export will fail)
 # To properly provided solutions that supports more than one platform you should use this option.
-PLATFORMS ?= linux/arm64,linux/amd64 #,linux/s390x,linux/ppc64le
+PLATFORM_ARRAY := linux/arm64 linux/amd64 # linux/s390x linux/ppc64le
+# Convert the array to a comma-separated string for docker buildx
+PLATFORMS ?= $(shell echo $(PLATFORM_ARRAY) | sed 's/ /,/g')
+
 .PHONY: docker-buildx
 docker-buildx: test docker-buildx-manager docker-buildx-telemetry-proxy docker-buildx-watchdog  ## Build and push docker image for the manager for cross-platform support
 
@@ -136,15 +141,33 @@ docker-buildx-manager: ## Build and push docker image for the manager for cross-
 	docker buildx rm project-v3-builder && \
 	rm Dockerfile.cross )
 
+.PHONY: verify-telemetry-proxy-arch
+verify-telemetry-proxy-arch:
+	@for platform in $(PLATFORM_ARRAY); do \
+		arch=$$(echo $$platform | cut -d'/' -f2); \
+		$(MAKE) docker-buildx-telemetry-proxy PLATFORMS=$$platform IMG_VERSION=${IMG_VERSION}-$$arch POST_BUILD_FLAG=--load; \
+		image_arch=$$(docker inspect ${PROXY_IMG}-$$arch | jq -r '.[] | select(.RepoTags[0] == "${PROXY_IMG}-'$$arch'") | .Architecture'); \
+		file_output=$$(docker run --rm --entrypoint="" "${PROXY_IMG}-$$arch" sh -c "apk add --no-cache --quiet file >/dev/null 2>&1; file -b /lumigo/bin/otelcol"); \
+		if [[ "$$arch" == "arm64" && ! "$$file_output" =~ ARM|aarch64 ]]; then \
+			echo "Architecture mismatch: $$arch container should contain ARM binary but found: $$file_output"; \
+			exit 1; \
+		elif [[ "$$arch" == "amd64" && ! "$$file_output" =~ x86-64|x86_64|AMD64 ]]; then \
+			echo "❌ Architecture mismatch: $$arch container should contain x86_64 binary but found: $$file_output"; \
+			exit 1; \
+		fi; \
+		echo "✅ Architecture verification passed for $$arch"; \
+	done
+
 .PHONY: docker-buildx-telemetry-proxy
 docker-buildx-telemetry-proxy: ## Build and push docker image for the manager for cross-platform support
-	( cd telemetryproxy && \
+	(cd telemetryproxy && \
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross && \
+	docker buildx rm project-v3-builder >/dev/null 2>&1 || true && \
 	docker buildx create --name project-v3-builder && \
 	docker buildx use project-v3-builder && \
-	docker buildx build --push --provenance=false --platform=$(PLATFORMS) --tag ${PROXY_IMG} -f Dockerfile.cross --build-arg "version=$(VERSION)" . && \
+	docker buildx build $(POST_BUILD_FLAG) --provenance=false --platform=$(PLATFORMS) --tag ${PROXY_IMG} -f Dockerfile.cross --build-arg "version=$(VERSION)" . && \
 	docker buildx rm project-v3-builder && \
-	rm Dockerfile.cross )
+	rm Dockerfile.cross)
 
 .PHONY: docker-buildx-watchdog
 docker-buildx-watchdog: ## Build and push docker image for the watchdog for cross-platform support

telemetryproxy/Dockerfile

@@ -2,14 +2,17 @@
 FROM golang:1.23-alpine AS telemetry-proxy-builder
 
 ARG version='dev'
+ARG TARGETOS
+ARG TARGETARCH
+
 ENV VERSION=${version}
 
 RUN apk add --update make git
 
 ADD ./src /src
 WORKDIR /src
 
-RUN make VERSION=${VERSION} OTELCONTRIBCOL_FILENAME=otelcontribcol otelcontribcolbuilder
+RUN make VERSION=${VERSION} GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} OTELCONTRIBCOL_FILENAME=otelcontribcol otelcontribcolbuilder
 
 # We need to chmod files to fit the expected uid and gid
 # at runtime. Since we do not want to depend on buildkit,

telemetryproxy/src/Makefile

@@ -49,5 +49,5 @@ otelcontribcolbuilder: install-tools $(BUILDER)
 	# Split source generation and compilation in two steps, because the GOARCH and GOOS may be different when cross-compiling
 	mkdir -p ./dist
 	$(BUILDER) --skip-compilation --config ./builder/config.yaml --version $(VERSION)
-	cd ./dist/ && GOOS= GOARCH= CGO_ENABLED=0 $(GOCMD) build -trimpath -o $(OTELCONTRIBCOL_FILENAME) \
+	cd ./dist/ && GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 $(GOCMD) build -trimpath -o $(OTELCONTRIBCOL_FILENAME) \
 		$(BUILD_INFO) -tags $(GO_BUILD_TAGS) .