use slice for NPM connection tags (#28112)

DataDog · Aug 1, 2024 · 946ce87 · 946ce87
1 parent 8efec6f
commit 946ce87
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/pkg/network/encoding/marshal/format.go b/pkg/network/encoding/marshal/format.go
@@ -296,7 +296,7 @@ func formatTags(c network.ConnectionStats, tagsSet *network.TagsSet, connDynamic
 	}
 
 	// other tags, e.g., from process env vars like DD_ENV, etc.
-	for tag := range c.Tags {
+	for _, tag := range c.Tags {
 		t := tag.Get().(string)
 		checksum ^= murmur3.StringSum32(t)
 		tagsIdx = append(tagsIdx, tagsSet.Add(t))

diff --git a/pkg/network/encoding/marshal/format_test.go b/pkg/network/encoding/marshal/format_test.go
@@ -95,10 +95,10 @@ func BenchmarkConnectionReset(b *testing.B) {
 func BenchmarkFormatTags(b *testing.B) {
 	tagSet := network.NewTagsSet()
 	var c network.ConnectionStats
-	c.Tags = map[*intern.Value]struct{}{
-		intern.GetByString("env:env"):         {},
-		intern.GetByString("version:version"): {},
-		intern.GetByString("service:service"): {},
+	c.Tags = []*intern.Value{
+		intern.GetByString("env:env"),
+		intern.GetByString("version:version"),
+		intern.GetByString("service:service"),
 	}
 	b.ReportAllocs()
 	b.ResetTimer()

diff --git a/pkg/network/event_common.go b/pkg/network/event_common.go
@@ -257,7 +257,7 @@ type ConnectionStats struct {
 	Direction        ConnectionDirection
 	SPortIsEphemeral EphemeralPortType
 	StaticTags       uint64
-	Tags             map[*intern.Value]struct{}
+	Tags             []*intern.Value
 
 	IntraHost bool
 	IsAssured bool

diff --git a/pkg/network/tracer/tracer.go b/pkg/network/tracer/tracer.go
@@ -341,10 +341,8 @@ func (t *Tracer) addProcessInfo(c *network.ConnectionStats) {
 	}
 
 	if len(p.Tags) > 0 {
-		c.Tags = make(map[*intern.Value]struct{}, len(p.Tags))
-		for _, t := range p.Tags {
-			c.Tags[t] = struct{}{}
-		}
+		c.Tags = make([]*intern.Value, len(p.Tags))
+		copy(c.Tags, p.Tags)
 	}
 
 	if p.ContainerID != nil {