From 1c988c5544323aa60884166ff1c76036cebcc9cf Mon Sep 17 00:00:00 2001 From: jonmv Date: Thu, 25 Jan 2024 10:52:39 +0100 Subject: Metrics for container.feed GET requests too --- .../com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java | 3 ++- .../java/com/yahoo/documentapi/metrics/DocumentOperationType.java | 2 +- .../src/main/java/com/yahoo/vespa/http/server/MetricNames.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) 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 19e0c0dc77d..5c63b07dcc0 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 @@ -435,7 +435,8 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { return ignoredContent; } - private ContentChannel getDocument(HttpRequest request, DocumentPath path, ResponseHandler handler) { + private ContentChannel getDocument(HttpRequest request, DocumentPath path, ResponseHandler rawHandler) { + ResponseHandler handler = new MeasuringResponseHandler(request, rawHandler, com.yahoo.documentapi.metrics.DocumentOperationType.GET, clock.instant()); disallow(request, DRY_RUN); enqueueAndDispatch(request, handler, () -> { DocumentOperationParameters rawParameters = parametersFromRequest(request, CLUSTER, FIELD_SET); diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/documentapi/metrics/DocumentOperationType.java b/vespaclient-container-plugin/src/main/java/com/yahoo/documentapi/metrics/DocumentOperationType.java index 1c0b8c560ac..63bf520f4d3 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/documentapi/metrics/DocumentOperationType.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/documentapi/metrics/DocumentOperationType.java @@ -11,7 +11,7 @@ import com.yahoo.messagebus.Message; */ public enum DocumentOperationType { - PUT, REMOVE, UPDATE, ERROR; + GET, PUT, REMOVE, UPDATE, ERROR; public static DocumentOperationType fromMessage(Message msg) { if (msg instanceof PutDocumentMessage) { 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 bf740014edd..efcffb16a2b 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 @@ -7,9 +7,10 @@ import ai.vespa.metrics.ContainerMetrics; * Place to store the metric names so where the metrics are logged can be found * more easily in an IDE. * - * @author steinar + * @author Steinar Knutsen */ public final class MetricNames { + public static final String NUM_OPERATIONS = ContainerMetrics.HTTPAPI_NUM_OPERATIONS.baseName(); public static final String NUM_PUTS = ContainerMetrics.HTTPAPI_NUM_PUTS.baseName(); public static final String NUM_REMOVES = ContainerMetrics.HTTPAPI_NUM_REMOVES.baseName(); @@ -26,7 +27,6 @@ public final class MetricNames { public static final String FAILED_TIMEOUT = ContainerMetrics.HTTPAPI_FAILED_TIMEOUT.baseName(); public static final String FAILED_INSUFFICIENT_STORAGE = ContainerMetrics.HTTPAPI_FAILED_INSUFFICIENT_STORAGE.baseName(); - private MetricNames() { - } + private MetricNames() { } } -- cgit v1.2.3