Skip to content

Commit f5efcee

Browse files
committed
Handle null project ID
1 parent 1c5bc3c commit f5efcee

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.elasticsearch.cluster.metadata.ProjectId;
1313
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
14+
import org.elasticsearch.core.Nullable;
1415
import org.elasticsearch.telemetry.metric.DoubleHistogram;
1516
import org.elasticsearch.telemetry.metric.LongCounter;
1617
import org.elasticsearch.telemetry.metric.LongWithAttributes;
@@ -84,7 +85,11 @@ public void createSnapshotsInProgressMetric(Supplier<Collection<LongWithAttribut
8485
meterRegistry.registerLongsGauge(SNAPSHOTS_IN_PROGRESS, "snapshots in progress", "unit", snapshotsInProgressObserver);
8586
}
8687

87-
public static Map<String, Object> createAttributesMap(ProjectId projectId, RepositoryMetadata meta) {
88-
return Map.of("project_id", projectId.id(), "repo_type", meta.type(), "repo_name", meta.name());
88+
public static Map<String, Object> createAttributesMap(@Nullable ProjectId projectId, RepositoryMetadata meta) {
89+
if (projectId == null) {
90+
return Map.of("repo_type", meta.type(), "repo_name", meta.name());
91+
} else {
92+
return Map.of("project_id", projectId.id(), "repo_type", meta.type(), "repo_name", meta.name());
93+
}
8994
}
9095
}

0 commit comments

Comments
 (0)