Merge pull request #86 from edina/add-metrics

Add a prometheus metrics handler

nbexchange/app.py

@@ -21,6 +21,7 @@
 from nbexchange.handlers.auth.naas_user_handler import NaasUserHandler
 from nbexchange.handlers.auth.user_handler import BaseUserHandler
 
+from tornado_prometheus import PrometheusMixIn, MetricsHandler
 
 ROOT = os.path.dirname(__file__)
 STATIC_FILES_DIR = os.path.join(ROOT, "static")
@@ -57,7 +58,7 @@ def default(self, obj=None):
 }
 
 
-class NbExchange(Application):
+class NbExchange(PrometheusMixIn, Application):
     """The nbexchange application"""
 
     name = "nbexchange"
@@ -251,6 +252,8 @@ def init_handlers(self):
             for url in handler.urls:
                 self.handlers.append((url_path_join(self.base_url, url), handler))
 
+        self.handlers.append((r"/metrics", MetricsHandler))
+
         self.handlers.append((r".*", base.Template404))
         self.log.debug("##### ALL HANDLERS" + str(self.handlers))
 

setup.py

@@ -24,15 +24,16 @@
 REQUIRED = [
     "alembic",
     "aiocontextvars",
-    "tornado",
+    "tornado==6.1",
     "psycopg2-binary",
     "ipykernel==5.5.0",
     "jupyterhub",
     "sentry-sdk==1.0.0",
     "sqlalchemy>=1.4.3",
     "nbgrader==0.7.0.dev0",
-    "urllib3==1.25.11", # Pinned because of requests depdendency conflict
+    "urllib3==1.25.11", # Pinned because of requests dependency conflict
     "pyjwt",
+    "tornado-prometheus==0.1.1",
 ]
 
 # What packages are required for testing?