Merge pull request #4765 from vespa-engine/jobergum/add-ignore-query-for-metric-flag

Jobergum/add ignore query for metric flag

2 files changed, 7 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
index c436ce09d33..6a7af378e68 100644
--- a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
@@ -9,6 +9,7 @@ import com.yahoo.jdisc.Metric;
 import com.yahoo.log.LogLevel;
 import com.yahoo.metrics.simple.MetricSettings;
 import com.yahoo.metrics.simple.MetricReceiver;
+import com.yahoo.processing.request.CompoundName;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.result.ErrorHit;
@@ -43,6 +44,7 @@ import static com.yahoo.container.protect.Error.*;
 @Before(PhaseNames.RAW_QUERY)
 public class StatisticsSearcher extends Searcher {
 
+    private static final CompoundName IGNORE_QUERY = new CompoundName("metrics.ignore");
     private static final String MAX_QUERY_LATENCY_METRIC = "max_query_latency";
     private static final String EMPTY_RESULTS_METRIC = "empty_results";
     private static final String HITS_PER_QUERY_METRIC = "hits_per_query";
@@ -185,6 +187,10 @@ public class StatisticsSearcher extends Searcher {
      * 3) .....
      */
     public Result search(com.yahoo.search.Query query, Execution execution) {
+        if(query.properties().getBoolean(IGNORE_QUERY,false)){
+            return execution.search(query);
+        }
+
         Metric.Context metricContext = getChainMetricContext(execution.chain().getId().stringValue());
 
         incrQueryCount(metricContext);
diff --git a/container-search/src/main/java/com/yahoo/search/result/Hit.java b/container-search/src/main/java/com/yahoo/search/result/Hit.java
index 3cc7378de5c..6adbac56dbe 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Hit.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Hit.java
@@ -405,7 +405,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
 
     /**
      * Will preallocate in order to avoid resizing.
-     * @param minSize
+     * @param minSize The minimum size to reserve
      */
     public void reserve(int minSize) {
         getFieldMap(minSize);