Bundle Analysis: Add metric label for upload result

Author: JerrySentry

upload/tests/views/test_bundle_analysis.py

@@ -810,3 +810,35 @@ def test_upload_bundle_analysis_tokenless_mismatched_branch(
     assert res.status_code == 401
     assert res.json() == {"detail": "Not valid tokenless upload"}
     assert not upload.called
+
+
+def test_bundle_analysis_view_exception_handling(db, client, mocker, mock_redis):
+    with patch(
+        "upload.views.bundle_analysis.BundleAnalysisView._handle_upload",
+        side_effect=Exception("Test Exception"),
+    ):
+        client = APIClient()
+        repository = RepositoryFactory.create()
+        client.credentials(HTTP_AUTHORIZATION=f"token {repository.upload_token}")
+
+        mock_inc_counter = mocker.patch("upload.views.bundle_analysis.inc_counter")
+
+        res = client.post(
+            reverse("upload-bundle-analysis"),
+            {
+                "commit": "6fd5b89357fc8cdf34d6197549ac7c6d7e5977ef",
+                "slug": f"{repository.author.username}::::{repository.name}",
+            },
+            format="json",
+        )
+
+        assert res.status_code == 201
+        assert res.json()["url"] is None
+
+        # Check that the labels["result"] is "error"
+        mock_inc_counter.assert_any_call(
+            ANY,
+            labels=mocker.ANY,
+        )
+        labels = mock_inc_counter.call_args[1]["labels"]
+        assert labels["result"] == "error"

upload/views/bundle_analysis.py

@@ -48,6 +48,7 @@
         "endpoint",
         "is_using_shelter",
         "position",
+        "result",
     ],
 )
 
@@ -85,20 +86,7 @@ class BundleAnalysisView(APIView, ShelterMixin):
     def get_exception_handler(self) -> Callable:
         return repo_auth_custom_exception_handler
 
-    def post(self, request: HttpRequest) -> Response:
-        labels = generate_upload_prometheus_metrics_labels(
-            action="bundle_analysis",
-            endpoint="bundle_analysis",
-            request=self.request,
-            is_shelter_request=self.is_shelter_request(),
-            position="start",
-            include_empty_labels=False,
-        )
-        inc_counter(
-            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
-            labels=labels,
-        )
-
+    def _handle_upload(self, request: HttpRequest) -> str | None:
         serializer = UploadSerializer(data=request.data)
         if not serializer.is_valid():
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -191,18 +179,6 @@ def post(self, request: HttpRequest) -> Response:
                 task_arguments=task_arguments,
             ),
         )
-        labels = generate_upload_prometheus_metrics_labels(
-            action="bundle_analysis",
-            endpoint="bundle_analysis",
-            request=self.request,
-            is_shelter_request=self.is_shelter_request(),
-            position="end",
-            include_empty_labels=False,
-        )
-        inc_counter(
-            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
-            labels=labels,
-        )
 
         dispatch_upload_task(
             task_arguments,
@@ -235,4 +211,41 @@ def post(self, request: HttpRequest) -> Response:
                         ),
                     )
 
+        return url
+
+    def post(self, request: HttpRequest) -> Response:
+        labels = generate_upload_prometheus_metrics_labels(
+            action="bundle_analysis",
+            endpoint="bundle_analysis",
+            request=self.request,
+            is_shelter_request=self.is_shelter_request(),
+            position="start",
+            include_empty_labels=False,
+        )
+        labels["result"] = "pending"
+        url = None
+        inc_counter(
+            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
+            labels=labels,
+        )
+
+        upload_result = "success"
+        try:
+            url = self._handle_upload(request)
+        except Exception as e:
+            log.error(
+                "Error handling bundle analysis upload",
+                extra=dict(
+                    error=e,
+                ),
+                exc_info=True,
+            )
+            upload_result = "error"
+
+        labels["position"] = "end"
+        labels["result"] = upload_result
+        inc_counter(
+            BUNDLE_ANALYSIS_UPLOAD_VIEWS_COUNTER,
+            labels=labels,
+        )
         return Response({"url": url}, status=201)