Separate windows and unix client_container for infra-ctl

pkg/ctl/sender/client.go

@@ -11,11 +11,6 @@ import (
 	"github.com/newrelic/infrastructure-agent/pkg/log"
 )
 
-const (
-	Runtime_docker     = "docker"
-	Runtime_containerd = "containerd"
-)
-
 var clog = log.WithComponent("NotificationClient")
 
 // Client is used to notify a running agent process.
@@ -27,13 +22,6 @@ type Client interface {
 	GetID() string
 }
 
-func NewContainerClient(dockerAPIVersion, containerdNamespace, containerID, runtime string) (Client, error) {
-	if runtime == Runtime_containerd {
-		return NewContainerdClient(containerdNamespace, containerID)
-	}
-	return NewDockerClient(dockerAPIVersion, containerID)
-}
-
 // NewAutoDetectedClient will try to detect the NRIA instance type and return a notification client for it.
 func NewAutoDetectedClient(dockerAPIVersion, containerdNamespace, containerRuntime string) (Client, error) {
 	pid, err := detection.GetInfraAgentProcess()

pkg/ctl/sender/client_container_unix.go

@@ -0,0 +1,17 @@
+// Copyright 2023 New Relic Corporation. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+//go:build linux || darwin
+
+package sender
+
+const (
+	Runtime_docker     = "docker"
+	Runtime_containerd = "containerd"
+)
+
+func NewContainerClient(dockerAPIVersion, containerdNamespace, containerID, runtime string) (Client, error) {
+	if runtime == Runtime_containerd {
+		return NewContainerdClient(containerdNamespace, containerID)
+	}
+	return NewDockerClient(dockerAPIVersion, containerID)
+}

pkg/ctl/sender/client_container_windows.go

@@ -0,0 +1,7 @@
+// Copyright 2020 New Relic Corporation. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+package sender
+
+func NewContainerClient(dockerAPIVersion, containerdNamespace, containerID, runtime string) (Client, error) {
+	return NewDockerClient(dockerAPIVersion, containerID)
+}

pkg/ctl/sender/client_containerd.go

@@ -1,5 +1,7 @@
-// Copyright 2020 New Relic Corporation. All rights reserved.
+// Copyright 2023 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
+//go:build linux || darwin
+
 package sender
 
 import (
@@ -59,7 +61,7 @@ func (c *ContainerdClient) Notify(ctx context.Context, _ ipc.Message) error {
 	return err
 }
 
-// Return the identification for the notified agent.
+// GetID returns the identification for the notified agent.
 func (c *ContainerdClient) GetID() string {
 	return c.containerID
 }

pkg/metrics/docker_sampler_windows_test.go

@@ -30,7 +30,7 @@ func TestDocker(t *testing.T) {
 	ctx.On("GetServiceForPid", mock.Anything).Return("", false)
 
 	procs := NewProcsMonitor(ctx)
-	procs.containerSampler = docker
+	procs.containerSamplers = []ContainerSampler{docker}
 	procs.getAllProcs = mockGetAllWin32Procs
 	procs.getMemoryInfo = mockGetMemoryInfo
 	procs.getStatus = mockGetStatus