Fix cni logs (#548)

* Added else if to catch empty messages

* Stopped sending empty messages to AI telemetry for CNI

* Removing cni prefix from log messages

* Reverting go.sum change back to what it was before

* Adding check for empty messages before sending metric

* Moving empty message check before cnimetric initialization

Author: pjohnst5

cni/network/plugin/main.go

@@ -242,13 +242,16 @@ func main() {
 	}
 
 	executionTimeMs := time.Since(startTime).Milliseconds()
-	cnimetric.Metric = aitelemetry.Metric{
-		Name:             telemetry.CNIExecutimeMetricStr,
-		Value:            float64(executionTimeMs),
-		CustomDimensions: make(map[string]string),
+
+	if cniReport.ErrorMessage != "" || cniReport.EventMessage != "" {
+		cnimetric.Metric = aitelemetry.Metric{
+			Name:             telemetry.CNIExecutimeMetricStr,
+			Value:            float64(executionTimeMs),
+			CustomDimensions: make(map[string]string),
+		}
+		network.SetCustomDimensions(&cnimetric, nil, err)
+		telemetry.SendCNIMetric(&cnimetric, tb)
 	}
-	network.SetCustomDimensions(&cnimetric, nil, err)
-	telemetry.SendCNIMetric(&cnimetric, tb)
 
 	if err != nil {
 		reportPluginError(reportManager, tb, err)
@@ -259,10 +262,11 @@ func main() {
 	reflect.ValueOf(reportManager.Report).Elem().FieldByName("CniSucceeded").SetBool(true)
 	reflect.ValueOf(reportManager.Report).Elem().FieldByName("OperationDuration").SetInt(executionTimeMs)
 
-	if err = reportManager.SendReport(tb); err != nil {
-		log.Errorf("SendReport failed due to %v", err)
-	} else {
-		log.Printf("Sending report succeeded")
+	if cniReport.ErrorMessage != "" || cniReport.EventMessage != "" {
+		if err = reportManager.SendReport(tb); err != nil {
+			log.Errorf("SendReport failed due to %v", err)
+		} else {
+			log.Printf("Sending report succeeded")
+		}
 	}
-
 }

telemetry/aiwrapper.go

@@ -47,12 +47,14 @@ func SendAITelemetry(cnireport CNIReport) {
 	var msg string
 	if cnireport.ErrorMessage != "" {
 		msg = cnireport.ErrorMessage
-	} else {
+	} else if cnireport.EventMessage != "" {
 		msg = cnireport.EventMessage
+	} else {
+		return
 	}
 
 	report := aitelemetry.Report{
-		Message:          "CNI:" + msg,
+		Message:          msg,
 		Context:          cnireport.ContainerName,
 		CustomDimensions: make(map[string]string),
 	}