Revert "use a label to track the indexed file resource path instead o…

…f the file id (guid) to avoid overloading prometheus"

This reverts commit db9af96.

fence/__init__.py

@@ -442,7 +442,7 @@ def _setup_prometheus(app):
     app.prometheus_counters["pre_signed_url_req"] = Counter(
         "pre_signed_url_req",
         "tracking presigned url requests",
-        ["resource_path", "requested_protocol"],
+        ["guid", "requested_protocol"],
     )
 
 

fence/blueprints/data/indexd.py

@@ -36,7 +36,6 @@
     give_service_account_billing_access_if_necessary,
 )
 from fence.utils import get_valid_expiration_from_request
-from fence.utils import get_resource_paths
 from . import multipart_upload
 
 
@@ -83,9 +82,7 @@ def get_signed_url_for_file(action, file_id, file_name=None):
     # increment counter for gen3-metrics
     counter = flask.current_app.prometheus_counters.get("pre_signed_url_req")
     if counter:
-        # identify project associated with indexd record based on its authz/acl
-        resource_path = get_resource_paths(indexed_file)[0]
-        counter.labels(resource_path, requested_protocol).inc()
+        counter.labels(file_id, requested_protocol).inc()
 
     if action == "download":  # for now only record download requests
         create_presigned_url_audit_log(
@@ -97,7 +94,10 @@ def get_signed_url_for_file(action, file_id, file_name=None):
 
 def create_presigned_url_audit_log(indexed_file, action, protocol):
     user_info = _get_user_info(sub_to_string=False)
-    resource_paths = get_resource_paths(indexed_file)
+    resource_paths = indexed_file.index_document.get("authz", [])
+    if not resource_paths:
+        # fall back on ACL
+        resource_paths = indexed_file.index_document.get("acl", [])
     if not protocol and indexed_file.indexed_file_locations:
         protocol = indexed_file.indexed_file_locations[0].protocol
     flask.current_app.audit_service_client.create_presigned_url_log(

fence/utils.py

@@ -363,14 +363,6 @@ def _is_status(code):
     return False
 
 
-def get_resource_paths(indexed_file):
-    resource_paths = indexed_file.index_document.get("authz", [])
-    if not resource_paths:
-        # fall back on ACL
-        resource_paths = indexed_file.index_document.get("acl", [])
-    return resource_paths
-
-
 # Default settings to control usage of backoff library.
 DEFAULT_BACKOFF_SETTINGS = {
     "on_backoff": log_backoff_retry,

tests/data/test_data.py

@@ -109,7 +109,7 @@ def test_indexd_prometheus_presigned_url_counter(
         app.prometheus_registry.get_sample_value(
             "pre_signed_url_req_total",
             {
-                "resource_path": indexd_client["resource_paths"][0],
+                "guid": "1",
                 "requested_protocol": indexd_client["indexed_file_location"],
             },
         )
@@ -138,7 +138,7 @@ def test_indexd_prometheus_presigned_url_counter(
     after = app.prometheus_registry.get_sample_value(
         "pre_signed_url_req_total",
         {
-            "resource_path": indexd_client["resource_paths"][0],
+            "guid": "1",
             "requested_protocol": indexd_client["indexed_file_location"],
         },
     )