Skip to content

[9.0] Use IDENTITY constants when creating stats in TrainedModelsStatsAction (#123894) #124202

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 1 commit into from
Mar 6, 2025
Merged

[9.0] Use IDENTITY constants when creating stats in TrainedModelsStatsAction (#123894) #124202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ore/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static class TrainedModelStats implements ToXContentObject, Writeable {
private final int pipelineCount;

private static final IngestStats EMPTY_INGEST_STATS = new IngestStats(
new IngestStats.Stats(0, 0, 0, 0),
IngestStats.Stats.IDENTITY,
Collections.emptyList(),
Collections.emptyMap()
);
Expand Down
30 changes: 12 additions & 18 deletions ...src/main/java/org/elasticsearch/xpack/ml/action/TransportGetTrainedModelsStatsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,24 +428,11 @@ static IngestStats ingestStatsForPipelineIds(NodeStats nodeStats, Set<String> pi
.stream()
.filter(pipelineStat -> pipelineIds.contains(pipelineStat.pipelineId()))
.collect(Collectors.toList());
CounterMetric ingestCount = new CounterMetric();
CounterMetric ingestTimeInMillis = new CounterMetric();
CounterMetric ingestCurrent = new CounterMetric();
CounterMetric ingestFailedCount = new CounterMetric();
IngestStatsAccumulator accumulator = new IngestStatsAccumulator();

filteredPipelineStats.forEach(pipelineStat -> {
IngestStats.Stats stats = pipelineStat.stats();
ingestCount.inc(stats.ingestCount());
ingestTimeInMillis.inc(stats.ingestTimeInMillis());
ingestCurrent.inc(stats.ingestCurrent());
ingestFailedCount.inc(stats.ingestFailedCount());
});
filteredPipelineStats.forEach(pipelineStat -> accumulator.inc(pipelineStat.stats()));

return new IngestStats(
new IngestStats.Stats(ingestCount.count(), ingestTimeInMillis.count(), ingestCurrent.count(), ingestFailedCount.count()),
filteredPipelineStats,
filteredProcessorStats
);
return new IngestStats(accumulator.build(), filteredPipelineStats, filteredProcessorStats);
}

private static IngestStats mergeStats(List<IngestStats> ingestStatsList) {
Expand Down Expand Up @@ -515,7 +502,13 @@ void inc(IngestStats.Stats s) {
}

IngestStats.Stats build() {
return new IngestStats.Stats(ingestCount.count(), ingestTimeInMillis.count(), ingestCurrent.count(), ingestFailedCount.count());
IngestStats.Stats stats = new IngestStats.Stats(
ingestCount.count(),
ingestTimeInMillis.count(),
ingestCurrent.count(),
ingestFailedCount.count()
);
return stats.equals(IngestStats.Stats.IDENTITY) ? IngestStats.Stats.IDENTITY : stats;
}
}

Expand All @@ -535,7 +528,8 @@ IngestStats.Stats buildStats() {
}

IngestStats.ByteStats buildByteStats() {
return new IngestStats.ByteStats(ingestBytesConsumed.count(), ingestBytesProduced.count());
IngestStats.ByteStats byteStats = new IngestStats.ByteStats(ingestBytesConsumed.count(), ingestBytesProduced.count());
return byteStats.equals(IngestStats.ByteStats.IDENTITY) ? IngestStats.ByteStats.IDENTITY : byteStats;
}

}
Expand Down