Merge branch 'main' into cy/cleanup_commit_graphql

Author: calvin-codecov

upload/tests/views/test_bundle_analysis.py

@@ -95,7 +95,6 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
             "version": "0.4.7",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -185,7 +184,6 @@ def test_upload_bundle_analysis_success_shelter(db, client, mocker, mock_redis):
             "version": "0.4.7",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -224,7 +222,6 @@ def test_upload_bundle_analysis_org_token(db, client, mocker, mock_redis):
             "version": "unknown-user-agent",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -271,7 +268,6 @@ def test_upload_bundle_analysis_existing_commit(db, client, mocker, mock_redis):
             "version": "unknown-user-agent",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -392,7 +388,6 @@ def test_upload_bundle_analysis_github_oidc_auth(
             "version": "unknown-user-agent",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -453,7 +448,6 @@ def test_upload_bundle_analysis_measurement_datasets_created(
             "version": "0.4.7",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -515,7 +509,6 @@ def test_upload_bundle_analysis_measurement_timeseries_disabled(
             "version": "0.4.7",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
         },
@@ -612,7 +605,6 @@ def test_upload_bundle_analysis_tokenless_success(db, client, mocker, mock_redis
             "version": "0.4.7",
             "action": "bundle_analysis",
             "endpoint": "bundle_analysis",
-            "repo_visibility": "public",
             "is_using_shelter": "no",
             "position": "end",
         },

upload/views/bundle_analysis.py

@@ -42,7 +42,6 @@
         "action",
         "endpoint",
         "is_using_shelter",
-        "repo_visibility",
         "position",
     ],
 )
@@ -81,15 +80,22 @@ def get_exception_handler(self) -> Callable:
         return repo_auth_custom_exception_handler
 
     def post(self, request: HttpRequest) -> Response:
-        BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER.labels(
-            **generate_upload_sentry_metrics_tags(
+        try:
+            labels = generate_upload_sentry_metrics_tags(
                 action="bundle_analysis",
                 endpoint="bundle_analysis",
                 request=self.request,
                 is_shelter_request=self.is_shelter_request(),
                 position="start",
             )
-        ).inc()
+            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER.labels(**labels).inc()
+        except Exception:
+            log.warn(
+                "Failed to BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER",
+                exc_info=True,
+                extra=labels,
+            )
+
         serializer = UploadSerializer(data=request.data)
         if not serializer.is_valid():
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -168,16 +174,21 @@ def post(self, request: HttpRequest) -> Response:
                 task_arguments=task_arguments,
             ),
         )
-        BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER.labels(
-            **generate_upload_sentry_metrics_tags(
+        try:
+            labels = generate_upload_sentry_metrics_tags(
                 action="bundle_analysis",
                 endpoint="bundle_analysis",
                 request=self.request,
-                repository=repo,
                 is_shelter_request=self.is_shelter_request(),
                 position="end",
             )
-        ).inc()
+            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER.labels(**labels).inc()
+        except Exception:
+            log.warn(
+                "Failed to BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER",
+                exc_info=True,
+                extra=labels,
+            )
 
         dispatch_upload_task(
             task_arguments,