PR feedback

Author: aphralG

internal/collector/otel_collector_plugin.go

@@ -706,8 +706,8 @@ func (oc *Collector) updateResourceAttributes(
 }
 
 func (oc *Collector) findAvailableSyslogServer(ctx context.Context, napSyslogServer string) string {
-	if oc.previousNAPSysLogServer != "" && oc.previousNAPSysLogServer == napSyslogServer {
-		return oc.previousNAPSysLogServer
+	if oc.previousNAPSysLogServer != "" && normaliseAddress(oc.previousNAPSysLogServer) == normaliseAddress(napSyslogServer) {
+		return napSyslogServer
 	}
 
 	listenConfig := &net.ListenConfig{}
@@ -812,3 +812,16 @@ func setProxyWithBasicAuth(ctx context.Context, proxy *config.Proxy, parsedProxy
 	proxyURL := parsedProxyURL.String()
 	setProxyEnvs(ctx, proxyURL, "Setting Proxy with basic auth")
 }
+
+func normaliseAddress(address string) string {
+	host, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return address
+	}
+
+	if host == "localhost" {
+		host = "127.0.0.1"
+	}
+
+	return net.JoinHostPort(host, port)
+}

internal/collector/otel_collector_plugin_test.go

@@ -959,16 +959,16 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
 			portInUse:               false,
 		},
 		{
-			name:                    "Test 5: port in use find next server",
+			name:                    "Test 6: port hasn't changed",
 			expectedSyslogServer:    "localhost:1122",
-			previousNAPSysLogServer: "",
+			previousNAPSysLogServer: "localhost:1122",
 			syslogServers:           "localhost:1122",
 			portInUse:               true,
 		},
 		{
-			name:                    "Test 6: port hasn't changed",
+			name:                    "Test 7: port hasn't changed, but is now localhost",
 			expectedSyslogServer:    "localhost:1122",
-			previousNAPSysLogServer: "localhost:1122",
+			previousNAPSysLogServer: "127.0.0.1:1122",
 			syslogServers:           "localhost:1122",
 			portInUse:               true,
 		},
@@ -983,7 +983,7 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
 
 			if test.portInUse {
 				listenConfig := &net.ListenConfig{}
-				ln, listenError := listenConfig.Listen(ctx, "tcp", "localhost:15632")
+				ln, listenError := listenConfig.Listen(ctx, "tcp", test.syslogServers)
 				require.NoError(t, listenError)
 				defer ln.Close()
 			}