remove usage of mock_metrics

Author: Swatinem

upload/tests/test_upload.py

@@ -22,7 +22,6 @@
     TorngitObjectNotFoundError,
     TorngitRateLimitError,
 )
-from shared.utils.test_utils import mock_metrics as utils_mock_metrics
 from simplejson import JSONDecodeError
 
 from codecov_auth.models import Owner
@@ -969,33 +968,25 @@ def test_options_headers(self):
         )
 
     def test_invalid_request_params(self):
-        metrics = utils_mock_metrics(self.mocker)
         query_params = {"pr": 9838, "flags": "flags!!!", "package": "codecov-cli/0.0.0"}
 
         response = self._post(kwargs={"version": "v5"}, query=query_params)
 
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        assert metrics.data["upload.cli.0.0.0"] == 1
-        assert metrics.data["uploads.rejected"] == 1
 
     def test_invalid_request_params_uploader_package(self):
-        metrics = utils_mock_metrics(self.mocker)
         query_params = {"pr": 9838, "flags": "flags!!!", "package": "uploader-0.0.0"}
 
         response = self._post(kwargs={"version": "v5"}, query=query_params)
 
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        assert metrics.data["upload.uploader.0.0.0"] == 1
-        assert metrics.data["uploads.rejected"] == 1
 
     def test_invalid_request_params_invalid_package(self):
-        metrics = utils_mock_metrics(self.mocker)
         query_params = {"pr": 9838, "flags": "flags!!!", "package": ""}
 
         response = self._post(kwargs={"version": "v5"}, query=query_params)
 
         assert response.status_code == status.HTTP_400_BAD_REQUEST
-        assert metrics.data["uploads.rejected"] == 1
 
     @patch("upload.views.legacy.get_redis_connection")
     @patch("upload.views.legacy.uuid4")

webhook_handlers/tests/test_github.py

@@ -7,7 +7,6 @@
 import pytest
 from freezegun import freeze_time
 from rest_framework import status
-from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 from shared.django_apps.core.tests.factories import (
@@ -17,7 +16,7 @@
     PullFactory,
     RepositoryFactory,
 )
-from shared.utils.test_utils import mock_config_helper, mock_metrics
+from shared.utils.test_utils import mock_config_helper
 
 from codecov_auth.models import (
     GITHUB_APP_INSTALLATION_DEFAULT_NAME,
@@ -86,113 +85,6 @@ def setUp(self):
             active=True,
         )
 
-    @patch(
-        "webhook_handlers.views.github.GithubWebhookHandler._handle_installation_events",
-        lambda self, request, *args, **kwargs: Response(),
-    )
-    @patch(
-        "webhook_handlers.views.github.GithubWebhookHandler._handle_marketplace_events",
-        lambda self, request, *args, **kwargs: Response(),
-    )
-    @patch(
-        "webhook_handlers.views.github.GithubWebhookHandler._handle_installation_repository_events",
-        lambda self, request, *args, **kwargs: Response(),
-    )
-    @patch(
-        "webhook_handlers.views.github.GithubWebhookHandler._handle_installation_events",
-        lambda self, request, *args, **kwargs: Response(),
-    )
-    def test_webhook_counters(self):
-        metrics = mock_metrics(self.mocker)
-        # Simple events
-        for event in [
-            "unhandled",
-            GitHubWebhookEvents.PING,
-            GitHubWebhookEvents.PUBLIC,
-            GitHubWebhookEvents.STATUS,
-            GitHubWebhookEvents.PULL_REQUEST,
-            GitHubWebhookEvents.INSTALLATION,
-            GitHubWebhookEvents.INSTALLATION_REPOSITORIES,
-            GitHubWebhookEvents.MARKETPLACE_PURCHASE,
-        ]:
-            with self.subTest("with event " + event):
-                _ = self._post_event_data(
-                    event=event,
-                    data={},
-                )
-                assert metrics.data["webhooks.github.received." + event] == 1
-
-        # Repository event + actions
-        for action in ["publicized", "privatized", "deleted"]:
-            with self.subTest("repository " + action):
-                _ = self._post_event_data(
-                    event=GitHubWebhookEvents.REPOSITORY,
-                    data={
-                        "action": action,
-                        "repository": {
-                            "id": self.repo.service_id,
-                            "owner": {"id": -1},
-                        },
-                    },
-                )
-                assert (
-                    metrics.data["webhooks.github.received.repository." + action] == 1
-                )
-
-        # Delete event + ref_types
-        for ref_type in ["branch", "other"]:
-            with self.subTest("delete " + ref_type):
-                branch = BranchFactory(repository=self.repo)
-                _ = self._post_event_data(
-                    event=GitHubWebhookEvents.DELETE,
-                    data={
-                        "ref": "refs/heads/" + branch.name,
-                        "ref_type": ref_type,
-                        "repository": {"id": self.repo.service_id},
-                    },
-                )
-                assert metrics.data["webhooks.github.received.delete." + ref_type] == 1
-
-        # Push event + ref_types
-        for ref_type, uri in [("branch", "refs/heads/"), ("tag", "refs/tags/")]:
-            with self.subTest("push " + ref_type):
-                _ = self._post_event_data(
-                    event=GitHubWebhookEvents.PUSH,
-                    data={
-                        "ref": uri + "unmerged",
-                        "repository": {"id": self.repo.service_id},
-                        "commits": [],
-                    },
-                )
-                assert metrics.data["webhooks.github.received.push." + ref_type] == 1
-
-        # Organization event + actions
-        for action in ["member_removed", "other"]:
-            with self.subTest("organization " + action):
-                _ = self._post_event_data(
-                    event=GitHubWebhookEvents.ORGANIZATION,
-                    data={
-                        "action": action,
-                        "membership": {"user": {"id": -1}},
-                        "organization": {"id": -1},
-                    },
-                )
-                assert (
-                    metrics.data["webhooks.github.received.organization." + action] == 1
-                )
-
-        # Member event + actions
-        for action in ["removed", "other"]:
-            with self.subTest("member " + action):
-                _ = self._post_event_data(
-                    event=GitHubWebhookEvents.MEMBER,
-                    data={
-                        "action": action,
-                        "member": {"id": -1},
-                        "repository": {"id": self.repo.service_id},
-                    },
-                )
-
     def test_get_repo_paths_dont_crash(self):
         with self.subTest("with ownerid success"):
             self._post_event_data(
@@ -1275,7 +1167,6 @@ def test_marketplace_purchase_but_user_has_stripe_subscription(
         )
 
     def test_signature_validation(self):
-        metrics = mock_metrics(self.mocker)
         response = self.client.post(
             reverse("github-webhook"),
             **{
@@ -1288,7 +1179,6 @@ def test_signature_validation(self):
         )
 
         assert response.status_code == status.HTTP_403_FORBIDDEN
-        assert metrics.data["webhooks.github.invalid_signature"] == 1
 
         response = self.client.post(
             reverse("github-webhook"),
@@ -1307,7 +1197,6 @@ def test_signature_validation(self):
         )
 
         assert response.status_code == status.HTTP_200_OK
-        assert metrics.data["webhooks.github.received.total"] == 1
 
         response = self.client.post(
             reverse("github-webhook"),
@@ -1326,7 +1215,6 @@ def test_signature_validation(self):
         )
 
         assert response.status_code == status.HTTP_200_OK
-        assert metrics.data["webhooks.github.received.total"] == 2
 
     @patch("webhook_handlers.views.github.get_config")
     def test_signature_validation_with_string_key(self, get_config_mock):