Merge pull request #26304 from vespa-engine/yngveaasheim/move-metric-enum-to-better-place

Separate enum for routing layer metrics

2 files changed, 34 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/metrics/NodeAdminMetrics.java b/container-core/src/main/java/com/yahoo/metrics/NodeAdminMetrics.java
index 065ece33ecf..004a226f825 100644
--- a/container-core/src/main/java/com/yahoo/metrics/NodeAdminMetrics.java
+++ b/container-core/src/main/java/com/yahoo/metrics/NodeAdminMetrics.java
@@ -5,7 +5,6 @@ package com.yahoo.metrics;
  */
 public enum NodeAdminMetrics implements VespaMetrics {
 
-    WORKER_CONNECTIONS("worker.connections", Unit.CONNECTION, "Yahoo! Internal: Number of connections for the routing worker having most connections per node"),  // Hosted Vespa only (routing layer) TODO: Move to a better place
     ENDPOINT_CERTIFICATE_EXPIRY_SECONDS("endpoint.certificate.expiry.seconds", Unit.SECOND, "Time until node endpoint certificate expires"),
     NODE_CERTIFICATE_EXPIRY_SECONDS("node-certificate.expiry.seconds", Unit.SECOND, "Time until node certificate expires");
 
diff --git a/container-core/src/main/java/com/yahoo/metrics/RoutingLayerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/RoutingLayerMetrics.java
new file mode 100644
index 00000000000..773afae00ba
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/metrics/RoutingLayerMetrics.java
@@ -0,0 +1,34 @@
+package com.yahoo.metrics;
+
+/**
+ * @author yngveaasheim
+ */
+
+// Internal hosted Vespa only TODO: Move to a better place
+public enum RoutingLayerMetrics implements VespaMetrics {
+
+    WORKER_CONNECTIONS("worker.connections", Unit.CONNECTION, "Yahoo! Internal: Number of connections for the routing worker having most connections per node");
+
+    private final String name;
+    private final Unit unit;
+    private final String description;
+
+    RoutingLayerMetrics(String name, Unit unit, String description) {
+        this.name = name;
+        this.unit = unit;
+        this.description = description;
+    }
+
+    public String baseName() {
+        return name;
+    }
+
+    public Unit unit() {
+        return unit;
+    }
+
+    public String description() {
+        return description;
+    }
+
+}