chore: add groupID to proxy chunk count metrics (#11492)

It's helpful to see the % of chunks that overlap in write requests for
different groups.

Author: tyler-french

enterprise/server/byte_stream_server_proxy/BUILD

@@ -21,6 +21,7 @@ go_library(
         "//server/util/authutil",
         "//server/util/bytebufferpool",
         "//server/util/cdc",
+        "//server/util/claims",
         "//server/util/compression",
         "//server/util/lib/set",
         "//server/util/log",

enterprise/server/byte_stream_server_proxy/byte_stream_server_proxy.go

@@ -21,6 +21,7 @@ import (
 	"github.com/buildbuddy-io/buildbuddy/server/util/authutil"
 	"github.com/buildbuddy-io/buildbuddy/server/util/bytebufferpool"
 	"github.com/buildbuddy-io/buildbuddy/server/util/cdc"
+	"github.com/buildbuddy-io/buildbuddy/server/util/claims"
 	"github.com/buildbuddy-io/buildbuddy/server/util/compression"
 	"github.com/buildbuddy-io/buildbuddy/server/util/lib/set"
 	"github.com/buildbuddy-io/buildbuddy/server/util/log"
@@ -39,6 +40,14 @@ var (
 	chunkUploadConcurrency = flag.Int("cache_proxy.chunk_upload_concurrency", 8, "Maximum number of concurrent chunk uploads when uploading missing chunks to remote cache.")
 )
 
+func groupIDForMetrics(ctx context.Context) string {
+	c, err := claims.ClaimsFromContext(ctx)
+	if err != nil {
+		return interfaces.AuthAnonymousUser
+	}
+	return c.GroupID
+}
+
 type ByteStreamServerProxy struct {
 	supportsEncryption func(context.Context) bool
 	authenticator      interfaces.Authenticator
@@ -416,6 +425,7 @@ func (s *ByteStreamServerProxy) readRemoteWriteLocal(req *bspb.ReadRequest, stre
 type byteStreamMetrics struct {
 	requestType       string
 	compressor        string
+	groupID           string
 	err               error
 	bytes             int64
 	chunked           bool
@@ -504,6 +514,7 @@ func (s *ByteStreamServerProxy) Write(stream bspb.ByteStream_WriteServer) error
 			recordWriteMetrics(byteStreamMetrics{
 				requestType:       requestTypeLabel,
 				compressor:        meteredStream.compressor,
+				groupID:           groupIDForMetrics(ctx),
 				err:               nil,
 				bytes:             meteredStream.bytes,
 				chunked:           true,
@@ -680,12 +691,17 @@ func recordWriteMetrics(bsm byteStreamMetrics) {
 			metrics.StatusLabel:     status.MetricsLabel(bsm.err),
 			metrics.CompressionType: bsm.compressor,
 		}
+		chunkedLabelsWithGroup := prometheus.Labels{
+			metrics.StatusLabel:     status.MetricsLabel(bsm.err),
+			metrics.CompressionType: bsm.compressor,
+			metrics.GroupID:         bsm.groupID,
+		}
 		metrics.ByteStreamChunkedWriteBlobBytes.With(chunkedLabels).Add(float64(bsm.blobBytes))
 		if bsm.chunksTotal > 0 {
-			metrics.ByteStreamChunkedWriteChunksTotal.With(chunkedLabels).Add(float64(bsm.chunksTotal))
+			metrics.ByteStreamChunkedWriteChunksTotal.With(chunkedLabelsWithGroup).Add(float64(bsm.chunksTotal))
 		}
 		if bsm.chunksDeduped > 0 {
-			metrics.ByteStreamChunkedWriteChunksDeduped.With(chunkedLabels).Add(float64(bsm.chunksDeduped))
+			metrics.ByteStreamChunkedWriteChunksDeduped.With(chunkedLabelsWithGroup).Add(float64(bsm.chunksDeduped))
 		}
 		if bsm.chunkBytesTotal > 0 {
 			metrics.ByteStreamChunkedWriteChunkBytes.With(chunkedLabels).Add(float64(bsm.chunkBytesTotal))

enterprise/server/byte_stream_server_proxy/byte_stream_server_proxy_test.go

@@ -1002,9 +1002,14 @@ func TestWriteChunked(t *testing.T) {
 		metrics.StatusLabel:     "OK",
 		metrics.CompressionType: "ZSTD",
 	}
+	writeLabelsWithGroup := prometheus.Labels{
+		metrics.StatusLabel:     "OK",
+		metrics.CompressionType: "ZSTD",
+		metrics.GroupID:         interfaces.AuthAnonymousUser,
+	}
 	writeBlobBytesBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteBlobBytes.With(writeLabels))
-	writeChunksTotalBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksTotal.With(writeLabels))
-	writeChunksDedupedBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksDeduped.With(writeLabels))
+	writeChunksTotalBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksTotal.With(writeLabelsWithGroup))
+	writeChunksDedupedBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksDeduped.With(writeLabelsWithGroup))
 	writeChunkBytesBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunkBytes.With(writeLabels))
 	writeDedupedBytesBefore := testutil.ToFloat64(metrics.ByteStreamChunkedWriteDedupedChunkBytes.With(writeLabels))
 
@@ -1032,8 +1037,8 @@ func TestWriteChunked(t *testing.T) {
 	require.NoError(t, err)
 
 	writeBlobBytesAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteBlobBytes.With(writeLabels))
-	writeChunksTotalAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksTotal.With(writeLabels))
-	writeChunksDedupedAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksDeduped.With(writeLabels))
+	writeChunksTotalAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksTotal.With(writeLabelsWithGroup))
+	writeChunksDedupedAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunksDeduped.With(writeLabelsWithGroup))
 	writeChunkBytesAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteChunkBytes.With(writeLabels))
 	writeDedupedBytesAfter := testutil.ToFloat64(metrics.ByteStreamChunkedWriteDedupedChunkBytes.With(writeLabels))
 

server/metrics/metrics.go

@@ -3601,6 +3601,7 @@ var (
 	}, []string{
 		StatusLabel,
 		CompressionType,
+		GroupID,
 	})
 	ByteStreamChunkedWriteChunksDeduped = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: bbNamespace,
@@ -3610,6 +3611,7 @@ var (
 	}, []string{
 		StatusLabel,
 		CompressionType,
+		GroupID,
 	})
 	ByteStreamChunkedWriteDurationUsec = promauto.NewHistogramVec(prometheus.HistogramOpts{
 		Namespace: bbNamespace,