add jupyter_ prefix to new metric, and use more standard kernel_name …

…for the kernel name field
minrk · Mar 22, 2023 · fb3c19a · fb3c19a
1 parent c75004d
commit fb3c19a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/jupyter_server/prometheus/metrics.py b/jupyter_server/prometheus/metrics.py
@@ -45,7 +45,7 @@
     )
 
 KERNEL_RESTARTS = Counter(
-    "kernel_restarts",
-    "counter for how many kernel restarts, labeled by type and source (user or restarter)",
-    ["type", "source"],
+    "jupyter_kernel_restarts",
+    "counter for how many kernel restarts, labeled by kernel_name and source (user or restarter)",
+    ["kernel_name", "source"],
 )
diff --git a/jupyter_server/services/kernels/handlers.py b/jupyter_server/services/kernels/handlers.py
@@ -105,7 +105,7 @@ async def post(self, kernel_id, action):
                 self.set_status(500)
             else:
                 model = await ensure_async(km.kernel_model(kernel_id))
-                KERNEL_RESTARTS.labels(type=model["name"], source="user").inc()
+                KERNEL_RESTARTS.labels(kernel_name=model["name"], source="user").inc()
                 self.write(json.dumps(model, default=json_default))
         self.finish()
 

diff --git a/jupyter_server/services/kernels/kernelmanager.py b/jupyter_server/services/kernels/kernelmanager.py
@@ -181,7 +181,7 @@ def __init__(self, **kwargs):
 
     def _handle_kernel_restart(self, kernel_id, kernel_name):
         """notice that a kernel restarted"""
-        KERNEL_RESTARTS.labels(type=kernel_name, source="restarter").inc()
+        KERNEL_RESTARTS.labels(kernel_name=kernel_name, source="restarter").inc()
 
     def _handle_kernel_died(self, kernel_id):
         """notice that a kernel died"""