Omit project ID from snapshot metrics (#133098)

Author: nicktindall

server/src/internalClusterTest/java/org/elasticsearch/repositories/SnapshotMetricsIT.java

@@ -276,12 +276,12 @@ public void testByStateCounts_InitAndQueuedShards() throws Exception {
         assertMetricsHaveAttributes(
             InstrumentType.LONG_GAUGE,
             SnapshotMetrics.SNAPSHOT_SHARDS_BY_STATE,
-            Map.of("project_id", ProjectId.DEFAULT.id(), "repo_name", repositoryName, "repo_type", "mock")
+            Map.of("repo_name", repositoryName, "repo_type", "mock")
         );
         assertMetricsHaveAttributes(
             InstrumentType.LONG_GAUGE,
             SnapshotMetrics.SNAPSHOTS_BY_STATE,
-            Map.of("project_id", ProjectId.DEFAULT.id(), "repo_name", repositoryName, "repo_type", "mock")
+            Map.of("repo_name", repositoryName, "repo_type", "mock")
         );
     }
 
@@ -345,12 +345,12 @@ public void testByStateCounts_PausedForRemovalShards() throws Exception {
         assertMetricsHaveAttributes(
             InstrumentType.LONG_GAUGE,
             SnapshotMetrics.SNAPSHOT_SHARDS_BY_STATE,
-            Map.of("project_id", ProjectId.DEFAULT.id(), "repo_name", repositoryName, "repo_type", "mock")
+            Map.of("repo_name", repositoryName, "repo_type", "mock")
         );
         assertMetricsHaveAttributes(
             InstrumentType.LONG_GAUGE,
             SnapshotMetrics.SNAPSHOTS_BY_STATE,
-            Map.of("project_id", ProjectId.DEFAULT.id(), "repo_name", repositoryName, "repo_type", "mock")
+            Map.of("repo_name", repositoryName, "repo_type", "mock")
         );
     }
 
@@ -421,12 +421,12 @@ public void testByStateCounts_WaitingShards() throws Exception {
         assertMetricsHaveAttributes(
             InstrumentType.LONG_GAUGE,
             SnapshotMetrics.SNAPSHOT_SHARDS_BY_STATE,
-            Map.of("project_id", ProjectId.DEFAULT.id(), "repo_name", repositoryName, "repo_type", "mock")
+            Map.of("repo_name", repositoryName, "repo_type", "mock")
         );
         assertMetricsHaveAttributes(
             InstrumentType.LONG_GAUGE,
             SnapshotMetrics.SNAPSHOTS_BY_STATE,
-            Map.of("project_id", ProjectId.DEFAULT.id(), "repo_name", repositoryName, "repo_type", "mock")
+            Map.of("repo_name", repositoryName, "repo_type", "mock")
         );
     }
 

server/src/main/java/org/elasticsearch/repositories/SnapshotMetrics.java

@@ -11,6 +11,7 @@
 
 import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.cluster.metadata.RepositoryMetadata;
+import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.telemetry.metric.DoubleHistogram;
 import org.elasticsearch.telemetry.metric.LongCounter;
 import org.elasticsearch.telemetry.metric.LongWithAttributes;
@@ -93,8 +94,8 @@ public void createSnapshotsByStateMetric(Supplier<Collection<LongWithAttributes>
         meterRegistry.registerLongsGauge(SNAPSHOTS_BY_STATE, "snapshots by state", "unit", snapshotsByStatusObserver);
     }
 
+    @FixForMultiProject(description = "When multi-project arrives we should add project ID to the labels")
     public static Map<String, Object> createAttributesMap(ProjectId projectId, RepositoryMetadata meta) {
-        assert projectId != null : "Project ID should always be set";
-        return Map.of("project_id", projectId.id(), "repo_type", meta.type(), "repo_name", meta.name());
+        return Map.of("repo_type", meta.type(), "repo_name", meta.name());
     }
 }