send telemetry for ipam config, epinfo, and error on cni add completion

Author: QxBytes

cni/network/network.go

@@ -431,6 +431,8 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 			zap.String("pod", k8sPodName),
 			zap.Any("IPs", cniResult.IPs),
 			zap.Error(log.NewErrorWithoutStackTrace(err)))
+
+		telemetry.SendEvent(fmt.Sprintf("ADD command completed for ipamAddResult verbose: %s epInfos: %s error: %v ", ipamAddResult.PrettyString(), network.FormatStructPointers(epInfos), err))
 	}()
 
 	ipamAddResult = IPAMAddResult{interfaceInfo: make(map[string]network.InterfaceInfo)}
@@ -562,6 +564,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 
 	infraSeen := false
 	endpointIndex := 1
+
 	for key := range ipamAddResult.interfaceInfo {
 		ifInfo := ipamAddResult.interfaceInfo[key]
 		logger.Info("Processing interfaceInfo:", zap.Any("ifInfo", ifInfo))
@@ -631,8 +634,6 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to create endpoint") // behavior can change if you don't assign to err prior to returning
 	}
-	// telemetry added
-	telemetry.SendEvent(fmt.Sprintf("CNI ADD Process succeeded for interfaces: %v", ipamAddResult.PrettyString()))
 	return nil
 }
 

cni/telemetry/client/telemetry_client.go

@@ -30,11 +30,13 @@ func NewTelemetryClient(report *telemetry.CNIReport) *TelemetryClient {
 func (c *TelemetryClient) ConnectTelemetry(logger *zap.Logger) {
 	c.tb = telemetry.NewTelemetryBuffer(logger)
 	c.tb.ConnectToTelemetry()
+	c.logger = logger
 }
 
 func (c *TelemetryClient) StartAndConnectTelemetry(logger *zap.Logger) {
 	c.tb = telemetry.NewTelemetryBuffer(logger)
 	c.tb.ConnectToTelemetryService(telemetryNumberRetries, telemetryWaitTimeInMilliseconds)
+	c.logger = logger
 }
 
 func (c *TelemetryClient) DisconnectTelemetry() {
@@ -43,8 +45,7 @@ func (c *TelemetryClient) DisconnectTelemetry() {
 	}
 	c.tb.Close()
 }
-
-func (c *TelemetryClient) SendEvent(msg string) {
+func (c *TelemetryClient) sendTelemetry(msg string) {
 	if c.tb == nil {
 		return
 	}
@@ -53,3 +54,13 @@ func (c *TelemetryClient) SendEvent(msg string) {
 	c.CNIReportSettings.EventMessage = eventMsg
 	telemetry.SendCNIEvent(c.tb, c.CNIReportSettings)
 }
+func (c *TelemetryClient) sendLog(msg string) {
+	if c.logger == nil {
+		return
+	}
+	c.logger.Info("Telemetry Event", zap.String("message", msg))
+}
+func (c *TelemetryClient) SendEvent(msg string) {
+	c.sendLog(msg)
+	c.sendTelemetry(msg)
+}

network/endpoint.go

@@ -154,15 +154,30 @@ type apipaClient interface {
 	CreateHostNCApipaEndpoint(ctx context.Context, networkContainerID string) (string, error)
 }
 
+func FormatStructPointers[T any](slice []*T) string {
+	var builder strings.Builder
+	for _, ptr := range slice {
+		if ptr != nil {
+			fmt.Fprintf(&builder, "%+v \n", *ptr)
+		}
+	}
+	return builder.String()
+}
+
 func (epInfo *EndpointInfo) PrettyString() string {
-	return fmt.Sprintf("Id:%s ContainerID:%s NetNsPath:%s IfName:%s IfIndex:%d MacAddr:%s IPAddrs:%v Gateways:%v Data:%+v NICType: %s NetworkContainerID: %s HostIfName: %s NetNs: %s Options: %v",
+	return fmt.Sprintf("Id:%s ContainerID:%s NetNsPath:%s IfName:%s IfIndex:%d MacAddr:%s IPAddrs:%v Gateways:%v Data:%+v NICType: %s NetworkContainerID: %s HostIfName: %s NetNs: %s Options: %v MasterIfName: %s IfName: %s HNSEndpointID: %s HNSNetworkID: %s",
 		epInfo.EndpointID, epInfo.ContainerID, epInfo.NetNsPath, epInfo.IfName, epInfo.IfIndex, epInfo.MacAddress.String(), epInfo.IPAddresses,
-		epInfo.Gateways, epInfo.Data, epInfo.NICType, epInfo.NetworkContainerID, epInfo.HostIfName, epInfo.NetNs, epInfo.Options)
+		epInfo.Gateways, epInfo.Data, epInfo.NICType, epInfo.NetworkContainerID, epInfo.HostIfName, epInfo.NetNs, epInfo.Options, epInfo.MasterIfName,
+		epInfo.IfName, epInfo.HNSEndpointID, epInfo.HNSNetworkID)
 }
 
 func (ifInfo *InterfaceInfo) PrettyString() string {
-	return fmt.Sprintf("Name:%s NICType:%v MacAddr:%s IPConfigs:%+v Routes:%+v DNSInfo:%+v",
-		ifInfo.Name, ifInfo.NICType, ifInfo.MacAddress.String(), ifInfo.IPConfigs, ifInfo.Routes, ifInfo.DNS)
+	var ncresponse string
+	if ifInfo.NCResponse != nil {
+		ncresponse = fmt.Sprintf("%+v", *ifInfo.NCResponse)
+	}
+	return fmt.Sprintf("Name:%s NICType:%v MacAddr:%s IPConfigs:%s Routes:%+v DNSInfo:%+v NCResponse: %s",
+		ifInfo.Name, ifInfo.NICType, ifInfo.MacAddress.String(), FormatStructPointers(ifInfo.IPConfigs), ifInfo.Routes, ifInfo.DNS, ncresponse)
 }
 
 // NewEndpoint creates a new endpoint in the network.