Don't repeat extension name in metrics

yuvipanda · yuvipanda · commit 36e8ad6659e0 · 2024-11-04T09:59:40.000-08:00
diff --git a/jupyter_server/prometheus/metrics.py b/jupyter_server/prometheus/metrics.py
@@ -53,7 +53,7 @@
 
 # New prometheus metrics that do not exist in notebook v6 go here
 SERVER_INFO = Info("jupyter_server", "Jupyter Server Version information")
-SERVER_EXTENSION_INFO = Info("jupyter_server_extension", "Jupyter Server Extensiom Version Information", ["extension_name", "package_name", "version", "enabled"])
+SERVER_EXTENSION_INFO = Info("jupyter_server_extension", "Jupyter Server Extensiom Version Information", ["name", "version", "enabled"])
 
 __all__ = [
     "HTTP_REQUEST_DURATION_SECONDS",
diff --git a/jupyter_server/serverapp.py b/jupyter_server/serverapp.py
@@ -2705,8 +2705,7 @@ def init_metrics(self) -> None:
 
         for k, ext in self.extension_manager.extensions.items():
             SERVER_EXTENSION_INFO.labels(
-                package_name=k,
-                extension_name=ext.name,
+                name=ext.name,
                 version=ext.version,
                 enabled=str(ext.enabled).lower()
             )

Original file line number	Diff line number	Diff line change
`@@ -2705,8 +2705,7 @@ def init_metrics(self) -> None:`
`2705`	`2705`
`2706`	`2706`	`for k, ext in self.extension_manager.extensions.items():`
`2707`	`2707`	`SERVER_EXTENSION_INFO.labels(`
`2708`		`- package_name=k,`
`2709`		`- extension_name=ext.name,`
	`2708`	`+ name=ext.name,`
`2710`	`2709`	`version=ext.version,`
`2711`	`2710`	`enabled=str(ext.enabled).lower()`
`2712`	`2711`	`)`