Make the telemtry a binary in Azure-cni image

Author: behzad-mir

Makefile

@@ -88,10 +88,6 @@ ACN_PACKAGE_PATH = github.com/Azure/azure-container-networking
 CNI_AI_PATH=$(ACN_PACKAGE_PATH)/telemetry.aiMetadata
 CNS_AI_PATH=$(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
 NPM_AI_PATH=$(ACN_PACKAGE_PATH)/npm.aiMetadata
-CNI_TELEMETRY_SIDECAR_DIR = $(REPO_ROOT)/cns/cni-telemetry-sidecar
-CNI_TELEMETRY_SIDECAR_BUILD_DIR = $(BUILD_DIR)/cni-telemetry-sidecar
-CNI_TELEMETRY_SIDECAR_AI_ID = $(CNI_AI_ID) # Reuse CNI AI ID
-CNI_TELEMETRY_SIDECAR_VERSION = $(CNS_VERSION) # Version follows CNS
 
 # Tool paths
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
@@ -154,7 +150,7 @@ ipv6-hp-bpf: ipv6-hp-bpf-binary ipv6-hp-bpf-archive
 azure-block-iptables: azure-block-iptables-binary azure-block-iptables-archive
 azure-ip-masq-merger: azure-ip-masq-merger-binary azure-ip-masq-merger-archive
 azure-iptables-monitor: azure-iptables-monitor-binary azure-iptables-monitor-archive
-cni-telemetry-sidecar: cni-telemetry-sidecar-binary cni-telemetry-sidecar-archive
+
 
 ##@ Versioning
 
@@ -239,15 +235,6 @@ azure-vnet-ipamv6-binary:
 azure-vnet-telemetry-binary:
 cd $(CNI_TELEMETRY_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) -X $(CNI_AI_PATH)=$(CNI_AI_ID) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
 
-# Build the Azure CNI Telemetry Sidecar binary.
-cni-telemetry-sidecar-binary: ## build cni-telemetry-sidecar binary.
-$(MKDIR) $(CNI_TELEMETRY_SIDECAR_BUILD_DIR)
-cd $(CNI_TELEMETRY_SIDECAR_DIR) && CGO_ENABLED=0 go build \
-	-v \
-	-o $(CNI_TELEMETRY_SIDECAR_BUILD_DIR)/azure-cni-telemetry-sidecar$(EXE_EXT) \
-	-ldflags "-X main.version=$(CNI_TELEMETRY_SIDECAR_VERSION) -X $(CNI_AI_PATH)=$(CNI_TELEMETRY_SIDECAR_AI_ID)" \
-	-gcflags="-dwarflocationlists=true" \
-	.
 # Build the Azure CLI network binary.
 acncli-binary:
 cd $(ACNCLI_DIR) && CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(ACN_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
@@ -315,7 +302,6 @@ CNS_IMAGE	= azure-cns
 NPM_IMAGE= azure-npm
 AZURE_IP_MASQ_MERGER_IMAGE= azure-ip-masq-merger
 AZURE_IPTABLES_MONITOR_IMAGE= azure-iptables-monitor
-CNI_TELEMETRY_SIDECAR_IMAGE = azure-cni-telemetry-sidecar
 
 ## Image platform tags.
 ACNCLI_PLATFORM_TAG?= $(subst /,-,$(PLATFORM))-$(ACN_VERSION)
@@ -329,7 +315,7 @@ CNS_WINDOWS_PLATFORM_TAG	?= $(subst /,-,$(PLATFORM))-$(CNS_VERSION)-$(OS_SKU_W
 NPM_PLATFORM_TAG?= $(subst /,-,$(PLATFORM))-$(NPM_VERSION)
 AZURE_IP_MASQ_MERGER_PLATFORM_TAG?= $(subst /,-,$(PLATFORM))-$(AZURE_IP_MASQ_MERGER_VERSION)
 AZURE_IPTABLES_MONITOR_PLATFORM_TAG?= $(subst /,-,$(PLATFORM))-$(AZURE_IPTABLES_MONITOR_VERSION)
-CNI_TELEMETRY_SIDECAR_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(CNI_TELEMETRY_SIDECAR_VERSION)
+
 
 qemu-user-static: ## Set up the host to run qemu multiplatform container builds.
 sudo $(CONTAINER_RUNTIME) run --rm --privileged multiarch/qemu-user-static --reset -p yes
@@ -610,35 +596,6 @@ npm-image-pull: ## pull cns container image.
 IMAGE=$(NPM_IMAGE) \
 TAG=$(NPM_PLATFORM_TAG)
 
-# cni-telemetry-sidecar
-
-cni-telemetry-sidecar-image-name: # util target to print the CNI telemetry sidecar image name
-@echo $(CNI_TELEMETRY_SIDECAR_IMAGE)
-
-cni-telemetry-sidecar-image-name-and-tag: # util target to print the CNI telemetry sidecar image name and tag.
- @echo $(IMAGE_REGISTRY)/$(CNI_TELEMETRY_SIDECAR_IMAGE):$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG)
-
-cni-telemetry-sidecar-image: ## build cni-telemetry-sidecar container image.
-$(MAKE) container \
- DOCKERFILE=cns/cni-telemetry-sidecar/Dockerfile \
- IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
- EXTRA_BUILD_ARGS='--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_TELEMETRY_SIDECAR_AI_ID) --build-arg VERSION=$(CNI_TELEMETRY_SIDECAR_VERSION)' \
- PLATFORM=$(PLATFORM) \
- TAG=$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG) \
- TARGET=$(OS) \
- OS=$(OS) \
- ARCH=$(ARCH)
-
-cni-telemetry-sidecar-image-push: ## push cni-telemetry-sidecar container image.
-$(MAKE) container-push \
- IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
- TAG=$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG)
-
-cni-telemetry-sidecar-image-pull: ## pull cni-telemetry-sidecar container image.
-$(MAKE) container-pull \
- IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
- TAG=$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG)
-
 ## Reusable targets for building multiplat container image manifests.
 
 IMAGE_ARCHIVE_DIR ?= $(shell pwd)
@@ -794,21 +751,6 @@ npm-skopeo-archive: ## export tar archive of multiplat container manifest.
 IMAGE=$(NPM_IMAGE) \
 TAG=$(NPM_VERSION)
 
-cni-telemetry-sidecar-manifest-build: ## build cni-telemetry-sidecar multiplat container manifest.
-$(MAKE) manifest-build \
- PLATFORMS="$(PLATFORMS)" \
- IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
- TAG=$(CNI_TELEMETRY_SIDECAR_VERSION)
-
-cni-telemetry-sidecar-manifest-push: ## push cni-telemetry-sidecar multiplat container manifest
-$(MAKE) manifest-push \
- IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
- TAG=$(CNI_TELEMETRY_SIDECAR_VERSION)
-
-cni-telemetry-sidecar-skopeo-archive: ## export tar archive of cni-telemetry-sidecar multiplat container manifest.
-$(MAKE) manifest-skopeo-archive \
- IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
- TAG=$(CNI_TELEMETRY_SIDECAR_VERSION)
 
 ########################### Archives ################################
 

cni/Dockerfile

@@ -22,6 +22,7 @@ RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet -trimpath -ldflags
 RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet-telemetry -trimpath -ldflags "-s -w -X main.version="$VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" -gcflags="-dwarflocationlists=true" cni/telemetry/service/telemetrymain.go
 RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet-ipam -trimpath -ldflags "-s -w -X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" cni/ipam/plugin/main.go
 RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet-stateless -trimpath -ldflags "-s -w -X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" cni/network/stateless/main.go
+RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-cni-telemetry-sidecar -trimpath -ldflags "-X main.version=$VERSION" -gcflags="-dwarflocationlists=true" ./cns/cni-telemetry-sidecar
 
 FROM mariner-core AS compressor
 ARG OS

cns/cni-telemetry-sidecar/Dockerfile

@@ -36,7 +36,7 @@ func main() {
 zap.String("configPath", *configPath),
 zap.String("logLevel", *logLevel),
 zap.Bool("hasBuiltInAIKey", currentAIMetadata != ""),
-zap.String("aiKeyPrefix", maskAIKey(currentAIMetadata)))
+zap.String("aiKeyPrefix", MaskAIKey(currentAIMetadata)))
 
 // Create and configure telemetry sidecar
 // Pass the configPath to NewTelemetrySidecar (it expects a string parameter)

cns/cni-telemetry-sidecar/main.go

@@ -182,8 +182,8 @@ func (s *TelemetrySidecar) startTelemetryService(ctx context.Context, config tel
 if s.logger.Level() == zap.DebugLevel {
 currentAIMetadata := telemetry.GetAIMetadata()
 s.logger.Debug("AI telemetry status",
-zap.String("buildTimeAIMetadata", maskAIKey(currentAIMetadata)),
-zap.String("resolvedAIKey", maskAIKey(aiKey)),
+zap.String("buildTimeAIMetadata", MaskAIKey(currentAIMetadata)),
+zap.String("resolvedAIKey", MaskAIKey(aiKey)),
 zap.Bool("aiMetadataSet", currentAIMetadata != ""))
 }
 
@@ -260,7 +260,7 @@ func (s *TelemetrySidecar) startTelemetryService(ctx context.Context, config tel
 }
 
 // Helper function to mask AI key for logging
-func maskAIKey(aiKey string) string {
+func MaskAIKey(aiKey string) string {
 if len(aiKey) <= 8 {
 return aiKey
 }