fix: move the tag adding logic inside blobfuse-proxy code

This commit moves the logic to add tag to blobfuse-proxy
service. If user specifies --telemetry=tire1 as mount
option then add azpartner-aks/v1.28.0 value as comma separated
value to user provided version (--telemetry=azpartner-aks/v1.28.0,tire1)

Signed-off-by: [email protected] <[email protected]>

Author: mittachaitu

Makefile

@@ -178,4 +178,4 @@ delete-metrics-svc:
 
 .PHONY: blobfuse-proxy
 blobfuse-proxy:
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/blobfuse-proxy ./pkg/blobfuse-proxy
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod vendor -ldflags="-s -w -X ${PKG}/pkg/blobfuse-proxy/server.driverVersion=${IMAGE_VERSION}" -o _output/${ARCH}/blobfuse-proxy ./pkg/blobfuse-proxy

pkg/blob/nodeserver.go

@@ -409,10 +409,6 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 	}
 
 	// Get mountOptions that the volume will be formatted and mounted with
-	if protocol == Fuse2 {
-		// Adding telemetry tag to know that blob is been mounted through AKS
-		mountFlags = util.JoinMountOptions(mountFlags, []string{fmt.Sprintf("--telemetry=azpartner-aks/%s", d.Version)})
-	}
 	mountOptions := mountFlags
 	if ephemeralVol {
 		mountOptions = util.JoinMountOptions(mountOptions, strings.Split(ephemeralVolMountOptions, ","))

pkg/blobfuse-proxy/server/server.go

@@ -34,7 +34,8 @@ import (
 )
 
 var (
-	mutex sync.Mutex
+	mutex         sync.Mutex
+	driverVersion string
 )
 
 type BlobfuseVersion int
@@ -71,6 +72,7 @@ func (server *MountServer) MountAzureBlob(_ context.Context,
 	var cmd *exec.Cmd
 	var result mount_azure_blob.MountAzureBlobResponse
 	if protocol == blob.Fuse2 || server.blobfuseVersion == BlobfuseV2 {
+		telemetryTag := "azpartner-aks/" + driverVersion
 		args = "mount " + args
 		// add this arg for blobfuse2 to solve the issue:
 		// https://github.com/Azure/azure-storage-fuse/issues/1015
@@ -82,6 +84,21 @@ func (server *MountServer) MountAzureBlob(_ context.Context,
 			klog.V(2).Infof("append --disable-version-check to mount args")
 			args = args + " " + "--disable-version-check=true"
 		}
+		// Adding telemetry tag to know that blob is been mounted through AKS CSI Driver
+		if !strings.Contains(args, "--telemetry") {
+			klog.V(2).Infof("append --telemetry=%s to mount args", telemetryTag)
+			args = args + " " + "--telemetry=" + telemetryTag
+		} else {
+			// If telemetry flag is already present, check for aks tag if not present
+			// then user might have their own telemetry tag append aks tag to it
+			if !strings.Contains(args, "azpartner-aks") {
+				splitedArgs := strings.Split(args, "--telemetry=")
+				if len(splitedArgs) == 2 {
+					args = splitedArgs[0] + " --telemetry=" + telemetryTag + "," + splitedArgs[1]
+				}
+				klog.V(2).Infof("updated --telemetry tag in mount args: %s", args)
+			}
+		}
 		args = util.TrimDuplicatedSpace(args)
 		klog.V(2).Infof("mount with v2, protocol: %s, args: %s", protocol, args)
 		cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)