From 8a845936eb7c3872c755913b5a5c66cc9ea8db96 Mon Sep 17 00:00:00 2001
From: Edward Malinowski <edwardmalinowski@Eds-MacBook-Pro.attlocal.net>
Date: Wed, 26 Jun 2024 07:11:12 -0500
Subject: [PATCH] chore(metrics): Added more metrics

---
 fence/auth.py                         | 7 ++++++-
 fence/blueprints/login/base.py        | 3 ---
 fence/blueprints/login/fence_login.py | 2 --
 fence/blueprints/login/ras.py         | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/fence/auth.py b/fence/auth.py
index 4c287e14a..25c813f86 100644
--- a/fence/auth.py
+++ b/fence/auth.py
@@ -132,7 +132,12 @@ def set_flask_session_values(user):
     current_app.scoped_session().add(user)
     current_app.scoped_session().commit()
 
-    from fence.metrics import login_counter
+    from fence.metrics import (
+        login_counter,
+        fence_login_counter,
+        google_login_counter,
+        ras_login_counter,
+    )
 
     login_counter.inc()
 
diff --git a/fence/blueprints/login/base.py b/fence/blueprints/login/base.py
index 0f5ade6f4..18eea220d 100644
--- a/fence/blueprints/login/base.py
+++ b/fence/blueprints/login/base.py
@@ -179,6 +179,3 @@ def _login(username, idp_name, email=None, id_from_idp=None):
     if flask.session.get("redirect"):
         return flask.redirect(flask.session.get("redirect"))
     return flask.jsonify({"username": username})
-    from fence.metrics import login_counter
-
-    login_counter.inc()
diff --git a/fence/blueprints/login/fence_login.py b/fence/blueprints/login/fence_login.py
index dc25100a7..6da67389e 100644
--- a/fence/blueprints/login/fence_login.py
+++ b/fence/blueprints/login/fence_login.py
@@ -124,8 +124,6 @@ def get(self):
         )
         self.post_login()
 
-        from fence.metrics import fence_login_counter
-
         fence_login_counter.inc()
 
         if config["REGISTER_USERS_ON"]:
diff --git a/fence/blueprints/login/ras.py b/fence/blueprints/login/ras.py
index 50e81f46f..6756c9c83 100644
--- a/fence/blueprints/login/ras.py
+++ b/fence/blueprints/login/ras.py
@@ -110,8 +110,6 @@ def post_login(self, user=None, token_result=None, id_from_idp=None):
                 expires,
             )
 
-        from fence.metrics import ras_login_counter
-
         ras_login_counter.inc()
 
         flask.current_app.ras_client.store_refresh_token(