Skip to content

Commit 5aa919c

Browse files
committed
Added shard operations collector and optimised node stats collector
1 parent f8b2019 commit 5aa919c

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/main/java/org/opensearch/performanceanalyzer/collectors/telemetry/RTFNodeStatsAllShardsMetricsCollector.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,14 @@ configOverridesWrapper, getCollectorName())) {
126126
for (Map.Entry<ShardId, ShardStats> currentShard : currentPerShardStats.entrySet()) {
127127
ShardId shardId = currentShard.getKey();
128128
ShardStats currentShardStats = currentShard.getValue();
129-
if (prevPerShardStats.isEmpty() || !prevPerShardStats.containsKey(shardId)) {
129+
if (prevPerShardStats.isEmpty() || prevPerShardStats.get(shardId) == null) {
130130
// Populating value for the first run of shard.
131131
recordMetrics(
132132
new NodeStatsMetricsAllShardsPerCollectionStatus(currentShardStats),
133133
shardId);
134134
continue;
135135
}
136136
ShardStats prevShardStats = prevPerShardStats.get(shardId);
137-
if (prevShardStats == null) {
138-
// Populate value for shards which are new and were not present in the previous
139-
// run.
140-
recordMetrics(
141-
new NodeStatsMetricsAllShardsPerCollectionStatus(currentShardStats),
142-
shardId);
143-
continue;
144-
}
145137
NodeStatsMetricsAllShardsPerCollectionStatus prevValue =
146138
new NodeStatsMetricsAllShardsPerCollectionStatus(prevShardStats);
147139
NodeStatsMetricsAllShardsPerCollectionStatus currValue =

src/main/java/org/opensearch/performanceanalyzer/collectors/telemetry/RTFShardOperationCollector.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,20 @@ private void processOperations(
141141

142142
// attributes= {index_name="test", shard_id="0"}
143143
private Tags createTags(ShardId shardId) {
144-
return Tags.create()
145-
.addTag(RTFMetrics.CommonDimension.INDEX_NAME.toString(), shardId.getIndexName())
146-
.addTag(
147-
RTFMetrics.CommonDimension.SHARD_ID.toString(),
148-
String.valueOf(shardId.getId()));
144+
Tags shardOperationsMetricsTag =
145+
Tags.create()
146+
.addTag(
147+
RTFMetrics.CommonDimension.INDEX_NAME.toString(),
148+
shardId.getIndexName())
149+
.addTag(
150+
RTFMetrics.CommonDimension.SHARD_ID.toString(),
151+
String.valueOf(shardId.getId()));
152+
153+
if (shardId.getIndex() != null) {
154+
shardOperationsMetricsTag.addTag(
155+
RTFMetrics.CommonDimension.INDEX_UUID.toString(), shardId.getIndex().getUUID());
156+
}
157+
return shardOperationsMetricsTag;
149158
}
150159

151160
private void initializeMetricsIfNeeded() {
@@ -172,5 +181,5 @@ private void initializeMetricsIfNeeded() {
172181
* @param indexOps count of index operations.
173182
* @param searchOps count of search operations
174183
*/
175-
public record ShardOperation(long indexOps, long searchOps) {}
184+
private record ShardOperation(long indexOps, long searchOps) {}
176185
}

0 commit comments

Comments
 (0)