diff --git a/fence/auth.py b/fence/auth.py index 25c813f86..4c287e14a 100644 --- a/fence/auth.py +++ b/fence/auth.py @@ -132,12 +132,7 @@ def set_flask_session_values(user): current_app.scoped_session().add(user) current_app.scoped_session().commit() - from fence.metrics import ( - login_counter, - fence_login_counter, - google_login_counter, - ras_login_counter, - ) + 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 6da67389e..dc25100a7 100644 --- a/fence/blueprints/login/fence_login.py +++ b/fence/blueprints/login/fence_login.py @@ -124,6 +124,8 @@ 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/google.py b/fence/blueprints/login/google.py index 6d70e782a..4c6d63251 100644 --- a/fence/blueprints/login/google.py +++ b/fence/blueprints/login/google.py @@ -13,8 +13,6 @@ def __init__(self): class GoogleCallback(DefaultOAuth2Callback): - from fence.metrics import google_login_counter - def __init__(self): super(GoogleCallback, self).__init__( idp_name=IdentityProvider.google, client=flask.current_app.google_client @@ -28,6 +26,8 @@ def get(self): + "/link/google/callback?code={}".format(flask.request.args.get("code")) ) + from fence.metrics import google_login_counter + google_login_counter.inc() return super(GoogleCallback, self).get() diff --git a/fence/blueprints/login/ras.py b/fence/blueprints/login/ras.py index 6756c9c83..50e81f46f 100644 --- a/fence/blueprints/login/ras.py +++ b/fence/blueprints/login/ras.py @@ -110,6 +110,8 @@ 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(