Skip to content

Commit 0722fab

Browse files
authored
ci: reorder telemetry message so error (if any) appears first (#4396)
reorder telemetry message so error (if any) appears first if the ep infos field is incredibly long it would get truncated when sending to app insights, cutting off the error message if any
1 parent 55f1850 commit 0722fab

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

cni/network/network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
438438
zap.Any("IPs", cniResult.IPs),
439439
zap.Error(log.NewErrorWithoutStackTrace(err)))
440440

441-
telemetryClient.SendEvent(fmt.Sprintf("ADD command completed with [ipamAddResult]: %s [epInfos]: %s [error]: %v ", ipamAddResult.PrettyString(), network.FormatSliceOfPointersToString(epInfos), err))
441+
telemetryClient.SendEvent(fmt.Sprintf("ADD command completed with [error]: %v [ipamAddResult]: %s [epInfos]: %s ", err, ipamAddResult.PrettyString(), network.FormatSliceOfPointersToString(epInfos)))
442442

443443
operationTimeMs := time.Since(startTime).Milliseconds()
444444
telemetryClient.SendMetric(telemetry.CNIAddTimeMetricStr, float64(operationTimeMs), make(map[string]string))
@@ -982,7 +982,7 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
982982
logger.Info("DEL command completed",
983983
zap.String("pod", k8sPodName),
984984
zap.Error(log.NewErrorWithoutStackTrace(err)))
985-
telemetryClient.SendEvent(fmt.Sprintf("DEL command completed: [podname]: %s [namespace]: %s [error]: %v", k8sPodName, k8sNamespace, err))
985+
telemetryClient.SendEvent(fmt.Sprintf("DEL command completed: [error]: %v [podname]: %s [namespace]: %s", err, k8sPodName, k8sNamespace))
986986
operationTimeMs := time.Since(startTime).Milliseconds()
987987
telemetryClient.SendMetric(telemetry.CNIDelTimeMetricStr, float64(operationTimeMs), make(map[string]string))
988988
}()

0 commit comments

Comments
 (0)