Add BA and TA upload events

Author: spalmurray

upload/tests/views/test_bundle_analysis.py

@@ -27,6 +27,7 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
         "shared.api_archive.archive.StorageService.create_presigned_put",
         return_value="test-presigned-put",
     )
+    mock_amplitude = mocker.patch("shared.events.amplitude.AmplitudeEventPublisher")
 
     repository = RepositoryFactory.create()
     commit_sha = "6fd5b89357fc8cdf34d6197549ac7c6d7e5977ef"
@@ -103,6 +104,19 @@ def test_upload_bundle_analysis_success(db, client, mocker, mock_redis):
         },
     )
 
+    # emits Amplitude event
+    mock_amplitude.return_value.publish.assert_called_with(
+        "Upload Sent",
+        {
+            "user_ownerid": commit.repository.author.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

@@ -25,6 +25,7 @@ def test_upload_test_results(db, client, mocker, mock_redis):
         "shared.api_archive.archive.StorageService.create_presigned_put",
         return_value="test-presigned-put",
     )
+    mock_amplitude = mocker.patch("shared.events.amplitude.AmplitudeEventPublisher")
 
     owner = OwnerFactory(service="github", username="codecov")
     repository = RepositoryFactory.create(author=owner)
@@ -115,6 +116,19 @@ def test_upload_test_results(db, client, mocker, mock_redis):
         },
     )
 
+    # emits Amplitude event
+    mock_amplitude.return_value.publish.assert_called_with(
+        "Upload Sent",
+        {
+            "user_ownerid": commit.repository.author.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

@@ -435,7 +435,7 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
         amplitude_mock.return_value.publish.assert_called_with(
             "Upload Sent",
             {
-                "user_ownerid": commit.author.ownerid,
+                "user_ownerid": commit.repository.author.ownerid,
                 "ownerid": commit.repository.author.ownerid,
                 "repoid": commit.repository.repoid,
                 "commitid": commit.id,
@@ -599,7 +599,7 @@ def test_uploads_post_token_required_auth_check(
         amplitude_mock.return_value.publish.assert_called_with(
             "Upload Sent",
             {
-                "user_ownerid": commit.author.ownerid,
+                "user_ownerid": commit.repository.author.ownerid,
                 "ownerid": commit.repository.author.ownerid,
                 "repoid": commit.repository.repoid,
                 "commitid": commit.id,
@@ -746,7 +746,7 @@ def test_uploads_post_github_oidc_auth(
     amplitude_mock.return_value.publish.assert_called_with(
         "Upload Sent",
         {
-            "user_ownerid": commit.author.ownerid,
+            "user_ownerid": commit.repository.author.ownerid,
             "ownerid": commit.repository.author.ownerid,
             "repoid": commit.repository.repoid,
             "commitid": commit.id,

upload/views/bundle_analysis.py

@@ -11,6 +11,7 @@
 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 AmplitudeEventPublisher
 from shared.metrics import Counter, inc_counter
 
 from codecov_auth.authentication.repo_auth import (
@@ -220,4 +221,16 @@ def post(self, request: HttpRequest) -> Response:
                         ),
                     )
 
+        AmplitudeEventPublisher().publish(
+            "Upload Sent",
+            {
+                "user_ownerid": repo.author.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,6 +8,7 @@
 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 codecov_auth.authentication.repo_auth import (
@@ -187,6 +188,18 @@ def post(self, request):
             report_type=CommitReport.ReportType.TEST_RESULTS,
         )
 
+        AmplitudeEventPublisher().publish(
+            "Upload Sent",
+            {
+                "user_ownerid": repo.author.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

@@ -171,7 +171,12 @@ def send_analytics_data(
     AmplitudeEventPublisher().publish(
         "Upload Sent",
         {
-            "user_ownerid": commit.author.ownerid,
+            # Attribute this event to the repo owner. For BA/TA uploads we
+            # don't necessarily have the commit author at upload time, so to
+            # align the upload events, we will always attribute uploads to the
+            # repo owner. It's also not necessarily the case that the commit
+            # author is the owner performing the 'Upload Sent' action.
+            "user_ownerid": commit.repository.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!