metrics: Indicate which user used legacy_api_key_v2 (#912)

CERT-Polska · Feb 15, 2024 · bcd4c6e · bcd4c6e
1 parent 6b2e7cf
commit bcd4c6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mwdb/core/deprecated.py b/mwdb/core/deprecated.py
@@ -49,8 +49,10 @@ def uses_deprecated_api(
     feature: DeprecatedFeature,
     endpoint: Optional[str] = None,
     method: Optional[str] = None,
+    user: Optional[str] = None,
 ):
-    user = g.auth_user.login if g.auth_user is not None else None
+    if user is None:
+        user = g.auth_user.login if g.auth_user is not None else None
     metric_deprecated_usage.inc(
         feature=str(feature.value), endpoint=endpoint, method=method, user=user
     )

diff --git a/mwdb/model/api_key.py b/mwdb/model/api_key.py
@@ -38,7 +38,9 @@ def verify_token(token):
                 return None
             else:
                 # Note a deprecated usage
-                uses_deprecated_api(DeprecatedFeature.legacy_api_key_v2)
+                uses_deprecated_api(
+                    DeprecatedFeature.legacy_api_key_v2, user=data.get("login")
+                )
 
         try:
             api_key_obj = APIKey.query.filter(