adjust changes

Author: adrian-codecov

api/public/v2/tests/test_api_repo_viewset.py

@@ -62,7 +62,7 @@ def test_list(self):
                     "language": self.repo.language,
                     "branch": "main",
                     "active": False,
-                    "activated": True,
+                    "activated": False,
                     "totals": {
                         "branches": 0,
                         "complexity": 0.0,
@@ -115,7 +115,7 @@ def test_retrieve(self, get_repo_permissions):
             "language": self.repo.language,
             "branch": "main",
             "active": False,
-            "activated": True,
+            "activated": False,
             "totals": {
                 "branches": 0,
                 "complexity": 0.0,

upload/helpers.py

@@ -790,14 +790,15 @@ def get_version_from_headers(headers):
         return "unknown-user-agent"
 
 
-def generate_upload_sentry_metrics_tags(
+def generate_upload_prometheus_metrics_labels(
     action,
     request,
     is_shelter_request,
     endpoint: Optional[str] = None,
     repository: Optional[Repository] = None,
     position: Optional[str] = None,
     upload_version: Optional[str] = None,
+    include_empty_labels: bool = True,
 ):
     metrics_tags = dict(
         agent=get_agent_from_headers(request.headers),
@@ -806,13 +807,23 @@ def generate_upload_sentry_metrics_tags(
         endpoint=endpoint,
         is_using_shelter="yes" if is_shelter_request else "no",
     )
+
+    repo_visibility = None
     if repository:
-        metrics_tags["repo_visibility"] = (
-            "private" if repository.private is True else "public"
-        )
-    if position:
-        metrics_tags["position"] = position
-    if upload_version:
-        metrics_tags["upload_version"] = upload_version
+        repo_visibility = "private" if repository.private else "public"
+
+    optional_fields = {
+        "repo_visibility": repo_visibility,
+        "position": position,
+        "upload_version": upload_version,
+    }
+
+    metrics_tags.update(
+        {
+            field: value
+            for field, value in optional_fields.items()
+            if value or include_empty_labels
+        }
+    )
 
-    return metrics_tags
+    return metrics_tags