modify ut

Makefile

@@ -160,7 +160,7 @@ retina-capture-workload: ## build the Retina capture workload
 
 ##@ Containers
 
-IMAGE_REGISTRY	?= acnpublic.azurecr.io
+IMAGE_REGISTRY	?= ghcr.io
 IMAGE_NAMESPACE ?= $(shell git config --get remote.origin.url | sed -E 's/.*github\.com[\/:]([^\/]+)\/([^\/.]+)(.git)?/\1\/\2/' | tr '[:upper:]' '[:lower:]')
 
 RETINA_BUILDER_IMAGE			= $(IMAGE_NAMESPACE)/retina-builder
@@ -368,7 +368,7 @@ helm-install: manifests
 		--set logLevel=info \
 		--set os.windows=true \
 		--set operator.enabled=false \
-		--set enabledPlugin_linux="\[linuxutil\]"
+		--set enabledPlugin_linux="\[dropreason\,packetforward\,linuxutil\,dns\]"
 
 helm-install-with-operator: manifests
 	helm upgrade --install retina ./deploy/manifests/controller/helm/retina/ \

pkg/plugin/linuxutil/netstat_stats_linux.go

@@ -198,7 +198,7 @@ func (nr *NetstatReader) readSockStats() error {
 				port := strconv.Itoa(int(addrPort.Port()))
 				// Check if the remote address is in the new sockStats map
 				if _, ok := sockStats.socketByRemoteAddr[remoteAddr]; !ok {
-					nr.l.Info("Removing remote address from metrics", zap.String("remoteAddr", remoteAddr))
+					nr.l.Debug("Removing remote address from metrics", zap.String("remoteAddr", remoteAddr))
 					// If not, set the value to 0
 					metrics.TCPConnectionRemoteGauge.WithLabelValues(addr, port).Set(0)
 				}

pkg/plugin/linuxutil/netstat_stats_linux_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/cakturk/go-netstat/netstat"
 	"github.com/microsoft/retina/pkg/log"
-	"github.com/microsoft/retina/pkg/metrics"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -353,24 +352,28 @@ func TestReadSockStatsRemoveClosedConnection(t *testing.T) {
 
 	ns := NewMockNetstatInterface(ctrl)
 	nr := NewNetstatReader(opts, ns)
+	assert.NotNil(t, nr)
 	InitalizeMetricsForTesting(ctrl)
 
 	testmetric := prometheus.NewGauge(prometheus.GaugeOpts{
 		Name: "testmetric",
 		Help: "testmetric",
 	})
-	// We are expecting the gauge to be called twice, once for the initial set and once for the removal (set to 0)
-	MockGaugeVec.EXPECT().WithLabelValues("127.0.0.1", "80").Return(testmetric).Times(2)
 
 	// Initial value
-	metrics.TCPConnectionRemoteGauge.WithLabelValues("127.0.0.1", "80").Set(float64(1))
-	nr.connStats.TcpSockets.socketByRemoteAddr = map[string]int{"127.0.0.1:80": 1}
+	nr.opts.PrevTCPSockStats = &SocketStats{
+		socketByRemoteAddr: map[string]int{
+			"127.0.0.1:80": 1,
+		},
+	}
 
+	// Latest read would not contain the IP in PrevTCPSockStats
 	ns.EXPECT().TCPSocks(gomock.Any()).Return([]netstat.SockTabEntry{}, nil).Times(1)
 	ns.EXPECT().UDPSocks(gomock.Any()).Return([]netstat.SockTabEntry{}, nil).Times(1)
-	assert.NotNil(t, nr)
+
+	// We are expecting the gauge to be called once for this value as it is removed
+	MockGaugeVec.EXPECT().WithLabelValues("127.0.0.1", "80").Return(testmetric).Times(1)
+
 	err = nr.readSockStats()
 	require.NoError(t, err)
-
-	assert.Empty(t, nr.connStats.TcpSockets.socketByRemoteAddr)
 }