From 586185086d0e860a8c1e19c4dc013dbd5520f858 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 7 Dec 2022 18:59:25 +0100 Subject: Revert back to single metric aggregated --- .../yahoo/document/restapi/resource/DocumentV1ApiHandler.java | 11 +++++------ .../yahoo/document/restapi/resource/DocumentV1ApiTest.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'vespaclient-container-plugin/src') diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java index 6ad6fe2b1e2..1d202ab8866 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java @@ -1100,7 +1100,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { incrementMetricNumOperations(); incrementMetricNumPuts(); sampleLatency(latency); switch (outcome) { case SUCCESS -> incrementMetricSucceeded(); - case CONDITION_FAILED -> { incrementMetricSucceeded(); incrementMetricConditionNotMet(); } + case CONDITION_FAILED -> incrementMetricConditionNotMet(); default -> incrementMetricFailed(); } } @@ -1110,8 +1110,8 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { incrementMetricNumOperations(); incrementMetricNumUpdates(); sampleLatency(latency); switch (outcome) { case SUCCESS -> incrementMetricSucceeded(); - case NOT_FOUND -> { incrementMetricSucceeded(); incrementMetricNotFound(); } - case CONDITION_FAILED -> { incrementMetricSucceeded(); incrementMetricConditionNotMet(); } + case NOT_FOUND -> incrementMetricNotFound(); + case CONDITION_FAILED -> incrementMetricConditionNotMet(); default -> incrementMetricFailed(); } } @@ -1119,9 +1119,8 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { private void updateRemoveMetrics(Outcome outcome, double latency) { incrementMetricNumOperations(); incrementMetricNumRemoves(); sampleLatency(latency); switch (outcome) { - case SUCCESS -> incrementMetricSucceeded(); - case NOT_FOUND -> { incrementMetricSucceeded(); incrementMetricNotFound(); } - case CONDITION_FAILED -> { incrementMetricSucceeded(); incrementMetricConditionNotMet(); } + case SUCCESS,NOT_FOUND -> incrementMetricSucceeded(); + case CONDITION_FAILED -> incrementMetricConditionNotMet(); default -> incrementMetricFailed(); } } diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java index ea143b7e480..973d0a98b24 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java @@ -845,7 +845,7 @@ public class DocumentV1ApiTest { handler.get().handleResponse(new Response(0)); // response may eventually arrive, but too late. } - assertEquals(5, metric.metrics().get("httpapi_succeeded").get(Map.of()), 0); + assertEquals(3, metric.metrics().get("httpapi_succeeded").get(Map.of()), 0); assertEquals(1, metric.metrics().get("httpapi_condition_not_met").get(Map.of()), 0); assertEquals(1, metric.metrics().get("httpapi_not_found").get(Map.of()), 0); assertEquals(1, metric.metrics().get("httpapi_failed").get(Map.of()), 0); -- cgit v1.2.3