remove guid and leave just the protocol label

uc-cdis · May 17, 2021 · c51f3df · c51f3df
1 parent ad27a97
commit c51f3df
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/fence/__init__.py b/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",
-        ["guid", "requested_protocol"],
+        ["requested_protocol"],
     )
 
 

diff --git a/fence/blueprints/data/indexd.py b/fence/blueprints/data/indexd.py
@@ -82,7 +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:
-        counter.labels(file_id, requested_protocol).inc()
+        counter.labels(requested_protocol).inc()
 
     if action == "download":  # for now only record download requests
         create_presigned_url_audit_log(

diff --git a/tests/data/test_data.py b/tests/data/test_data.py
@@ -109,7 +109,6 @@ def test_indexd_prometheus_presigned_url_counter(
         app.prometheus_registry.get_sample_value(
             "pre_signed_url_req_total",
             {
-                "guid": "1",
                 "requested_protocol": indexd_client["indexed_file_location"],
             },
         )
@@ -138,7 +137,6 @@ def test_indexd_prometheus_presigned_url_counter(
     after = app.prometheus_registry.get_sample_value(
         "pre_signed_url_req_total",
         {
-            "guid": "1",
             "requested_protocol": indexd_client["indexed_file_location"],
         },
     )