reports: replace Sentry metrics with Prometheus metrics

Author: lvthanh03

upload/tests/views/test_reports.py

@@ -41,7 +41,7 @@ def test_reports_get_not_allowed(client, mocker, db):
 
 def test_reports_post(client, db, mocker):
     mocked_call = mocker.patch.object(TaskService, "preprocess_upload")
-    mock_sentry_metrics = mocker.patch("upload.views.reports.sentry_metrics.incr")
+    mock_metrics = mocker.patch("upload.metrics.API_UPLOAD_COUNTER.labels")
     repository = RepositoryFactory(
         name="the_repo", author__username="codecov", author__service="github"
     )
@@ -65,16 +65,16 @@ def test_reports_post(client, db, mocker):
         commit_id=commit.id, code="code1", report_type=CommitReport.ReportType.COVERAGE
     ).exists()
     mocked_call.assert_called_with(repository.repoid, commit.commitid, "code1")
-    mock_sentry_metrics.assert_called_with(
-        "upload",
-        tags={
+    mock_metrics.assert_called_with(
+        **{
             "agent": "cli",
             "version": "0.4.7",
             "action": "coverage",
             "endpoint": "create_report",
             "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
+            "upload_version": None,
         },
     )
 
@@ -343,7 +343,7 @@ def test_reports_results_post_successful_github_oidc_auth(
     mock_jwks_client, mock_jwt_decode, client, db, mocker
 ):
     mocked_task = mocker.patch("services.task.TaskService.create_report_results")
-    mock_sentry_metrics = mocker.patch("upload.views.reports.sentry_metrics.incr")
+    mock_prometheus_metrics = mocker.patch("upload.metrics.API_UPLOAD_COUNTER.labels")
     mocker.patch.object(
         CanDoCoverageUploadsPermission, "has_permission", return_value=True
     )
@@ -383,16 +383,16 @@ def test_reports_results_post_successful_github_oidc_auth(
         report_id=commit_report.id,
     ).exists()
     mocked_task.assert_called_once()
-    mock_sentry_metrics.assert_called_with(
-        "upload",
-        tags={
+    mock_prometheus_metrics.assert_called_with(
+        **{
             "agent": "cli",
             "version": "0.4.7",
             "action": "coverage",
             "endpoint": "create_report_results",
             "repo_visibility": "private",
             "is_using_shelter": "no",
             "position": "end",
+            "upload_version": None,
         },
     )
 

upload/views/reports.py

@@ -3,7 +3,6 @@
 from django.http import HttpRequest, HttpResponseNotAllowed
 from rest_framework.exceptions import ValidationError
 from rest_framework.generics import CreateAPIView, ListCreateAPIView, RetrieveAPIView
-from sentry_sdk import metrics as sentry_metrics
 
 from codecov_auth.authentication.repo_auth import (
     GitHubOIDCTokenAuthentication,
@@ -16,7 +15,8 @@
 )
 from reports.models import CommitReport, ReportResults
 from services.task import TaskService
-from upload.helpers import generate_upload_sentry_metrics_tags
+from upload.helpers import generate_upload_prometheus_metrics_tags
+from upload.metrics import API_UPLOAD_COUNTER
 from upload.serializers import CommitReportSerializer, ReportResultsSerializer
 from upload.views.base import GetterMixin
 from upload.views.uploads import CanDoCoverageUploadsPermission
@@ -40,16 +40,15 @@ def get_exception_handler(self):
         return repo_auth_custom_exception_handler
 
     def perform_create(self, serializer):
-        sentry_metrics.incr(
-            "upload",
-            tags=generate_upload_sentry_metrics_tags(
+        API_UPLOAD_COUNTER.labels(
+            **generate_upload_prometheus_metrics_tags(
                 action="coverage",
                 endpoint="create_report",
                 request=self.request,
                 is_shelter_request=self.is_shelter_request(),
                 position="start",
             ),
-        )
+        ).inc()
         repository = self.get_repo()
         commit = self.get_commit(repository)
         log.info(
@@ -68,17 +67,16 @@ def perform_create(self, serializer):
                 repository.repoid, commit.commitid, instance.code
             )
 
-        sentry_metrics.incr(
-            "upload",
-            tags=generate_upload_sentry_metrics_tags(
+        API_UPLOAD_COUNTER.labels(
+            **generate_upload_prometheus_metrics_tags(
                 action="coverage",
                 endpoint="create_report",
                 request=self.request,
                 repository=repository,
                 is_shelter_request=self.is_shelter_request(),
                 position="end",
             ),
-        )
+        ).inc()
         return instance
 
     def list(self, request: HttpRequest, service: str, repo: str, commit_sha: str):
@@ -105,16 +103,15 @@ def get_exception_handler(self):
         return repo_auth_custom_exception_handler
 
     def perform_create(self, serializer):
-        sentry_metrics.incr(
-            "upload",
-            tags=generate_upload_sentry_metrics_tags(
+        API_UPLOAD_COUNTER.labels(
+            **generate_upload_prometheus_metrics_tags(
                 action="coverage",
                 endpoint="create_report_results",
                 request=self.request,
                 is_shelter_request=self.is_shelter_request(),
                 position="start",
             ),
-        )
+        ).inc()
         repository = self.get_repo()
         commit = self.get_commit(repository)
         report = self.get_report(commit)
@@ -131,17 +128,16 @@ def perform_create(self, serializer):
             repoid=repository.repoid,
             report_code=report.code,
         )
-        sentry_metrics.incr(
-            "upload",
-            tags=generate_upload_sentry_metrics_tags(
+        API_UPLOAD_COUNTER.labels(
+            **generate_upload_prometheus_metrics_tags(
                 action="coverage",
                 endpoint="create_report_results",
                 request=self.request,
                 repository=repository,
                 is_shelter_request=self.is_shelter_request(),
                 position="end",
             ),
-        )
+        ).incr()
         return instance
 
     def get_object(self):