@sentry/bundler-plugin-core 2.1.0 → 2.2.0

package/dist/cjs/index.js

@@ -1138,29 +1138,31 @@ function releaseManagementPlugin(_ref) {
 }
 
 function telemetryPlugin(_ref) {
-  var sentryClient = _ref.sentryClient,
-    pluginExecutionTransaction = _ref.pluginExecutionTransaction,
+  var sentryHub = _ref.sentryHub,
+    sentryClient = _ref.sentryClient,
     shouldSendTelemetry = _ref.shouldSendTelemetry,
     logger = _ref.logger;
   return {
     name: "sentry-telemetry-plugin",
     buildStart: function buildStart() {
-      void shouldSendTelemetry.then(function (willSendTelemetry) {
-        if (willSendTelemetry) {
-          logger.info("Sending error and performance telemetry data to Sentry. To disable telemetry, set `options.telemetry` to `false`.");
-        }
-      });
-      pluginExecutionTransaction.startTimestamp = Date.now() / 1000;
-    },
-    writeBundle: function writeBundle() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              pluginExecutionTransaction.finish();
-              _context.next = 3;
-              return sentryClient.flush();
-            case 3:
+              _context.next = 2;
+              return shouldSendTelemetry;
+            case 2:
+              if (!_context.sent) {
+                _context.next = 7;
+                break;
+              }
+              logger.info("Sending error and performance telemetry data to Sentry. To disable telemetry, set `options.telemetry` to `false`.");
+              sentryHub.startTransaction({
+                name: "Sentry Bundler Plugin execution"
+              }).finish();
+              _context.next = 7;
+              return sentryClient.flush(3000);
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -1221,7 +1223,7 @@ function createSentryInstance(options, shouldSendTelemetry, bundler) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "2.1.0",
+    release: "2.2.0",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: node.defaultStackParser,
@@ -1287,34 +1289,25 @@ function setTelemetryDataOnHub(options, hub, bundler) {
     release = options.release,
     errorHandler = options.errorHandler,
     sourcemaps = options.sourcemaps;
+  hub.setTag("upload-legacy-sourcemaps", !!release.uploadLegacySourcemaps);
   if (release.uploadLegacySourcemaps) {
     hub.setTag("uploadLegacySourcemapsEntries", Array.isArray(release.uploadLegacySourcemaps) ? release.uploadLegacySourcemaps.length : 1);
   }
 
   // Optional release pipeline steps
-  if (release.cleanArtifacts) {
-    hub.setTag("clean-artifacts", true);
-  }
+  hub.setTag("clean-artifacts", release.cleanArtifacts);
   if (release.setCommits) {
     hub.setTag("set-commits", release.setCommits.auto === true ? "auto" : "manual");
+  } else {
+    hub.setTag("set-commits", "undefined");
   }
-  if (release.finalize) {
-    hub.setTag("finalize-release", true);
-  }
-  if (release.deploy) {
-    hub.setTag("add-deploy", true);
-  }
+  hub.setTag("finalize-release", release.finalize);
+  hub.setTag("deploy-options", !!release.deploy);
 
   // Miscelaneous options
-  if (errorHandler) {
-    hub.setTag("error-handler", "custom");
-  }
-  if (sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.assets) {
-    hub.setTag("debug-id-upload", true);
-  }
-  if (sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.deleteFilesAfterUpload) {
-    hub.setTag("delete-after-upload", true);
-  }
+  hub.setTag("custom-error-handler", !!errorHandler);
+  hub.setTag("sourcemaps-assets", !!(sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.assets));
+  hub.setTag("delete-after-upload", !!(sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.deleteFilesAfterUpload));
   hub.setTag("node", process.version);
   hub.setTags({
     organization: org,
@@ -1428,25 +1421,41 @@ function sentryUnpluginFactory(_ref) {
     var _createSentryInstance = createSentryInstance(options, shouldSendTelemetry, unpluginMetaContext.framework),
       sentryHub = _createSentryInstance.sentryHub,
       sentryClient = _createSentryInstance.sentryClient;
-    var pluginExecutionTransaction = sentryHub.startTransaction({
-      name: "Sentry Bundler Plugin execution"
+    var sentrySession = sentryHub.startSession();
+    sentryHub.captureSession();
+    var sentEndSession = false; // Just to prevent infinite loops with beforeExit, which is called whenever the event loop empties out
+    // We also need to manually end sesisons on errors because beforeExit is not called on crashes
+    process.on("beforeExit", function () {
+      if (!sentEndSession) {
+        sentryHub.endSession();
+        sentEndSession = true;
+      }
     });
-    sentryHub.getScope().setSpan(pluginExecutionTransaction);
     var logger = createLogger({
       prefix: "[sentry-".concat(unpluginMetaContext.framework, "-plugin]"),
       silent: options.silent,
       debug: options.debug
     });
     function handleRecoverableError(unknownError) {
-      pluginExecutionTransaction.setStatus("internal_error");
-      if (options.errorHandler) {
-        if (unknownError instanceof Error) {
-          options.errorHandler(unknownError);
+      sentrySession.status = "abnormal";
+      try {
+        if (options.errorHandler) {
+          try {
+            if (unknownError instanceof Error) {
+              options.errorHandler(unknownError);
+            } else {
+              options.errorHandler(new Error("An unknown error occured"));
+            }
+          } catch (e) {
+            sentrySession.status = "crashed";
+            throw e;
+          }
         } else {
-          options.errorHandler(new Error("An unknown error occured"));
+          sentrySession.status = "crashed";
+          throw unknownError;
         }
-      } else {
-        throw unknownError;
+      } finally {
+        sentryHub.endSession();
       }
     }
     if (!validateOptions(options, logger)) {
@@ -1457,10 +1466,10 @@ function sentryUnpluginFactory(_ref) {
     }
     var plugins = [];
     plugins.push(telemetryPlugin({
-      pluginExecutionTransaction: pluginExecutionTransaction,
+      sentryClient: sentryClient,
+      sentryHub: sentryHub,
       logger: logger,
-      shouldSendTelemetry: shouldSendTelemetry,
-      sentryClient: sentryClient
+      shouldSendTelemetry: shouldSendTelemetry
     }));
     if (!options.release.inject) {
       logger.debug("Release injection disabled via `release.inject` option. Will not inject release.");