JS metrics investigation and proposed fix (#2771)

src/endpoints/endpoint_registry.cpp

@@ -72,7 +72,9 @@ namespace ccf::endpoints
   EndpointRegistry::Metrics& EndpointRegistry::get_metrics_for_endpoint(
     const EndpointDefinitionPtr& e)
   {
-    return metrics[e->dispatch.uri_path][e->dispatch.verb.c_str()];
+    auto method = e->dispatch.uri_path;
+    method = method.substr(method.find_first_not_of('/'));
+    return metrics[method][e->dispatch.verb.c_str()];
   }
 
   Endpoint EndpointRegistry::make_endpoint(

tests/e2e_logging.py

@@ -551,12 +551,18 @@ def test_raw_text(network, args):
 def test_metrics(network, args):
     primary, _ = network.find_primary()
 
-    def get_metrics(r, path, method):
-        return next(
-            v
-            for v in r.body.json()["metrics"]
-            if v["path"] == path and v["method"] == method
-        )
+    def get_metrics(r, path, method, default=None):
+        try:
+            return next(
+                v
+                for v in r.body.json()["metrics"]
+                if v["path"] == path and v["method"] == method
+            )
+        except StopIteration:
+            if default is None:
+                raise
+            else:
+                return default
 
     calls = 0
     errors = 0
@@ -580,6 +586,20 @@ def get_metrics(r, path, method):
         r = c.get("/app/api/metrics")
         assert get_metrics(r, "api/metrics", "GET")["errors"] == errors + 1
 
+    calls = 0
+    with primary.client("user0") as c:
+        r = c.get("/app/api/metrics")
+        calls = get_metrics(r, "log/public", "POST", {"calls": 0})["calls"]
+
+    network.txs.issue(
+        network=network,
+        number_txs=1,
+    )
+
+    with primary.client("user0") as c:
+        r = c.get("/app/api/metrics")
+        assert get_metrics(r, "log/public", "POST")["calls"] == calls + 1
+
     return network