Eliminate code duplication in generating metric context for requests

2 files changed, 46 insertions, 23 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/HandlerMetricContextUtil.java b/container-core/src/main/java/com/yahoo/container/core/HandlerMetricContextUtil.java
new file mode 100644
index 00000000000..7cfbab0dffa
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/container/core/HandlerMetricContextUtil.java
@@ -0,0 +1,44 @@
+package com.yahoo.container.core;
+
+import com.yahoo.jdisc.Metric;
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.application.BindingMatch;
+import com.yahoo.jdisc.application.UriPattern;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Common conversion from a handled http request to a metric context.
+ *
+ * @author jonmv
+ */
+public class HandlerMetricContextUtil {
+
+    public static Metric.Context contextFor(Request request, Metric metric, Class<?> handlerClass) {
+        return contextFor(request, Map.of(), metric, handlerClass);
+    }
+
+    public static Metric.Context contextFor(Request request, Map<String, String> extraDimensions, Metric metric, Class<?> handlerClass) {
+        BindingMatch<?> match = request.getBindingMatch();
+        if (match == null) return null;
+        UriPattern matched = match.matched();
+        if (matched == null) return null;
+        String name = matched.toString();
+        String endpoint = request.headers().containsKey("Host") ? request.headers().get("Host").get(0) : null;
+
+        Map<String, String> dimensions = new HashMap<>();
+        dimensions.put("handler", name);
+        if (endpoint != null) {
+            dimensions.put("endpoint", endpoint);
+        }
+        URI uri = request.getUri();
+        dimensions.put("scheme", uri.getScheme());
+        dimensions.put("port", Integer.toString(uri.getPort()));
+        dimensions.put("handler-name", handlerClass.getName());
+        dimensions.putAll(extraDimensions);
+        return metric.createContext(dimensions);
+    }
+
+}
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
index 0e8865538ee..f0583f82cc2 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
@@ -6,8 +6,6 @@ import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.Request;
 import com.yahoo.jdisc.ResourceReference;
 import com.yahoo.jdisc.Response;
-import com.yahoo.jdisc.application.BindingMatch;
-import com.yahoo.jdisc.application.UriPattern;
 import com.yahoo.jdisc.handler.AbstractRequestHandler;
 import com.yahoo.jdisc.handler.BufferedContentChannel;
 import com.yahoo.jdisc.handler.ContentChannel;
@@ -15,10 +13,9 @@ import com.yahoo.jdisc.handler.OverloadException;
 import com.yahoo.jdisc.handler.ReadableContentChannel;
 import com.yahoo.jdisc.handler.ResponseDispatch;
 import com.yahoo.jdisc.handler.ResponseHandler;
+import com.yahoo.container.core.HandlerMetricContextUtil;
 
-import java.net.URI;
 import java.time.Duration;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Executor;
@@ -79,25 +76,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler {
     }
 
     Metric.Context contextFor(Request request, Map<String, String> extraDimensions) {
-        BindingMatch<?> match = request.getBindingMatch();
-        if (match == null) return null;
-        UriPattern matched = match.matched();
-        if (matched == null) return null;
-        String name = matched.toString();
-        String endpoint = request.headers().containsKey("Host") ? request.headers().get("Host").get(0) : null;
-
-        Map<String, String> dimensions = new HashMap<>();
-        dimensions.put("handler", name);
-        if (endpoint != null) {
-            dimensions.put("endpoint", endpoint);
-        }
-        URI uri = request.getUri();
-        dimensions.put("scheme", uri.getScheme());
-        dimensions.put("port", Integer.toString(uri.getPort()));
-        String handlerClassName = getClass().getName();
-        dimensions.put("handler-name", handlerClassName);
-        dimensions.putAll(extraDimensions);
-        return this.metric.createContext(dimensions);
+        return HandlerMetricContextUtil.contextFor(request, extraDimensions, metric, getClass());
     }
 
     private Metric.Context contextFor(Request request) { return contextFor(request, Map.of()); }