From 8780171b2d86508b0535f44e9c86c5d7da83e063 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 28 Jan 2025 18:34:15 +0000 Subject: [PATCH] fix toString on operational metrics (#219) Signed-off-by: Chenyang Ji (cherry picked from commit d5f0cee1553832fafbab8e8d24bc4fd434ba08a4) Signed-off-by: github-actions[bot] --- .../insights/core/metrics/OperationalMetric.java | 2 +- .../core/metrics/OperationalMetricsTests.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opensearch/plugin/insights/core/metrics/OperationalMetric.java b/src/main/java/org/opensearch/plugin/insights/core/metrics/OperationalMetric.java index 9e9b2d71..9538d13a 100644 --- a/src/main/java/org/opensearch/plugin/insights/core/metrics/OperationalMetric.java +++ b/src/main/java/org/opensearch/plugin/insights/core/metrics/OperationalMetric.java @@ -32,6 +32,6 @@ public String getDescription() { @Override public String toString() { - return String.format(Locale.ROOT, "%s (%s)", name(), description); + return String.format(Locale.ROOT, "%s", name()); } } diff --git a/src/test/java/org/opensearch/plugin/insights/core/metrics/OperationalMetricsTests.java b/src/test/java/org/opensearch/plugin/insights/core/metrics/OperationalMetricsTests.java index ac6987fe..5896b96b 100644 --- a/src/test/java/org/opensearch/plugin/insights/core/metrics/OperationalMetricsTests.java +++ b/src/test/java/org/opensearch/plugin/insights/core/metrics/OperationalMetricsTests.java @@ -28,9 +28,14 @@ public void testEnumValues() { public void testToString() { // Test the toString method - assertEquals( - "LOCAL_INDEX_READER_PARSING_EXCEPTIONS (Number of errors when parsing with LocalIndexReader)", - OperationalMetric.LOCAL_INDEX_READER_PARSING_EXCEPTIONS.toString() - ); + assertEquals("LOCAL_INDEX_READER_PARSING_EXCEPTIONS", OperationalMetric.LOCAL_INDEX_READER_PARSING_EXCEPTIONS.toString()); + assertEquals("LOCAL_INDEX_EXPORTER_BULK_FAILURES", OperationalMetric.LOCAL_INDEX_EXPORTER_BULK_FAILURES.toString()); + assertEquals("LOCAL_INDEX_EXPORTER_DELETE_FAILURES", OperationalMetric.LOCAL_INDEX_EXPORTER_DELETE_FAILURES.toString()); + assertEquals("LOCAL_INDEX_EXPORTER_EXCEPTIONS", OperationalMetric.LOCAL_INDEX_EXPORTER_EXCEPTIONS.toString()); + assertEquals("INVALID_EXPORTER_TYPE_FAILURES", OperationalMetric.INVALID_EXPORTER_TYPE_FAILURES.toString()); + assertEquals("DATA_INGEST_EXCEPTIONS", OperationalMetric.DATA_INGEST_EXCEPTIONS.toString()); + assertEquals("QUERY_CATEGORIZE_EXCEPTIONS", OperationalMetric.QUERY_CATEGORIZE_EXCEPTIONS.toString()); + assertEquals("EXPORTER_FAIL_TO_CLOSE_EXCEPTION", OperationalMetric.EXPORTER_FAIL_TO_CLOSE_EXCEPTION.toString()); + assertEquals("TOP_N_QUERIES_USAGE_COUNT", OperationalMetric.TOP_N_QUERIES_USAGE_COUNT.toString()); } }