Skip to content

Commit 6c31b5e

Browse files
committed
Workaround for null metrics
1 parent 01ef694 commit 6c31b5e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/RandomizedTimeSeriesIT.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,22 +430,24 @@ public void testGaugeGroupByRandomAndRandomAgg() {
430430
var dimensionsStr = dimensions.isEmpty()
431431
? ""
432432
: ", " + dimensions.stream().map(d -> "attributes." + d).collect(Collectors.joining(", "));
433-
var aggs = Agg.values();
434433
var metricName = ESTestCase.randomFrom(List.of("gaugel_hdd.bytes.used", "gauged_cpu.percent"));
435-
var selectedAggs = ESTestCase.randomSubsetOf(2, aggs);
434+
var selectedAggs = ESTestCase.randomSubsetOf(2, Agg.values());
436435
var aggExpression = String.format(
436+
Locale.ROOT,
437437
"%s(%s_over_time(metrics.%s))",
438438
selectedAggs.get(0),
439-
selectedAggs.get(1).toString().toLowerCase(),
439+
selectedAggs.get(1),
440440
metricName
441441
);
442+
// TODO: Remove WHERE clause after fixing https://github.com/elastic/elasticsearch/issues/129524
442443
var query = String.format(Locale.ROOT, """
443444
TS %s
445+
| WHERE %s IS NOT NULL
444446
| STATS
445447
%s
446448
BY tbucket=bucket(@timestamp, 1 minute) %s
447449
| SORT tbucket
448-
| LIMIT 1000""", DATASTREAM_NAME, aggExpression, dimensionsStr);
450+
| LIMIT 1000""", DATASTREAM_NAME, metricName, aggExpression, dimensionsStr);
449451
try (EsqlQueryResponse resp = run(query)) {
450452
var groups = groupedRows(documents, dimensions, 60);
451453
List<List<Object>> rows = consumeRows(resp);

0 commit comments

Comments
 (0)