fix(sourcemaps): Fix contraint violation during creation of DebugIdArtifactBundle entries (#47310)

Author: Riccardo Busetti

fixtures/artifact_bundle_duplicated_debug_ids/files/_/_/bundle1.js

@@ -0,0 +1,4 @@
+/* eslint-disable */
+function helloWorld() {
+    alert('HelloWorld');
+}

fixtures/artifact_bundle_duplicated_debug_ids/files/_/_/bundle1.min.js

@@ -0,0 +1,2 @@
+/* eslint-disable */
+function helloWorld(){alert("HelloWorld")}

fixtures/artifact_bundle_duplicated_debug_ids/files/_/_/bundle1.min.js.map

@@ -0,0 +1,127 @@
+/* global exports */
+Object.defineProperty(exports, '__esModule', {value: true});
+const tslib_1 = require('tslib');
+const hub_1 = require('@sentry/core');
+/**
+ * This calls a function on the current hub.
+ * @param method function to call on hub.
+ * @param args to pass to function.
+ */
+function callOnHub(method) {
+  const args = [];
+  for (let _i = 1; _i < arguments.length; _i++) {
+    args[_i - 1] = arguments[_i];
+  }
+  const hub = hub_1.getCurrentHub();
+  if (hub && hub[method]) {
+    // tslint:disable-next-line:no-unsafe-any
+    return hub[method].apply(hub, tslib_1.__spread(args));
+  }
+  throw new Error(
+    'No hub defined or ' + method + ' was not found on the hub, please open a bug report.'
+  );
+}
+/**
+ * Captures an exception event and sends it to Sentry.
+ *
+ * @param exception An exception-like object.
+ * @returns The generated eventId.
+ */
+function captureException(exception) {
+  let syntheticException;
+  try {
+    throw new Error('Sentry syntheticException');
+  } catch (error) {
+    syntheticException = error;
+  }
+  return callOnHub('captureException', exception, {
+    originalException: exception,
+    syntheticException,
+  });
+}
+exports.captureException = captureException;
+/**
+ * Captures a message event and sends it to Sentry.
+ *
+ * @param message The message to send to Sentry.
+ * @param level Define the level of the message.
+ * @returns The generated eventId.
+ */
+function captureMessage(message, level) {
+  let syntheticException;
+  try {
+    throw new Error(message);
+  } catch (exception) {
+    syntheticException = exception;
+  }
+  return callOnHub('captureMessage', message, level, {
+    originalException: message,
+    syntheticException,
+  });
+}
+exports.captureMessage = captureMessage;
+/**
+ * Captures a manually created event and sends it to Sentry.
+ *
+ * @param event The event to send to Sentry.
+ * @returns The generated eventId.
+ */
+function captureEvent(event) {
+  return callOnHub('captureEvent', event);
+}
+exports.captureEvent = captureEvent;
+/**
+ * Records a new breadcrumb which will be attached to future events.
+ *
+ * Breadcrumbs will be added to subsequent events to provide more context on
+ * user's actions prior to an error or crash.
+ *
+ * @param breadcrumb The breadcrumb to record.
+ */
+function addBreadcrumb(breadcrumb) {
+  callOnHub('addBreadcrumb', breadcrumb);
+}
+exports.addBreadcrumb = addBreadcrumb;
+/**
+ * Callback to set context information onto the scope.
+ * @param callback Callback function that receives Scope.
+ */
+function configureScope(callback) {
+  callOnHub('configureScope', callback);
+}
+exports.configureScope = configureScope;
+/**
+ * Creates a new scope with and executes the given operation within.
+ * The scope is automatically removed once the operation
+ * finishes or throws.
+ *
+ * This is essentially a convenience function for:
+ *
+ *     pushScope();
+ *     callback();
+ *     popScope();
+ *
+ * @param callback that will be enclosed into push/popScope.
+ */
+function withScope(callback) {
+  callOnHub('withScope', callback);
+}
+exports.withScope = withScope;
+/**
+ * Calls a function on the latest client. Use this with caution, it's meant as
+ * in "internal" helper so we don't need to expose every possible function in
+ * the shim. It is not guaranteed that the client actually implements the
+ * function.
+ *
+ * @param method The method to call on the client/client.
+ * @param args Arguments to pass to the client/fontend.
+ */
+function _callOnClient(method) {
+  const args = [];
+  for (let _i = 1; _i < arguments.length; _i++) {
+    args[_i - 1] = arguments[_i];
+  }
+  callOnHub.apply(void 0, tslib_1.__spread(['_invokeClient', method], args));
+}
+exports._callOnClient = _callOnClient;
+// # sourceMappingURL=index.js.map

fixtures/artifact_bundle_duplicated_debug_ids/files/_/_/index.js

@@ -0,0 +1,43 @@
+{
+  "debug_id": "67429b2f-1d9e-43bb-a626-771a1e37555c",
+  "files": {
+    "files/_/_/index.js": {
+      "url": "~/index.js",
+      "type": "source"
+    },
+    "files/_/_/index.min.js": {
+      "url": "~/index.min.js",
+      "type": "minified_source",
+      "headers": {
+        "Debug-id": "Eb6e60f1-65ff-4f6f-Adff-f1bbeDEd627b",
+        "Sourcemap": "index.js.map"
+      }
+    },
+    "files/_/_/index.js.map": {
+      "url": "~/index.js.map",
+      "type": "source_map",
+      "headers": {
+        "debug-id": "Eb6e60f1-65ff-4f6f-Adff-f1bbeDEd627b"
+      }
+    },
+    "files/_/_/bundle1.js": {
+      "url": "~/bundle1.js",
+      "type": "source"
+    },
+    "files/_/_/bundle1.min.js": {
+      "url": "~/bundle1.min.js",
+      "type": "minified_source",
+      "headers": {
+        "Debug-id": "Eb6e60f1-65ff-4f6f-Adff-f1bbeDEd627b",
+        "Sourcemap": "index.js.map"
+      }
+    },
+    "files/_/_/bundle1.min.js.map": {
+      "url": "~/bundle1.min.js.map",
+      "type": "source_map",
+      "headers": {
+        "debug-id": "Eb6e60f1-65ff-4f6f-Adff-f1bbeDEd627b"
+      }
+    }
+  }
+}

fixtures/artifact_bundle_duplicated_debug_ids/files/_/_/index.js.map

@@ -1,7 +1,7 @@
 import hashlib
 import logging
 from os import path
-from typing import List, Optional, Tuple
+from typing import List, Optional, Set, Tuple
 
 from django.db import IntegrityError, router, transaction
 from django.db.models import Q
@@ -255,8 +255,9 @@ def _normalize_debug_id(debug_id: Optional[str]) -> Optional[str]:
 
 def _extract_debug_ids_from_manifest(
     manifest: dict,
-) -> Tuple[Optional[str], List[Tuple[SourceFileType, str]]]:
-    debug_ids_with_types = []
+) -> Tuple[Optional[str], Set[Tuple[SourceFileType, str]]]:
+    # We use a set, since we might have the same debug_id and file_type.
+    debug_ids_with_types = set()
 
     # We also want to extract the bundle_id which is also known as the bundle debug_id. This id is used to uniquely
     # identify a specific ArtifactBundle in case for example of future deletion.
@@ -278,7 +279,7 @@ def _extract_debug_ids_from_manifest(
                 and file_type is not None
                 and (source_file_type := SourceFileType.from_lowercase_key(file_type)) is not None
             ):
-                debug_ids_with_types.append((source_file_type, debug_id))
+                debug_ids_with_types.add((source_file_type, debug_id))
 
     return bundle_id, debug_ids_with_types
 

fixtures/artifact_bundle_duplicated_debug_ids/files/_/_/index.min.js

@@ -235,7 +235,7 @@ def test_artifacts_with_debug_ids(self):
             for debug_id in expected_debug_ids:
                 debug_id_artifact_bundles = DebugIdArtifactBundle.objects.filter(
                     organization_id=self.organization.id, debug_id=debug_id
-                )
+                ).order_by("-debug_id", "source_file_type")
                 assert len(debug_id_artifact_bundles) == 2
                 assert debug_id_artifact_bundles[0].artifact_bundle.file.size == len(bundle_file)
                 # We check if the bundle to which each debug id entry is connected has the correct bundle_id.
@@ -267,6 +267,31 @@ def test_artifacts_with_debug_ids(self):
             ReleaseArtifactBundle.objects.all().delete()
             ProjectArtifactBundle.objects.all().delete()
 
+    def test_upload_artifacts_with_duplicated_debug_ids(self):
+        bundle_file = self.create_artifact_bundle_zip(
+            fixture_path="artifact_bundle_duplicated_debug_ids", project=self.project.id
+        )
+        blob1 = FileBlob.from_file(ContentFile(bundle_file))
+        total_checksum = sha1(bundle_file).hexdigest()
+        expected_debug_ids = ["eb6e60f1-65ff-4f6f-adff-f1bbeded627b"]
+
+        assemble_artifacts(
+            org_id=self.organization.id,
+            project_ids=[self.project.id],
+            version="1.0",
+            dist="android",
+            checksum=total_checksum,
+            chunks=[blob1.checksum],
+            upload_as_artifact_bundle=True,
+        )
+
+        for debug_id in expected_debug_ids:
+            debug_id_artifact_bundles = DebugIdArtifactBundle.objects.filter(
+                organization_id=self.organization.id, debug_id=debug_id
+            )
+            # We expect to have only two entries, since we have duplicated debug_id, file_type pairs.
+            assert len(debug_id_artifact_bundles) == 2
+
     def test_upload_multiple_artifact_with_same_bundle_id(self):
         bundle_file = self.create_artifact_bundle_zip(
             fixture_path="artifact_bundle_debug_ids", project=self.project.id