address linter issues

Author: QxBytes

cni/network/network.go

@@ -15,7 +15,7 @@ import (
 	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cni/api"
 	"github.com/Azure/azure-container-networking/cni/log"
-	"github.com/Azure/azure-container-networking/cni/telemetry/client"
+	telemetryclient "github.com/Azure/azure-container-networking/cni/telemetry/client"
 	"github.com/Azure/azure-container-networking/cni/util"
 	"github.com/Azure/azure-container-networking/cns"
 	cnscli "github.com/Azure/azure-container-networking/cns/client"
@@ -294,7 +294,7 @@ func (plugin *NetPlugin) getPodInfo(args string) (name, ns string, err error) {
 	return k8sPodName, k8sNamespace, nil
 }
 
-func (plugin *NetPlugin) setCNIReportDetails(containerID string, opType, msg string) {
+func (plugin *NetPlugin) setCNIReportDetails(containerID, opType, msg string) {
 	telemetry.CNIReportSettings.OperationType = opType
 	telemetry.CNIReportSettings.SubContext = containerID
 	telemetry.CNIReportSettings.EventMessage = msg
@@ -1095,7 +1095,7 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 
 			logger.Warn("Release ip by ContainerID (endpoint not found)",
 				zap.String("containerID", args.ContainerID))
-			telemetry.SendEvent(fmt.Sprintf("Release ip by ContainerID (endpoint not found): %s", args.ContainerID))
+			telemetry.SendEvent("Release ip by ContainerID (endpoint not found): " + args.ContainerID)
 			if err = plugin.ipamInvoker.Delete(nil, nwCfg, args, nwInfo.Options); err != nil {
 				return plugin.RetriableError(fmt.Errorf("failed to release address(no endpoint): %w", err))
 			}

cni/network/plugin/main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/Azure/azure-container-networking/cni/api"
 	zaplog "github.com/Azure/azure-container-networking/cni/log"
 	"github.com/Azure/azure-container-networking/cni/network"
-	"github.com/Azure/azure-container-networking/cni/telemetry/client"
+	telemetryclient "github.com/Azure/azure-container-networking/cni/telemetry/client"
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/nns"
 	"github.com/Azure/azure-container-networking/platform"

cni/network/stateless/main.go

@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/azure-container-networking/cni/api"
 	zapLog "github.com/Azure/azure-container-networking/cni/log"
 	"github.com/Azure/azure-container-networking/cni/network"
-	"github.com/Azure/azure-container-networking/cni/telemetry/client"
+	telemetryclient "github.com/Azure/azure-container-networking/cni/telemetry/client"
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/log"
 	"github.com/Azure/azure-container-networking/nns"

cni/telemetry/client/telemetry_client.go

@@ -47,23 +47,25 @@ func (c *TelemetryClient) DisconnectTelemetry() {
 	}
 	c.tb.Close()
 }
+
 func (c *TelemetryClient) sendTelemetry(msg string) {
 	if c.tb == nil {
 		return
 	}
 	c.lock.Lock()
 	defer c.lock.Unlock()
-	c.CNIReportSettings.EventMessage = msg
 	eventMsg := fmt.Sprintf("[%d] %s", os.Getpid(), msg)
 	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

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/Azure/azure-container-networking/cni/log"
-	"github.com/Azure/azure-container-networking/cni/telemetry/client"
+	telemetryclient "github.com/Azure/azure-container-networking/cni/telemetry/client"
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/netio"
 	"github.com/Azure/azure-container-networking/netlink"
@@ -165,7 +165,8 @@ func FormatStructPointers[T any](slice []*T) 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 MasterIfName: %s IfName: %s HNSEndpointID: %s HNSNetworkID: %s",
+	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.MasterIfName,
 		epInfo.IfName, epInfo.HNSEndpointID, epInfo.HNSNetworkID)

network/endpoint_windows.go

@@ -580,7 +580,7 @@ func (nw *network) deleteEndpointImplHnsV2(ep *endpoint) error {
 	}
 
 	logger.Info("Deleting hcn endpoint with id", zap.String("HnsId", ep.HnsId))
-	telemetry.SendEvent(fmt.Sprintf("Deleting HCN endpoint: %s", ep.HnsId))
+	telemetry.SendEvent("Deleting HCN endpoint: " + ep.HnsId)
 
 	hcnEndpoint, err = Hnsv2.GetEndpointByID(ep.HnsId)
 	if err != nil {

network/network_windows.go

@@ -476,7 +476,7 @@ func (nm *networkManager) deleteNetworkImplHnsV2(nw *network) error {
 	var hcnNetwork *hcn.HostComputeNetwork
 	var err error
 	logger.Info("Deleting hcn network with id", zap.String("id", nw.HnsId))
-	telemetry.SendEvent(fmt.Sprintf("Deleting HCN network: %s", nw.HnsId))
+	telemetry.SendEvent("Deleting HCN network: " + nw.HnsId)
 
 	if hcnNetwork, err = Hnsv2.GetNetworkByID(nw.HnsId); err != nil {
 		return fmt.Errorf("Failed to get hcn network with id: %s due to err: %v", nw.HnsId, err)