diff options
author | Bjørn Meland <bjormel@users.noreply.github.com> | 2020-01-07 14:07:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-07 14:07:30 +0100 |
commit | 2d1ada3ff840151232fc606eae21aedf1f7e6d86 (patch) | |
tree | b34f17c3abced40c3df6b6850c8939e3d0304b67 | |
parent | 5c104cd8e0f18716a47840643b7f10260d1f2c0c (diff) |
Revert "VESPA-16236: endpoint as a dimension to search requests"
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java | 17 |
1 files changed, 11 insertions, 6 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 ebea2f95af7..77cfebd07e5 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 @@ -84,6 +84,7 @@ public class StatisticsSearcher extends Searcher { private enum DegradedReason { match_phase, adaptive_timeout, timeout, non_ideal_state } private Metric metric; + private Map<String, Metric.Context> chainContexts = new CopyOnWriteHashMap<>(); private Map<String, Metric.Context> statePageOnlyContexts = new CopyOnWriteHashMap<>(); private Map<String, Map<DegradedReason, Metric.Context>> degradedReasonContexts = new CopyOnWriteHashMap<>(); private Map<String, Map<String, Metric.Context>> relevanceContexts = new CopyOnWriteHashMap<>(); @@ -152,11 +153,15 @@ public class StatisticsSearcher extends Searcher { peakQpsReporter.countQuery(); } - private Metric.Context getChainMetricContext(String chainName, String endpoint) { - Map<String, String> dimensions = new HashMap<>(); - dimensions.put("chain", chainName); - dimensions.put("endpoint", endpoint); - return this.metric.createContext(dimensions); + private Metric.Context getChainMetricContext(String chainName) { + Metric.Context context = chainContexts.get(chainName); + if (context == null) { + Map<String, String> dimensions = new HashMap<>(); + dimensions.put("chain", chainName); + context = this.metric.createContext(dimensions); + chainContexts.put(chainName, context); + } + return context; } private Metric.Context getDegradedMetricContext(String chainName, Coverage coverage) { @@ -223,7 +228,7 @@ public class StatisticsSearcher extends Searcher { return execution.search(query); } - Metric.Context metricContext = getChainMetricContext(execution.chain().getId().stringValue(), query.getHttpRequest().getHeader("Host")); + Metric.Context metricContext = getChainMetricContext(execution.chain().getId().stringValue()); incrQueryCount(metricContext); logQuery(query); |