From 8eff7137c36aac377159a7071b0c3e1d52e78e01 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 28 May 2025 10:32:15 -0700 Subject: [PATCH] Minor improvement to fail message of metrics verification (used for debugging) --- .../api/v1/AbstractKeyspaceIntegrationTestBase.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/java/io/stargate/sgv2/jsonapi/api/v1/AbstractKeyspaceIntegrationTestBase.java b/src/test/java/io/stargate/sgv2/jsonapi/api/v1/AbstractKeyspaceIntegrationTestBase.java index d16e4956c2..33bbde0683 100644 --- a/src/test/java/io/stargate/sgv2/jsonapi/api/v1/AbstractKeyspaceIntegrationTestBase.java +++ b/src/test/java/io/stargate/sgv2/jsonapi/api/v1/AbstractKeyspaceIntegrationTestBase.java @@ -6,6 +6,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.fail; import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.CqlSessionBuilder; @@ -244,7 +245,15 @@ public static void checkDriverMetricsTenantId() { line -> line.startsWith("session_cql_requests_seconds") && line.contains("session=")) .findFirst(); - assertThat(sessionLevelDriverMetricTenantId.isPresent()).isTrue(); + if (!sessionLevelDriverMetricTenantId.isPresent()) { + List lines = metrics.lines().toList(); + long buckets = + lines.stream().filter(line -> line.startsWith("session_cql_requests_seconds")).count(); + fail( + String.format( + "No tenant id found in any of 'session_cql_requests_seconds' entries (%d buckets; %d log lines)", + buckets, lines.size())); + } } public static void checkVectorMetrics(String commandName, String sortType) {