blobstore: Add metrics_tag config field

WIP; more description to come
buildbarn · May 13, 2024 · e8ef171 · e8ef171
1 parent a9d0937
commit e8ef171
Show file tree

Hide file tree

Showing 5 changed files with 441 additions and 725 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/pkg/blobstore/configuration/new_blob_access.go b/pkg/blobstore/configuration/new_blob_access.go
@@ -545,7 +545,10 @@ func (nc *simpleNestedBlobAccessCreator) NewNestedBlobAccess(configuration *pb.B
 		}).NewNestedBlobAccess(config.Backend, creator)
 	case *pb.BlobAccessConfiguration_Label:
 		if labelBackend, ok := nc.labels[backend.Label]; ok {
-			return labelBackend, nil
+			return BlobAccessInfo{
+				BlobAccess:      blobstore.NewMetricsBlobAccess(labelBackend.BlobAccess, clock.SystemClock, creator.GetStorageTypeName(), "label", configuration.GetMetricsTag()),
+				DigestKeyFormat: labelBackend.DigestKeyFormat,
+			}, nil
 		}
 		return BlobAccessInfo{}, status.Errorf(codes.InvalidArgument, "Label %#v not declared", backend.Label)
 	}
@@ -555,7 +558,7 @@ func (nc *simpleNestedBlobAccessCreator) NewNestedBlobAccess(configuration *pb.B
 		return BlobAccessInfo{}, err
 	}
 	return BlobAccessInfo{
-		BlobAccess:      blobstore.NewMetricsBlobAccess(backend.BlobAccess, clock.SystemClock, creator.GetStorageTypeName(), backendType),
+		BlobAccess:      blobstore.NewMetricsBlobAccess(backend.BlobAccess, clock.SystemClock, creator.GetStorageTypeName(), backendType, configuration.GetMetricsTag()),
 		DigestKeyFormat: backend.DigestKeyFormat,
 	}, nil
 }