From 3aac13cb2092c733416a7000bc15e0943b2cf487 Mon Sep 17 00:00:00 2001
From: Copybara Service <copybara-servicebot@google.com>
Date: Wed, 24 Jun 2026 06:17:12 -0700
Subject: [PATCH] Include label info in client contacts

PiperOrigin-RevId: 937293859
---
 fleetspeak/src/server/comms.go    | 1 +
 fleetspeak/src/server/db/store.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/fleetspeak/src/server/comms.go b/fleetspeak/src/server/comms.go
index b8ffc132..e99acc32 100644
--- a/fleetspeak/src/server/comms.go
+++ b/fleetspeak/src/server/comms.go
@@ -153,6 +153,7 @@ func (c commsContext) InitializeConnection(ctx context.Context, addr net.Addr, k
 			Addr:          addr.String(),
 			ClientClock:   cd.ClientClock,
 			StreamingTo:   streamingTo,
+			Labels:        res.Client.Labels,
 		})
 	if err != nil {
 		return nil, nil, false, err
diff --git a/fleetspeak/src/server/db/store.go b/fleetspeak/src/server/db/store.go
index 76717ec7..03b528cf 100644
--- a/fleetspeak/src/server/db/store.go
+++ b/fleetspeak/src/server/db/store.go
@@ -202,6 +202,9 @@ type ContactData struct {
 	// If non-empty, indicates that the contact is or was a streaming contact to
 	// the listed FS server. (As defined by notifications module being used.)
 	StreamingTo string
+
+	// The labels of the client at the time of contact.
+	Labels []*fspb.Label
 }
 
 // ClientStore provides methods to store and retrieve information about clients.