Update shared and remove statsd metrics usage

`shared.metrics` does not re-export `statsd` anymore.

Author: Swatinem

labelanalysis/serializers.py

@@ -1,5 +1,4 @@
 from rest_framework import exceptions, serializers
-from shared.metrics import metrics
 
 from core.models import Commit
 from labelanalysis.models import (
@@ -23,25 +22,21 @@ def to_internal_value(self, commit_sha):
             commitid=commit_sha,
         ).first()
         if commit is None:
-            metrics.incr("label_analysis_request.errors.commit_not_found")
             raise exceptions.NotFound(f"Commit {commit_sha[:7]} not found.")
         if commit.staticanalysissuite_set.exists():
             return commit
         if not self.accepts_fallback:
-            metrics.incr("label_analysis_request.errors.static_analysis_not_found")
             raise serializers.ValidationError("No static analysis found")
         attempted_commits = []
         for _ in range(10):
             attempted_commits.append(commit.commitid)
             commit = commit.parent_commit
             if commit is None:
-                metrics.incr("label_analysis_request.errors.static_analysis_not_found")
                 raise serializers.ValidationError(
                     f"No possible commits have static analysis sent. Attempted commits: {','.join(attempted_commits)}"
                 )
             if commit.staticanalysissuite_set.exists():
                 return commit
-        metrics.incr("label_analysis_request.errors.static_analysis_not_found")
         raise serializers.ValidationError(
             f"No possible commits have static analysis sent. Attempted too many commits: {','.join(attempted_commits)}"
         )
@@ -71,13 +66,10 @@ class LabelAnalysisRequestSerializer(serializers.ModelSerializer):
     errors = ProcessingErrorList(required=False)
 
     def validate(self, data):
-        metrics.incr("label_analysis_request.count")
         if data["base_commit"] == data["head_commit"]:
-            metrics.incr("label_analysis_request.errors.base_head_equal")
             raise serializers.ValidationError(
                 {"base_commit": "Base and head must be different commits"}
             )
-        metrics.incr("label_analysis_request.valid.count")
         return data
 
     class Meta:

requirements.in

@@ -20,7 +20,7 @@ factory-boy
 fakeredis
 freezegun
 https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
-https://github.com/codecov/shared/archive/f0e213c4399563990d43fb424f4be36faa5ce5eb.tar.gz#egg=shared
+https://github.com/codecov/shared/archive/4e2792779e3efc65f876ab8ac38ffd244189e34d.tar.gz#egg=shared
 google-cloud-pubsub
 gunicorn>=22.0.0
 https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz

requirements.txt

@@ -205,6 +205,8 @@ googleapis-common-protos[grpc]==1.59.1
     #   grpcio-status
 graphql-core==3.2.3
     # via ariadne
+greenlet==3.1.1
+    # via sqlalchemy
 grpc-google-iam-v1==0.12.6
     # via google-cloud-pubsub
 grpcio==1.62.1
@@ -299,6 +301,8 @@ opentelemetry-util-http==0.45b0
     #   opentelemetry-instrumentation-wsgi
 opentracing==2.4.0
     # via -r requirements.in
+orjson==3.10.9
+    # via shared
 packaging==24.1
     # via
     #   gunicorn
@@ -417,7 +421,7 @@ sentry-sdk[celery]==2.13.0
     #   shared
 setproctitle==1.1.10
     # via -r requirements.in
-shared @ https://github.com/codecov/shared/archive/f0e213c4399563990d43fb424f4be36faa5ce5eb.tar.gz
+shared @ https://github.com/codecov/shared/archive/4e2792779e3efc65f876ab8ac38ffd244189e34d.tar.gz
     # via -r requirements.in
 simplejson==3.17.2
     # via -r requirements.in
@@ -447,8 +451,6 @@ sqlparse==0.5.0
     #   django
 starlette==0.36.2
     # via ariadne
-statsd==3.3.0
-    # via shared
 stripe==9.6.0
     # via -r requirements.in
 text-unidecode==1.3

staticanalysis/serializers.py

@@ -2,7 +2,6 @@
 import math
 
 from rest_framework import exceptions, serializers
-from shared.metrics import metrics
 
 from core.models import Commit
 from services.archive import ArchiveService, MinioEndpoints
@@ -154,13 +153,4 @@ def create(self, validated_data):
                 created_ids=[f.id for f in created_filepaths], repoid=repository.repoid
             ),
         )
-        metrics.gauge(
-            "static_analysis.suite.files_created",
-            len(file_metadata_array) - len(existing_values_mapping),
-        )
-        metrics.gauge("static_analysis.suite.total_files", len(file_metadata_array))
-        metrics.gauge(
-            "static_analysis.suite.existing_files", len(existing_values_mapping)
-        )
-        metrics.incr("static_analysis.suite.count")
         return obj

upload/tests/test_upload.py

@@ -997,7 +997,6 @@ def test_invalid_request_params_invalid_package(self):
         assert response.status_code == status.HTTP_400_BAD_REQUEST
         assert metrics.data["uploads.rejected"] == 1
 
-    @patch("shared.metrics.metrics.incr")
     @patch("upload.views.legacy.get_redis_connection")
     @patch("upload.views.legacy.uuid4")
     @patch("upload.views.legacy.dispatch_upload_task")
@@ -1009,7 +1008,6 @@ def test_successful_upload_v2(
         mock_dispatch_upload,
         mock_uuid4,
         mock_get_redis,
-        mock_metrics,
     ):
         class MockRepoProviderAdapter:
             async def get_commit(self, commit, token):
@@ -1036,7 +1034,6 @@ async def get_commit(self, commit, token):
         )
 
         assert response.status_code == 200
-        mock_metrics.assert_called_once_with("uploads.accepted", 1)
 
         headers = response.headers
 
@@ -1074,7 +1071,6 @@ async def get_commit(self, commit, token):
             == "https://app.codecov.io/github/codecovtest/upload-test-repo/commit/b521e55aef79b101f48e2544837ca99a7fa3bf6b"
         )
 
-    @patch("shared.metrics.metrics.incr")
     @patch("upload.views.legacy.get_redis_connection")
     @patch("upload.views.legacy.uuid4")
     @patch("upload.views.legacy.dispatch_upload_task")
@@ -1086,7 +1082,6 @@ def test_successful_upload_v2_slash(
         mock_dispatch_upload,
         mock_uuid4,
         mock_get_redis,
-        mock_metrics,
     ):
         class MockRepoProviderAdapter:
             async def get_commit(self, commit, token):
@@ -1113,7 +1108,6 @@ async def get_commit(self, commit, token):
         )
 
         assert response.status_code == 200
-        mock_metrics.assert_called_once_with("uploads.accepted", 1)
 
         headers = response.headers
 
@@ -1151,7 +1145,6 @@ async def get_commit(self, commit, token):
             == "https://app.codecov.io/github/codecovtest/upload-test-repo/commit/b521e55aef79b101f48e2544837ca99a7fa3bf6b"
         )
 
-    @patch("shared.metrics.metrics.incr")
     @patch("upload.views.legacy.get_redis_connection")
     @patch("upload.views.legacy.uuid4")
     @patch("upload.views.legacy.determine_repo_for_upload")
@@ -1163,7 +1156,6 @@ def test_repo_validation_error_v2(
         mock_determine_repo_for_upload,
         mock_uuid4,
         mock_get_redis,
-        mock_metrics,
     ):
         class MockRepoProviderAdapter:
             async def get_commit(self, commit, token):
@@ -1193,7 +1185,6 @@ async def get_commit(self, commit, token):
         )
 
         assert response.status_code == 400
-        mock_metrics.assert_called_once_with("uploads.rejected", 1)
 
         headers = response.headers
 
@@ -1206,7 +1197,6 @@ async def get_commit(self, commit, token):
 
         assert response.content == b"Could not determine repo and owner"
 
-    @patch("shared.metrics.metrics.incr")
     @patch("upload.views.legacy.get_redis_connection")
     @patch("upload.views.legacy.uuid4")
     @patch("upload.views.legacy.determine_repo_for_upload")
@@ -1218,7 +1208,6 @@ def test_too_many_repos_found_v2(
         mock_determine_repo_for_upload,
         mock_uuid4,
         mock_get_redis,
-        mock_metrics,
     ):
         class MockRepoProviderAdapter:
             async def get_commit(self, commit, token):
@@ -1248,7 +1237,6 @@ async def get_commit(self, commit, token):
         )
 
         assert response.status_code == 400
-        mock_metrics.assert_called_once_with("uploads.rejected", 1)
 
         headers = response.headers
 

upload/tests/views/test_uploads.py

@@ -1,4 +1,4 @@
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 from django.conf import settings
@@ -106,24 +106,20 @@ def test_get_repo(db):
     assert recovered_repo == repository
 
 
-@patch("shared.metrics.metrics.incr")
-def test_get_repo_with_invalid_service(mock_metrics, db):
+def test_get_repo_with_invalid_service(db):
     upload_views = UploadViews()
     upload_views.kwargs = dict(repo="repo", service="wrong service")
     with pytest.raises(ValidationError) as exp:
         upload_views.get_repo()
     assert exp.match("Service not found: wrong service")
-    mock_metrics.assert_called_once_with("uploads.rejected", 1)
 
 
-@patch("shared.metrics.metrics.incr")
-def test_get_repo_not_found(mock_metrics, db):
+def test_get_repo_not_found(db):
     upload_views = UploadViews()
     upload_views.kwargs = dict(repo="repo", service="github")
     with pytest.raises(ValidationError) as exp:
         upload_views.get_repo()
     assert exp.match("Repository not found")
-    mock_metrics.assert_called_once_with("uploads.rejected", 1)
 
 
 def test_get_commit(db):
@@ -137,16 +133,14 @@ def test_get_commit(db):
     assert recovered_commit == commit
 
 
-@patch("shared.metrics.metrics.incr")
-def test_get_commit_error(mock_metrics, db):
+def test_get_commit_error(db):
     repository = RepositoryFactory(name="the_repo", author__username="codecov")
     repository.save()
     upload_views = UploadViews()
     upload_views.kwargs = dict(repo=repository.name, commit_sha="missing_commit")
     with pytest.raises(ValidationError) as exp:
         upload_views.get_commit(repository)
     assert exp.match("Commit SHA not found")
-    mock_metrics.assert_called_once_with("uploads.rejected", 1)
 
 
 def test_get_report(db):
@@ -179,8 +173,7 @@ def test_get_default_report(db):
     assert recovered_report == report
 
 
-@patch("shared.metrics.metrics.incr")
-def test_get_report_error(mock_metrics, db):
+def test_get_report_error(db):
     repository = RepositoryFactory(name="the_repo", author__username="codecov")
     commit = CommitFactory(repository=repository)
     repository.save()
@@ -191,12 +184,10 @@ def test_get_report_error(mock_metrics, db):
     )
     with pytest.raises(ValidationError) as exp:
         upload_views.get_report(commit)
-        mock_metrics.assert_called_once_with("uploads.rejected", 1)
     assert exp.match("Report not found")
 
 
-@patch("shared.metrics.metrics.incr")
-def test_uploads_post(mock_metrics, db, mocker, mock_redis):
+def test_uploads_post(db, mocker, mock_redis):
     # TODO remove the mock object and test the flow with the permissions
     mocker.patch.object(
         CanDoCoverageUploadsPermission, "has_permission", return_value=True
@@ -277,9 +268,6 @@ def test_uploads_post(mock_metrics, db, mocker, mock_redis):
         report_session_id=upload.id, flag_id=flag2.id
     ).exists()
     assert [flag for flag in upload.flags.all()] == [flag1, flag2]
-    mock_metrics.assert_has_calls(
-        [call("upload.cli.version"), call("uploads.accepted", 1)]
-    )
 
     archive_service = ArchiveService(repository)
     assert upload.storage_path == MinioEndpoints.raw_with_upload_id.get_path(
@@ -294,15 +282,12 @@ def test_uploads_post(mock_metrics, db, mocker, mock_redis):
     upload_task_mock.assert_called()
 
 
-@patch("shared.metrics.metrics.incr")
 @pytest.mark.parametrize("private", [False, True])
 @pytest.mark.parametrize("branch", ["branch", "fork:branch", "someone/fork:branch"])
 @pytest.mark.parametrize(
     "branch_sent", [None, "branch", "fork:branch", "someone/fork:branch"]
 )
-def test_uploads_post_tokenless(
-    mock_metrics, db, mocker, mock_redis, private, branch, branch_sent
-):
+def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_sent):
     presigned_put_mock = mocker.patch(
         "services.archive.StorageService.create_presigned_put",
         return_value="presigned put",
@@ -392,9 +377,6 @@ def test_uploads_post_tokenless(
             report_session_id=upload.id, flag_id=flag2.id
         ).exists()
         assert [flag for flag in upload.flags.all()] == [flag1, flag2]
-        mock_metrics.assert_has_calls(
-            [call("upload.cli.version"), call("uploads.accepted", 1)]
-        )
 
         archive_service = ArchiveService(repository)
         assert upload.storage_path == MinioEndpoints.raw_with_upload_id.get_path(
@@ -431,15 +413,13 @@ def test_uploads_post_tokenless(
         assert response.json().get("detail") == "Not valid tokenless upload"
 
 
-@patch("shared.metrics.metrics.incr")
 @pytest.mark.parametrize("private", [False, True])
 @pytest.mark.parametrize("branch", ["branch", "fork:branch", "someone/fork:branch"])
 @pytest.mark.parametrize(
     "branch_sent", [None, "branch", "fork:branch", "someone/fork:branch"]
 )
 @pytest.mark.parametrize("upload_token_required_for_public_repos", [True, False])
 def test_uploads_post_token_required_auth_check(
-    mock_metrics,
     db,
     mocker,
     mock_redis,
@@ -545,9 +525,6 @@ def test_uploads_post_token_required_auth_check(
             report_session_id=upload.id, flag_id=flag2.id
         ).exists()
         assert [flag for flag in upload.flags.all()] == [flag1, flag2]
-        mock_metrics.assert_has_calls(
-            [call("upload.cli.version"), call("uploads.accepted", 1)]
-        )
 
         archive_service = ArchiveService(repository)
         assert upload.storage_path == MinioEndpoints.raw_with_upload_id.get_path(
@@ -587,9 +564,7 @@ def test_uploads_post_token_required_auth_check(
 @patch("upload.views.uploads.AnalyticsService")
 @patch("upload.helpers.jwt.decode")
 @patch("upload.helpers.PyJWKClient")
-@patch("shared.metrics.metrics.incr")
 def test_uploads_post_github_oidc_auth(
-    mock_metrics,
     mock_jwks_client,
     mock_jwt_decode,
     analytics_service_mock,
@@ -679,9 +654,6 @@ def test_uploads_post_github_oidc_auth(
         report_session_id=upload.id, flag_id=flag2.id
     ).exists()
     assert [flag for flag in upload.flags.all()] == [flag1, flag2]
-    mock_metrics.assert_has_calls(
-        [call("upload.cli.version"), call("uploads.accepted", 1)]
-    )
 
     archive_service = ArchiveService(repository)
     assert upload.storage_path == MinioEndpoints.raw_with_upload_id.get_path(
@@ -887,10 +859,8 @@ def mock_config(self, mocker):
     @patch("upload.views.uploads.AnalyticsService")
     @patch("upload.helpers.jwt.decode")
     @patch("upload.helpers.PyJWKClient")
-    @patch("shared.metrics.metrics.incr")
     def test_uploads_post_github_enterprise_oidc_auth_jwks_url(
         self,
-        mock_metrics,
         mock_jwks_client,
         mock_jwt_decode,
         analytics_service_mock,