Revert "feat: Track Upload Sent events for Coverage/BA/TA (#1162)" (#1194)

Author: spalmurray-codecov

upload/tests/views/test_bundle_analysis.py

@@ -10,7 +10,6 @@
     OrganizationLevelTokenFactory,
 )
 from shared.django_apps.core.tests.factories import CommitFactory, RepositoryFactory
-from shared.events.amplitude import UNKNOWN_USER_OWNERID
 
 from core.models import Commit
 from services.redis_configuration import get_redis_connection
@@ -28,9 +27,6 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
         "shared.storage.MinioStorageService.create_presigned_put",
         return_value="test-presigned-put",
     )
-    mock_amplitude = mocker.patch(
-        "shared.events.amplitude.AmplitudeEventPublisher.publish"
-    )
 
     repository = RepositoryFactory.create()
     commit_sha = "6fd5b89357fc8cdf34d6197549ac7c6d7e5977ef"
@@ -107,19 +103,6 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
         },
     )
 
-    # emits Amplitude event
-    mock_amplitude.assert_called_with(
-        "Upload Sent",
-        {
-            "user_ownerid": UNKNOWN_USER_OWNERID,
-            "ownerid": commit.repository.author.ownerid,
-            "repoid": commit.repository.repoid,
-            "commitid": commit.id,
-            "pullid": commit.pullid,
-            "upload_type": "Bundle",
-        },
-    )
-
 
 @pytest.mark.django_db(databases={"default", "timeseries"})
 @override_settings(SHELTER_SHARED_SECRET="shelter-shared-secret")

upload/tests/views/test_test_results.py

@@ -13,7 +13,6 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.events.amplitude import UNKNOWN_USER_OWNERID
 
 from services.redis_configuration import get_redis_connection
 from services.task import TaskService
@@ -26,9 +25,6 @@ def test_upload_test_results(db, client, mocker, mock_redis):
         "shared.storage.MinioStorageService.create_presigned_put",
         return_value="test-presigned-put",
     )
-    mock_amplitude = mocker.patch(
-        "shared.events.amplitude.AmplitudeEventPublisher.publish"
-    )
 
     owner = OwnerFactory(service="github", username="codecov")
     repository = RepositoryFactory.create(author=owner)
@@ -119,19 +115,6 @@ def test_upload_test_results(db, client, mocker, mock_redis):
         },
     )
 
-    # emits Amplitude event
-    mock_amplitude.assert_called_with(
-        "Upload Sent",
-        {
-            "user_ownerid": UNKNOWN_USER_OWNERID,
-            "ownerid": commit.repository.author.ownerid,
-            "repoid": commit.repository.repoid,
-            "commitid": commit.id,
-            "pullid": commit.pullid,
-            "upload_type": "Test results",
-        },
-    )
-
 
 def test_test_results_org_token(db, client, mocker, mock_redis):
     mocker.patch.object(TaskService, "upload")

upload/tests/views/test_uploads.py

@@ -314,9 +314,6 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
         "upload.views.uploads.trigger_upload_task", return_value=True
     )
     analytics_service_mock = mocker.patch("upload.views.uploads.AnalyticsService")
-    amplitude_mock = mocker.patch(
-        "shared.events.amplitude.AmplitudeEventPublisher.publish"
-    )
 
     repository = RepositoryFactory(
         name="the_repo",
@@ -434,17 +431,6 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
                 "uploader_type": "CLI",
             },
         )
-        amplitude_mock.assert_called_with(
-            "Upload Sent",
-            {
-                "user_ownerid": commit.author.ownerid,
-                "ownerid": commit.repository.author.ownerid,
-                "repoid": commit.repository.repoid,
-                "commitid": commit.id,
-                "pullid": commit.pullid,
-                "upload_type": "Coverage report",
-            },
-        )
     else:
         assert response.status_code == 401
         assert response.json().get("detail") == "Not valid tokenless upload"
@@ -473,9 +459,6 @@ def test_uploads_post_token_required_auth_check(
         "upload.views.uploads.trigger_upload_task", return_value=True
     )
     analytics_service_mock = mocker.patch("upload.views.uploads.AnalyticsService")
-    amplitude_mock = mocker.patch(
-        "shared.events.amplitude.AmplitudeEventPublisher.publish"
-    )
 
     repository = RepositoryFactory(
         name="the_repo",
@@ -600,31 +583,18 @@ def test_uploads_post_token_required_auth_check(
                 "uploader_type": "CLI",
             },
         )
-        amplitude_mock.assert_called_with(
-            "Upload Sent",
-            {
-                "user_ownerid": commit.author.ownerid,
-                "ownerid": commit.repository.author.ownerid,
-                "repoid": commit.repository.repoid,
-                "commitid": commit.id,
-                "pullid": commit.pullid,
-                "upload_type": "Coverage report",
-            },
-        )
     else:
         assert response.status_code == 401
         assert response.json().get("detail") == "Not valid tokenless upload"
 
 
-@patch("shared.events.amplitude.AmplitudeEventPublisher.publish")
 @patch("upload.views.uploads.AnalyticsService")
 @patch("upload.helpers.jwt.decode")
 @patch("upload.helpers.PyJWKClient")
 def test_uploads_post_github_oidc_auth(
     mock_jwks_client,
     mock_jwt_decode,
     analytics_service_mock,
-    amplitude_mock,
     db,
     mocker,
     mock_redis,
@@ -747,17 +717,6 @@ def test_uploads_post_github_oidc_auth(
             "uploader_type": "CLI",
         },
     )
-    amplitude_mock.assert_called_with(
-        "Upload Sent",
-        {
-            "user_ownerid": commit.author.ownerid,
-            "ownerid": commit.repository.author.ownerid,
-            "repoid": commit.repository.repoid,
-            "commitid": commit.id,
-            "pullid": commit.pullid,
-            "upload_type": "Coverage report",
-        },
-    )
 
 
 @override_settings(SHELTER_SHARED_SECRET="shelter-shared-secret")

upload/views/bundle_analysis.py

@@ -11,7 +11,6 @@
 from rest_framework.views import APIView
 from shared.api_archive.archive import ArchiveService
 from shared.bundle_analysis.storage import StoragePaths, get_bucket_name
-from shared.events.amplitude import UNKNOWN_USER_OWNERID, AmplitudeEventPublisher
 from shared.metrics import Counter, inc_counter
 
 from codecov_auth.authentication.repo_auth import (
@@ -221,18 +220,4 @@ def post(self, request: HttpRequest) -> Response:
                         ),
                     )
 
-        AmplitudeEventPublisher().publish(
-            "Upload Sent",
-            {
-                "user_ownerid": commit.author.ownerid
-                if commit.author
-                else UNKNOWN_USER_OWNERID,
-                "ownerid": repo.author.ownerid,
-                "repoid": repo.repoid,
-                "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here!
-                "pullid": commit.pullid,
-                "upload_type": "Bundle",
-            },
-        )
-
         return Response({"url": url}, status=201)

upload/views/test_results.py

@@ -8,7 +8,6 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from shared.api_archive.archive import ArchiveService, MinioEndpoints
-from shared.events.amplitude import UNKNOWN_USER_OWNERID, AmplitudeEventPublisher
 from shared.metrics import inc_counter
 
 from codecov_auth.authentication.repo_auth import (
@@ -188,20 +187,6 @@ def post(self, request):
             report_type=CommitReport.ReportType.TEST_RESULTS,
         )
 
-        AmplitudeEventPublisher().publish(
-            "Upload Sent",
-            {
-                "user_ownerid": commit.author.ownerid
-                if commit.author
-                else UNKNOWN_USER_OWNERID,
-                "ownerid": repo.author.ownerid,
-                "repoid": repo.repoid,
-                "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here!
-                "pullid": commit.pullid,
-                "upload_type": "Test results",
-            },
-        )
-
         if url is None:
             return Response(status=201)
         else:

upload/views/uploads.py

@@ -10,7 +10,6 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from shared.api_archive.archive import ArchiveService, MinioEndpoints
-from shared.events.amplitude import AmplitudeEventPublisher
 from shared.metrics import inc_counter
 from shared.upload.utils import UploaderType, insert_coverage_measurement
 
@@ -168,17 +167,6 @@ def send_analytics_data(
     AnalyticsService().account_uploaded_coverage_report(
         commit.repository.author.ownerid, analytics_upload_data
     )
-    AmplitudeEventPublisher().publish(
-        "Upload Sent",
-        {
-            "user_ownerid": commit.author.ownerid,
-            "ownerid": commit.repository.author.ownerid,
-            "repoid": commit.repository.repoid,
-            "commitid": commit.id,  # Not commit.commitid, we do not want a commit SHA here.
-            "pullid": commit.pullid,
-            "upload_type": "Coverage report",
-        },
-    )
 
 
 def get_token_for_analytics(commit: Commit, request: HttpRequest) -> str: