[proc] add network address information to container object (#211)

Author: shang-wang

.gitignore

@@ -7,6 +7,7 @@ tracer-ebpf.o
 .vscode
 *.exe
 *.syso
+*.swp
 cmd/agent/windows_resources/process-agent-msg.rc
 cmd/agent/windows_resources/*.bin
 # file generated at build time by message compiler

checks/container.go

@@ -85,12 +85,7 @@ func (c *ContainerCheck) Run(cfg *config.AgentConfig, groupID int32) ([]model.Me
 
 // fmtContainers formats and chunks the ctrList into a slice of chunks using a specific
 // number of chunks. len(result) MUST EQUAL chunks.
-func fmtContainers(
-	ctrList []*containers.Container,
-	lastRates map[string]util.ContainerRateMetrics,
-	lastRun time.Time,
-	chunks int,
-) [][]*model.Container {
+func fmtContainers(ctrList []*containers.Container, lastRates map[string]util.ContainerRateMetrics, lastRun time.Time, chunks int) [][]*model.Container {
 	perChunk := (len(ctrList) / chunks) + 1
 	chunked := make([][]*model.Container, chunks)
 	chunk := make([]*model.Container, 0, perChunk)
@@ -136,6 +131,7 @@ func fmtContainers(
 			NetSentPs:   calculateRate(ifStats.PacketsSent, lastCtr.NetworkSum.PacketsSent, lastRun),
 			NetRcvdBps:  calculateRate(ifStats.BytesRcvd, lastCtr.NetworkSum.BytesRcvd, lastRun),
 			NetSentBps:  calculateRate(ifStats.BytesSent, lastCtr.NetworkSum.BytesSent, lastRun),
+			Addresses:   convertAddressList(ctr),
 			Started:     ctr.StartedAt,
 			Tags:        tags,
 		})
@@ -152,6 +148,23 @@ func fmtContainers(
 	return chunked
 }
 
+// convertAddressList converts AddressList into process-agent ContainerNetworkAddress objects
+func convertAddressList(ctr *containers.Container) []*model.ContainerAddr {
+	addrs := make([]*model.ContainerAddr, 0, len(ctr.AddressList))
+	for _, a := range ctr.AddressList {
+		protocol := model.ConnectionType_tcp
+		if a.Protocol == "UDP" {
+			protocol = model.ConnectionType_udp
+		}
+		addrs = append(addrs, &model.ContainerAddr{
+			Ip:       a.IP.String(),
+			Port:     int32(a.Port),
+			Protocol: protocol,
+		})
+	}
+	return addrs
+}
+
 func calculateCtrPct(cur, prev, sys2, sys1 uint64, numCPU int, before time.Time) float32 {
 	now := time.Now()
 	diff := now.Unix() - before.Unix()

checks/container_test.go

@@ -1,13 +1,15 @@
 package checks
 
 import (
+	"net"
 	"testing"
 	"time"
 
-	"github.com/DataDog/datadog-agent/pkg/util/containers"
-	"github.com/DataDog/datadog-agent/pkg/util/containers/metrics"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/DataDog/datadog-agent/pkg/util/containers"
+	"github.com/DataDog/datadog-agent/pkg/util/containers/metrics"
+	"github.com/DataDog/datadog-process-agent/model"
 	"github.com/DataDog/datadog-process-agent/util"
 )
 
@@ -72,6 +74,17 @@ func TestContainerChunking(t *testing.T) {
 	}
 }
 
+func TestContainerAddressList(t *testing.T) {
+	ctr := makeContainer("haha")
+	ctr.AddressList = []containers.NetworkAddress{containers.NetworkAddress{IP: net.ParseIP("192.168.128.141"), Port: 443, Protocol: "TCP"}}
+	results := fmtContainers([]*containers.Container{ctr}, map[string]util.ContainerRateMetrics{}, time.Now(), 1)
+	assert.Equal(t, 1, len(results[0]))
+	addrs := []*model.ContainerAddr{
+		&model.ContainerAddr{Ip: "192.168.128.141", Port: int32(443), Protocol: model.ConnectionType_tcp},
+	}
+	assert.Equal(t, results[0][0].Addresses, addrs)
+}
+
 func TestContainerNils(t *testing.T) {
 	// Make sure formatting doesn't crash with nils
 	cur := []*containers.Container{&containers.Container{}}