Skip to content

Omit project ID from snapshot metrics #133098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2025
Merged

Omit project ID from snapshot metrics #133098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd4a52f
Omit project ID from snapshot metrics
nicktindall Aug 18, 2025
f1c55af
Use @FixForMultiProject
nicktindall Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions server/src/internalClusterTest/java/org/elasticsearch/repositories/SnapshotMetricsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
);
}

Expand Down Expand Up @@ -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")
);
}

Expand Down Expand Up @@ -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")
);
}

Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/repositories/SnapshotMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}