diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-02-10 14:10:48 +0100 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-02-10 14:10:48 +0100 |
commit | 4bc45a0eb891883f0a7c4ad63d1cedc4b65ebd19 (patch) | |
tree | 4836234bd0792f8b93351a90810884e4aa80d35a | |
parent | f62bb48baf715609606faa82a6119012b8a727de (diff) |
Rename docproc metrics
3 files changed, 15 insertions, 9 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 e1bd114c4d3..7a3a1aa3f6a 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 @@ -305,6 +305,8 @@ public class VespaMetricSet { addMetric(metrics, ContainerMetrics.TOTAL_HITS_PER_QUERY, EnumSet.of(sum, count, max, ninety_five_percentile, ninety_nine_percentile)); addMetric(metrics, ContainerMetrics.EMPTY_RESULTS.rate()); addMetric(metrics, ContainerMetrics.REQUESTS_OVER_QUOTA, EnumSet.of(rate, count)); + addMetric(metrics, ContainerMetrics.DOCPROC_PROC_TIME, EnumSet.of(sum, count, max)); + addMetric(metrics, ContainerMetrics.DOCPROC_DOCUMENTS, EnumSet.of(sum, count, max)); addMetric(metrics, ContainerMetrics.RELEVANCE_AT_1, EnumSet.of(sum, count)); addMetric(metrics, ContainerMetrics.RELEVANCE_AT_3, EnumSet.of(sum, count)); diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java index 72640310db1..b96f65c4d56 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java +++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java @@ -126,6 +126,8 @@ public enum ContainerMetrics implements VespaMetrics { DOCUMENTS_TARGET_TOTAL("documents_target_total", Unit.DOCUMENT, "The target number of total documents to be evaluated when when all data is in sync"), JDISC_RENDER_LATENCY("jdisc.render.latency", Unit.NANOSECOND, "The time used by the container to render responses"), QUERY_ITEM_COUNT("query_item_count", Unit.ITEM, "The number of query items (terms, phrases, etc)"), + DOCPROC_PROC_TIME("docproc.proctime", Unit.MILLISECOND, "Time spent processing document"), + DOCPROC_DOCUMENTS("docproc.documents", Unit.DOCUMENT, "Number of processed documents"), TOTAL_HITS_PER_QUERY("totalhits_per_query", Unit.HIT_PER_QUERY, "The total number of documents found to match queries"), EMPTY_RESULTS("empty_results", Unit.OPERATION, "Number of queries matching no documents"), diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java index 440935ef494..3612e676ac9 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Call.java +++ b/docproc/src/main/java/com/yahoo/docproc/Call.java @@ -12,8 +12,10 @@ import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentUpdate; import com.yahoo.jdisc.Metric; import com.yahoo.concurrent.SystemTimer; +import com.yahoo.metrics.ContainerMetrics; import java.util.List; +import java.util.Map; /** * A document processor to call - an item on a {@link com.yahoo.docproc.CallStack}. @@ -24,9 +26,10 @@ import java.util.List; public class Call implements Cloneable { private final DocumentProcessor processor; - private final String docCounterName; - private final String procTimeCounterName; + private final String PROC_TIME_METRIC_NAME = ContainerMetrics.DOCPROC_PROC_TIME.baseName(); + private final String PROC_DOC_COUNT_METRIC_NAME = ContainerMetrics.DOCPROC_DOCUMENTS.baseName(); private final Metric metric; + private final Metric.Context metricContext; public Call(DocumentProcessor processor) { this(processor, new NullMetric()); @@ -45,12 +48,11 @@ public class Call implements Cloneable { this.processor = processor; if (chainName == null) chainName = ""; - chainName = chainName.replaceAll("[^\\p{Alnum}]", "_"); - docCounterName = "docprocessor_" + chainName + "_" + - getDocumentProcessorId().stringValue().replaceAll("[^\\p{Alnum}]", "_") + "_documents"; - procTimeCounterName = "docprocessor_" + chainName + "_" + - getDocumentProcessorId().stringValue().replaceAll("[^\\p{Alnum}]", "_") + "_proctime"; this.metric = metric; + this.metricContext = metric.createContext(Map.of( + "chain", chainName, + "docproc", getDocumentProcessorId().stringValue() + )); } @Override @@ -165,11 +167,11 @@ public class Call implements Cloneable { } private void incrementDocs(long increment) { - metric.add(docCounterName, increment, null); + metric.add(PROC_DOC_COUNT_METRIC_NAME, increment, metricContext); } private void incrementProcTime(long increment) { - metric.add(procTimeCounterName, increment, null); + metric.add(PROC_TIME_METRIC_NAME, increment, metricContext); } } |