test_results: replace Sentry metrics with Prometheus metrics

Author: lvthanh03

upload/tests/views/test_test_results.py

@@ -20,7 +20,7 @@
 
 def test_upload_test_results(db, client, mocker, mock_redis):
     upload = mocker.patch.object(TaskService, "upload")
-    mock_sentry_metrics = mocker.patch("upload.views.test_results.metrics.incr")
+    mock_prometheus_metrics = mocker.patch("upload.metrics.API_UPLOAD_COUNTER.labels")
     create_presigned_put = mocker.patch(
         "services.archive.StorageService.create_presigned_put",
         return_value="test-presigned-put",
@@ -100,16 +100,16 @@ def test_upload_test_results(db, client, mocker, mock_redis):
         report_code=None,
         report_type="test_results",
     )
-    mock_sentry_metrics.assert_called_with(
-        "upload",
-        tags={
+    mock_prometheus_metrics.assert_called_with(
+        **{
             "agent": "cli",
             "version": "0.4.7",
             "action": "test_results",
             "endpoint": "test_results",
             "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
+            "upload_version": None,
         },
     )
 

upload/views/test_results.py

@@ -7,7 +7,6 @@
 from rest_framework.permissions import BasePermission
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from sentry_sdk import metrics
 
 from codecov_auth.authentication.repo_auth import (
     GitHubOIDCTokenAuthentication,
@@ -23,7 +22,8 @@
 from reports.models import CommitReport
 from services.archive import ArchiveService, MinioEndpoints
 from services.redis_configuration import get_redis_connection
-from upload.helpers import dispatch_upload_task, generate_upload_sentry_metrics_tags
+from upload.helpers import dispatch_upload_task, generate_upload_prometheus_metrics_tags
+from upload.metrics import API_UPLOAD_COUNTER
 from upload.serializers import FlagListField
 from upload.views.base import ShelterMixin
 from upload.views.helpers import get_repository_from_string
@@ -66,16 +66,15 @@ def get_exception_handler(self):
         return repo_auth_custom_exception_handler
 
     def post(self, request):
-        metrics.incr(
-            "upload",
-            tags=generate_upload_sentry_metrics_tags(
+        API_UPLOAD_COUNTER.labels(
+            **generate_upload_prometheus_metrics_tags(
                 action="test_results",
                 endpoint="test_results",
                 request=request,
                 is_shelter_request=self.is_shelter_request(),
                 position="start",
             ),
-        )
+        ).inc()
         serializer = UploadSerializer(data=request.data)
         if not serializer.is_valid():
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -107,17 +106,16 @@ def post(self, request):
         if update_fields:
             repo.save(update_fields=update_fields)
 
-        metrics.incr(
-            "upload",
-            tags=generate_upload_sentry_metrics_tags(
+        API_UPLOAD_COUNTER.labels(
+            **generate_upload_prometheus_metrics_tags(
                 action="test_results",
                 endpoint="test_results",
                 request=request,
                 repository=repo,
                 is_shelter_request=self.is_shelter_request(),
                 position="end",
             ),
-        )
+        ).inc()
 
         commit, _ = Commit.objects.get_or_create(
             commitid=data["commit"],