From 2b863cce83fd5ed0f99d82d4dbe6f84cdd1ed8fe Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 25 Nov 2021 15:01:30 +0100 Subject: Rename metric to 'httpapi_condition_not_met' --- .../java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 2 +- .../src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java | 5 ++++- .../src/main/java/com/yahoo/vespa/http/server/MetricNames.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index 5c21f3f5a8d..973f7f5cc40 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -165,7 +165,7 @@ public class VespaMetricSet { metrics.add(new Metric("httpapi_succeeded.rate")); metrics.add(new Metric("httpapi_failed.rate")); metrics.add(new Metric("httpapi_parse_error.rate")); - addMetric(metrics, "httpapi_test_and_set_condition_not_met", List.of("rate")); + addMetric(metrics, "httpapi_condition_not_met", List.of("rate")); metrics.add(new Metric("mem.heap.total.average")); metrics.add(new Metric("mem.heap.free.average")); diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java index 3faafd7b2e5..50f79c0a828 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java @@ -12,6 +12,7 @@ import com.yahoo.messagebus.Trace; import com.yahoo.vespa.http.client.core.ErrorCode; import com.yahoo.vespa.http.client.core.OperationStatus; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -25,10 +26,12 @@ public class FeedReplyReader implements ReplyHandler { private static final Logger log = Logger.getLogger(FeedReplyReader.class.getName()); private final Metric metric; private final DocumentApiMetrics metricsHelper; + private final Metric.Context testAndSetMetricCtx; public FeedReplyReader(Metric metric, DocumentApiMetrics metricsHelper) { this.metric = metric; this.metricsHelper = metricsHelper; + this.testAndSetMetricCtx = metric.createContext(Map.of("operationType", "testAndSet")); } @Override @@ -52,7 +55,7 @@ public class FeedReplyReader implements ReplyHandler { metricsHelper.reportSuccessful(type, latencyInSeconds); metric.add(MetricNames.SUCCEEDED, 1, null); if (!conditionMet) - metric.add(MetricNames.TEST_AND_SET_CONDITION_NOT_MET, 1, null); + metric.add(MetricNames.CONDITION_NOT_MET, 1, testAndSetMetricCtx); enqueue(context, "Document processed.", ErrorCode.OK, !conditionMet, reply.getTrace()); } } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/MetricNames.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/MetricNames.java index 4b49e3594f8..6ded410ff68 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/MetricNames.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/MetricNames.java @@ -18,7 +18,7 @@ public final class MetricNames { public static final String OPERATIONS_PER_SEC = PREFIX + "ops_per_sec"; public static final String LATENCY = PREFIX + "latency"; public static final String FAILED = PREFIX + "failed"; - public static final String TEST_AND_SET_CONDITION_NOT_MET = PREFIX + "test_and_set_condition_not_met"; + public static final String CONDITION_NOT_MET = PREFIX + "condition_not_met"; public static final String PARSE_ERROR = PREFIX + "parse_error"; public static final String SUCCEEDED = PREFIX + "succeeded"; public static final String PENDING = PREFIX + "pending"; -- cgit v1.2.3