replace nwcfg subcontext with containerid for correlation

Author: QxBytes

cni/network/network.go

@@ -294,12 +294,10 @@ func (plugin *NetPlugin) getPodInfo(args string) (name, ns string, err error) {
 	return k8sPodName, k8sNamespace, nil
 }
 
-func (plugin *NetPlugin) setCNIReportDetails(nwCfg *cni.NetworkConfig, opType, msg string) {
+func (plugin *NetPlugin) setCNIReportDetails(containerID string, opType, msg string) {
 	telemetry.CNIReportSettings.OperationType = opType
-	telemetry.CNIReportSettings.SubContext = fmt.Sprintf("%+v", nwCfg)
+	telemetry.CNIReportSettings.SubContext = containerID
 	telemetry.CNIReportSettings.EventMessage = msg
-	telemetry.CNIReportSettings.BridgeDetails.NetworkMode = nwCfg.Mode
-	telemetry.CNIReportSettings.InterfaceDetails.SecondaryCAUsedCount = plugin.nm.GetNumberOfEndpoints("", nwCfg.Name)
 	telemetry.CNIReportSettings.Version = plugin.Version
 }
 
@@ -367,8 +365,6 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 		zap.Any("args", args.Args),
 		zap.String("path", args.Path),
 		zap.ByteString("stdinData", args.StdinData))
-	telemetry.SendEvent(fmt.Sprintf("[cni-net] Processing ADD command with args {ContainerID:%v Netns:%v IfName:%v Args:%v Path:%v StdinData:%s}.",
-		args.ContainerID, args.Netns, args.IfName, args.Args, args.Path, args.StdinData))
 
 	// Parse network configuration from stdin.
 	nwCfg, err := cni.ParseNetworkConfig(args.StdinData)
@@ -382,8 +378,11 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 		return err
 	}
 
+	plugin.setCNIReportDetails(args.ContainerID, CNI_ADD, "")
+	telemetry.SendEvent(fmt.Sprintf("[cni-net] Processing ADD command with args {ContainerID:%v Netns:%v IfName:%v Args:%v Path:%v StdinData:%s}.",
+		args.ContainerID, args.Netns, args.IfName, args.Args, args.Path, args.StdinData))
+
 	iptables.DisableIPTableLock = nwCfg.DisableIPTableLock
-	plugin.setCNIReportDetails(nwCfg, CNI_ADD, "")
 
 	defer func() {
 		// Add Interfaces to result.
@@ -966,8 +965,6 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 		zap.Any("args", args.Args),
 		zap.String("path", args.Path),
 		zap.ByteString("stdinData", args.StdinData))
-	telemetry.SendEvent(fmt.Sprintf("[cni-net] Processing DEL command with args {ContainerID:%v Netns:%v IfName:%v Args:%v Path:%v, StdinData:%s}.",
-		args.ContainerID, args.Netns, args.IfName, args.Args, args.Path, args.StdinData))
 
 	defer func() {
 		logger.Info("DEL command completed",
@@ -992,8 +989,10 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 		logger.Error("Failed to get POD info", zap.Error(err))
 	}
 
-	plugin.setCNIReportDetails(nwCfg, CNI_DEL, "")
+	plugin.setCNIReportDetails(args.ContainerID, CNI_DEL, "")
 	telemetry.CNIReportSettings.ContainerName = k8sPodName + ":" + k8sNamespace
+	telemetry.SendEvent(fmt.Sprintf("[cni-net] Processing DEL command with args {ContainerID:%v Netns:%v IfName:%v Args:%v Path:%v, StdinData:%s}.",
+		args.ContainerID, args.Netns, args.IfName, args.Args, args.Path, args.StdinData))
 
 	iptables.DisableIPTableLock = nwCfg.DisableIPTableLock
 
@@ -1186,7 +1185,7 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
 	logger.Info("Read network configuration", zap.Any("config", nwCfg))
 
 	iptables.DisableIPTableLock = nwCfg.DisableIPTableLock
-	plugin.setCNIReportDetails(nwCfg, CNI_UPDATE, "")
+	plugin.setCNIReportDetails(args.ContainerID, CNI_UPDATE, "")
 
 	defer func() {
 		if result == nil {
@@ -1335,7 +1334,7 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
 	}
 
 	msg := fmt.Sprintf("CNI UPDATE succeeded : Updated %+v podname %v namespace %v", targetNetworkConfig, k8sPodName, k8sNamespace)
-	plugin.setCNIReportDetails(nwCfg, CNI_UPDATE, msg)
+	plugin.setCNIReportDetails(args.ContainerID, CNI_UPDATE, msg)
 
 	return nil
 }

cni/network/plugin/main.go

@@ -76,12 +76,10 @@ func rootExecute() error {
 		HostNetAgentURL: hostNetAgentURL,
 		ContentType:     telemetry.ContentType,
 		Report: &telemetry.CNIReport{
-			Context:          "AzureCNI",
-			SystemDetails:    telemetry.SystemInfo{},
-			InterfaceDetails: telemetry.InterfaceInfo{},
-			BridgeDetails:    telemetry.BridgeInfo{},
-			Version:          version,
-			Logger:           logger,
+			Context:       "AzureCNI",
+			SystemDetails: telemetry.SystemInfo{},
+			Version:       version,
+			Logger:        logger,
 		},
 	}
 

cni/network/stateless/main.go

@@ -82,11 +82,9 @@ func rootExecute() error {
 		HostNetAgentURL: hostNetAgentURL,
 		ContentType:     telemetry.ContentType,
 		Report: &telemetry.CNIReport{
-			Context:          "AzureCNI",
-			SystemDetails:    telemetry.SystemInfo{},
-			InterfaceDetails: telemetry.InterfaceInfo{},
-			BridgeDetails:    telemetry.BridgeInfo{},
-			Version:          version,
+			Context:       "AzureCNI",
+			SystemDetails: telemetry.SystemInfo{},
+			Version:       version,
 		},
 	}
 

network/manager.go

@@ -429,10 +429,9 @@ func (nm *networkManager) UpdateEndpointState(eps []*endpoint) error {
 			zap.String("hostVethName", ipinfo.HostVethName), zap.String("macAddress", ipinfo.MacAddress), zap.String("nicType", string(ipinfo.NICType)))
 		ifNameToIPInfoCopy[key] = *ipinfo
 	}
-	telemetry.SendEvent(fmt.Sprintf("Stateless CNI update endpoint state with: %+v", ifNameToIPInfoCopy))
-
 	// we assume all endpoints have the same container id
 	cnsEndpointID := eps[0].ContainerID
+	telemetry.SendEvent(fmt.Sprintf("Stateless CNI update endpoint state for %s with: %+v ", cnsEndpointID, ifNameToIPInfoCopy))
 	if err := validateUpdateEndpointState(cnsEndpointID, ifnameToIPInfoMap); err != nil {
 		return errors.Wrap(err, "failed to validate update endpoint state that will be sent to cns")
 	}

telemetry/telemetry.go

@@ -79,8 +79,6 @@ type CNIReport struct {
 	VnetAddressSpace  []string
 	OSDetails         OSInfo
 	SystemDetails     SystemInfo
-	InterfaceDetails  InterfaceInfo
-	BridgeDetails     BridgeInfo
 	Metadata          common.Metadata `json:"compute"`
 	Logger            *zap.Logger
 }