remove newly added telemetry events

we will split this part of the pr into its own pr
a telemetry event was added back which was previously removed
undo this pr to add those telemetry statements back

cni/network/invoker_cns.go

@@ -142,8 +142,6 @@ func (invoker *CNSIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, erro
 		}
 	}
 
-	telemetry.SendEvent(fmt.Sprintf("Received from cns: %+v", response.PodIPInfo))
-
 	addResult := IPAMAddResult{interfaceInfo: make(map[string]network.InterfaceInfo)}
 	numInterfacesWithDefaultRoutes := 0
 

cni/network/multitenancy.go

@@ -267,7 +267,6 @@ func (m *Multitenancy) getNetworkContainersInternal(
 	}
 
 	logger.Info("Network config received from cns", zap.Any("nconfig", ncConfigs))
-	telemetry.SendEvent(fmt.Sprintf("Network config received from cns: %+v", ncConfigs))
 
 	subnetPrefixes := []net.IPNet{}
 	for i := 0; i < len(ncConfigs); i++ {

cni/network/network.go

@@ -1120,6 +1120,7 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 	for _, epInfo := range epInfos {
 		logger.Info("Deleting endpoint",
 			zap.String("endpointID", epInfo.EndpointID))
+		telemetry.SendEvent("Deleting endpoint: " + epInfo.EndpointID)
 
 		if !nwCfg.MultiTenancy && (epInfo.NICType == cns.InfraNIC || epInfo.NICType == "") {
 			// Delegated/secondary nic ips are statically allocated so we don't need to release
@@ -1135,7 +1136,6 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 		} else if epInfo.EnableInfraVnet { // remove in future PR
 			nwCfg.IPAM.Subnet = nwInfo.Subnets[0].Prefix.String()
 			nwCfg.IPAM.Address = epInfo.InfraVnetIP.IP.String()
-			telemetry.SendEvent(fmt.Sprintf("Deleting infra vnet endpoint: container id: %s endpoint id: %s subnet: %s address: %s", args.ContainerID, epInfo.EndpointID, nwCfg.IPAM.Subnet, nwCfg.IPAM.Address))
 			err = plugin.ipamInvoker.Delete(nil, nwCfg, args, nwInfo.Options)
 			if err != nil {
 				return plugin.RetriableError(fmt.Errorf("failed to release address: %w", err))

network/endpoint.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/Azure/azure-container-networking/cni/log"
-	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"
@@ -24,10 +23,7 @@ const (
 	InfraVnet = 0
 )
 
-var (
-	logger    = log.CNILogger.With(zap.String("component", "net"))
-	telemetry = telemetryclient.Telemetry
-)
+var logger = log.CNILogger.With(zap.String("component", "net"))
 
 type AzureHNSEndpoint struct{}
 

network/endpoint_windows.go

@@ -429,7 +429,6 @@ func (nw *network) newEndpointImplHnsV2(cli apipaClient, epInfo *EndpointInfo) (
 
 	// Create the HCN endpoint.
 	logger.Info("Creating hcn endpoint", zap.Any("hcnEndpoint", hcnEndpoint), zap.String("computenetwork", hcnEndpoint.HostComputeNetwork))
-	telemetry.SendEvent(fmt.Sprintf("Creating HCN endpoint: %+v", hcnEndpoint))
 	hnsResponse, err := Hnsv2.CreateEndpoint(hcnEndpoint)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create endpoint: %s due to error: %v", hcnEndpoint.Name, err)
@@ -580,7 +579,6 @@ func (nw *network) deleteEndpointImplHnsV2(ep *endpoint) error {
 	}
 
 	logger.Info("Deleting hcn endpoint with id", zap.String("HnsId", ep.HnsId))
-	telemetry.SendEvent("Deleting HCN endpoint: " + ep.HnsId)
 
 	hcnEndpoint, err = Hnsv2.GetEndpointByID(ep.HnsId)
 	if err != nil {

network/manager.go

@@ -5,7 +5,6 @@ package network
 
 import (
 	"context"
-	"fmt"
 	"net"
 	"sync"
 	"time"
@@ -431,7 +430,7 @@ func (nm *networkManager) UpdateEndpointState(eps []*endpoint) error {
 	}
 	// we assume all endpoints have the same container id
 	cnsEndpointID := eps[0].ContainerID
-	telemetry.SendEvent(fmt.Sprintf("Stateless CNI update endpoint state for %s with: %+v ", cnsEndpointID, ifNameToIPInfoCopy))
+
 	if err := validateUpdateEndpointState(cnsEndpointID, ifnameToIPInfoMap); err != nil {
 		return errors.Wrap(err, "failed to validate update endpoint state that will be sent to cns")
 	}

network/network_windows.go

@@ -378,7 +378,6 @@ func (nm *networkManager) newNetworkImplHnsV2(nwInfo *EndpointInfo, extIf *exter
 		// if network not found, create the HNS network.
 		if errors.As(err, &hcn.NetworkNotFoundError{}) {
 			logger.Info("Creating hcn network", zap.Any("hcnNetwork", hcnNetwork))
-			telemetry.SendEvent(fmt.Sprintf("Creating HCN network: %+v", hcnNetwork))
 			hnsResponse, err = Hnsv2.CreateNetwork(hcnNetwork)
 			if err != nil {
 				return nil, fmt.Errorf("Failed to create hcn network: %s due to error: %v", hcnNetwork.Name, err)
@@ -476,7 +475,6 @@ 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("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)

network/transparent_vlan_endpointclient_linux.go

@@ -144,7 +144,6 @@ func (client *TransparentVlanEndpointClient) ensureCleanPopulateVM() error {
 		if vlanIfErr != nil {
 			// Assume any error is the vlan interface not found
 			logger.Info("vlan interface doesn't exist even though network namespace exists, deleting network namespace...", zap.String("message", vlanIfErr.Error()))
-			telemetry.SendEvent(fmt.Sprintf("vlan interface %s doesn't exist even though network namespace exists, deleting", client.vlanIfName))
 			delErr := client.netnsClient.DeleteNamed(client.vnetNSName)
 			if delErr != nil {
 				return errors.Wrap(delErr, "failed to cleanup/delete ns after noticing vlan veth does not exist")
@@ -156,7 +155,6 @@ func (client *TransparentVlanEndpointClient) ensureCleanPopulateVM() error {
 	if vlanIfInVMErr == nil {
 		// The vlan interface exists in the VM ns because it failed to move into the network ns previously and needs to be cleaned up
 		logger.Info("vlan interface exists on the VM namespace, deleting", zap.String("vlanIfName", client.vlanIfName))
-		telemetry.SendEvent(fmt.Sprintf("vlan interface %s exists on the VM namespace, deleting", client.vlanIfName))
 		if delErr := client.netlink.DeleteLink(client.vlanIfName); delErr != nil {
 			return errors.Wrap(delErr, "failed to clean up vlan interface")
 		}
@@ -302,7 +300,6 @@ func (client *TransparentVlanEndpointClient) PopulateVM(epInfo *EndpointInfo) er
 			return errors.Wrap(deleteNSIfNotNilErr, "failed to move or detect vlan veth inside vnet namespace")
 		}
 		logger.Info("Moving vlan veth into namespace confirmed")
-		telemetry.SendEvent(fmt.Sprintf("Moving vlan veth %s into namespace %s (id: %d) confirmed", client.vlanIfName, client.vnetNSName, client.vnetNSFileDescriptor))
 	} else {
 		logger.Info("Existing NS detected. vlan interface should exist or namespace would've been deleted.", zap.String("vnetNSName", client.vnetNSName), zap.String("vlanIfName", client.vlanIfName))
 	}