re-implement add and delete timing metrics

Author: QxBytes

cni/network/network.go

@@ -358,6 +358,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 		epInfos          []*network.EndpointInfo
 	)
 
+	startTime := time.Now()
 	logger.Info("Processing ADD command",
 		zap.String("containerId", args.ContainerID),
 		zap.String("netNS", args.Netns),
@@ -438,6 +439,9 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 			zap.Error(log.NewErrorWithoutStackTrace(err)))
 
 		telemetryClient.SendEvent(fmt.Sprintf("ADD command completed with [ipamAddResult]: %s [epInfos]: %s [error]: %v ", ipamAddResult.PrettyString(), network.FormatSliceOfPointersToString(epInfos), err))
+
+		operationTimeMs := time.Since(startTime).Milliseconds()
+		telemetryClient.SendMetric(telemetry.CNIAddTimeMetricStr, float64(operationTimeMs), make(map[string]string))
 	}()
 
 	ipamAddResult = IPAMAddResult{interfaceInfo: make(map[string]network.InterfaceInfo)}
@@ -960,7 +964,7 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 		networkID    string
 		nwInfo       network.EndpointInfo
 	)
-
+	startTime := time.Now()
 	logger.Info("Processing DEL command",
 		zap.String("containerId", args.ContainerID),
 		zap.String("netNS", args.Netns),
@@ -974,6 +978,8 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 			zap.String("pod", k8sPodName),
 			zap.Error(log.NewErrorWithoutStackTrace(err)))
 		telemetryClient.SendEvent(fmt.Sprintf("DEL command completed: [podname]: %s [namespace]: %s [error]: %v", k8sPodName, k8sNamespace, err))
+		operationTimeMs := time.Since(startTime).Milliseconds()
+		telemetryClient.SendMetric(telemetry.CNIDelTimeMetricStr, float64(operationTimeMs), make(map[string]string))
 	}()
 
 	// Parse network configuration from stdin.

telemetry/telemetry_client.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"sync"
 
+	"github.com/Azure/azure-container-networking/aitelemetry"
 	"go.uber.org/zap"
 )
 
@@ -94,11 +95,18 @@ func (c *Client) SendError(err error) {
 	c.sendEvent(err.Error())
 }
 
-func (c *Client) SendMetric(cniMetric *AIMetric) {
-	if c.tb == nil || cniMetric == nil {
+func (c *Client) SendMetric(name string, value float64, customDims map[string]string) {
+	if c.tb == nil {
 		return
 	}
-	err := SendCNIMetric(cniMetric, c.tb)
+	err := SendCNIMetric(&AIMetric{
+		aitelemetry.Metric{
+			Name:             name,
+			Value:            value,
+			AppVersion:       c.Settings().Version,
+			CustomDimensions: customDims,
+		},
+	}, c.tb)
 	if err != nil {
 		c.sendLog("Couldn't send metric: " + err.Error())
 	}

telemetry/telemetry_client_test.go

@@ -50,7 +50,7 @@ func TestClient(t *testing.T) {
 	require.Equal(t, "", emptyClient.Settings().ErrorMessage)
 
 	// test sending aimetrics doesn't panic...
-	require.NotPanics(t, func() { emptyClient.SendMetric(&AIMetric{}) })
+	require.NotPanics(t, func() { emptyClient.SendMetric("", 0, nil) })
 	// ...and doesn't affect the cni report
 	require.Regexp(t, allowedEventMsg, emptyClient.Settings().EventMessage)
 	require.Equal(t, "", emptyClient.Settings().ErrorMessage)