Skip to content

Commit 6c4fe40

Browse files
committed
Fix t_test usage stats (elastic#54753)
Adds missing t_test usage stats to XContent output. Fixes elastic#54744
1 parent 38ff0b8 commit 6c4fe40

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/TransportAnalyticsStatsActionTests.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,21 @@ public TransportAnalyticsStatsAction action(AnalyticsUsage usage) {
5858
}
5959

6060
public void test() throws IOException {
61-
AnalyticsUsage.Item item = randomFrom(AnalyticsUsage.Item.values());
62-
AnalyticsUsage realUsage = new AnalyticsUsage();
63-
AnalyticsUsage emptyUsage = new AnalyticsUsage();
64-
ContextParser<Void, Void> parser = realUsage.track(item, (p, c) -> c);
65-
ObjectPath unused = run(realUsage, emptyUsage);
66-
assertThat(unused.evaluate("stats.0." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(0));
67-
assertThat(unused.evaluate("stats.1." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(0));
68-
int count = between(1, 10000);
69-
for (int i = 0; i < count; i++) {
70-
assertNull(parser.parse(null, null));
61+
for (AnalyticsUsage.Item item : AnalyticsUsage.Item.values()) {
62+
AnalyticsUsage realUsage = new AnalyticsUsage();
63+
AnalyticsUsage emptyUsage = new AnalyticsUsage();
64+
ContextParser<Void, Void> parser = realUsage.track(item, (p, c) -> c);
65+
ObjectPath unused = run(realUsage, emptyUsage);
66+
assertThat(unused.evaluate("stats.0." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(0));
67+
assertThat(unused.evaluate("stats.1." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(0));
68+
int count = between(1, 10000);
69+
for (int i = 0; i < count; i++) {
70+
assertNull(parser.parse(null, null));
71+
}
72+
ObjectPath used = run(realUsage, emptyUsage);
73+
assertThat(item.name(), used.evaluate("stats.0." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(count));
74+
assertThat(item.name(), used.evaluate("stats.1." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(0));
7175
}
72-
ObjectPath used = run(realUsage, emptyUsage);
73-
assertThat(used.evaluate("stats.0." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(count));
74-
assertThat(used.evaluate("stats.1." + item.name().toLowerCase(Locale.ROOT) + "_usage"), equalTo(0));
7576
}
7677

7778
private ObjectPath run(AnalyticsUsage... nodeUsages) throws IOException {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/analytics/action/AnalyticsStatsAction.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public static class NodeResponse extends BaseNodeResponse implements ToXContentO
114114
static final ParseField CUMULATIVE_CARDINALITY_USAGE = new ParseField("cumulative_cardinality_usage");
115115
static final ParseField STRING_STATS_USAGE = new ParseField("string_stats_usage");
116116
static final ParseField TOP_METRICS_USAGE = new ParseField("top_metrics_usage");
117+
static final ParseField T_TEST_USAGE = new ParseField("t_test_usage");
117118

118119
private final long boxplotUsage;
119120
private final long cumulativeCardinalityUsage;
@@ -176,6 +177,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
176177
builder.field(CUMULATIVE_CARDINALITY_USAGE.getPreferredName(), cumulativeCardinalityUsage);
177178
builder.field(STRING_STATS_USAGE.getPreferredName(), stringStatsUsage);
178179
builder.field(TOP_METRICS_USAGE.getPreferredName(), topMetricsUsage);
180+
builder.field(T_TEST_USAGE.getPreferredName(), ttestUsage);
179181
builder.endObject();
180182
return builder;
181183
}

0 commit comments

Comments
 (0)