Merge branch 'develop' into routing-to-different-dsn

Author: harshit078

.cursor/BUGBOT.md

@@ -58,3 +58,8 @@ Do not flag the issues below if they appear in tests.
 - Flag usage of `expect.objectContaining` and other relaxed assertions, when a test expects something NOT to be included in a payload but there's no respective assertion.
 - Flag usage of conditionals in one test and recommend splitting up the test for the different paths.
 - Flag usage of loops testing multiple scenarios in one test and recommend using `(it)|(test).each` instead.
+
+## Platform-safe code
+
+- When any `setTimeout` or `setInterval` timers are started in a code path that can end up in server runtime packages (e.g. `@sentry/core` or `@sentry/node`), flag if neither `timeout.unref()` nor `safeUnref()` are called.
+  Not unref'ing a timer can keep CLI-like applications or node scripts from exiting immediately, due to the process waiting on timers started by the SDK.

packages/core/src/scope.ts

@@ -755,7 +755,7 @@ export class Scope {
    * @returns {string} The id of the captured event.
    */
   public captureEvent(event: Event, hint?: EventHint): string {
-    const eventId = hint?.event_id || uuid4();
+    const eventId = event.event_id || hint?.event_id || uuid4();
 
     if (!this._client) {
       DEBUG_BUILD && debug.warn('No client configured on scope - will not capture event!');

packages/core/test/lib/scope.test.ts

@@ -10,6 +10,7 @@ import {
 import { Scope } from '../../src/scope';
 import type { Breadcrumb } from '../../src/types-hoist/breadcrumb';
 import type { Event } from '../../src/types-hoist/event';
+import { uuid4 } from '../../src/utils/misc';
 import { applyScopeDataToEvent } from '../../src/utils/scopeData';
 import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
 import { clearGlobalScope } from '../testutils';
@@ -1009,6 +1010,54 @@ describe('Scope', () => {
         scope,
       );
     });
+
+    it('should return event_id from event object when provided', () => {
+      const fakeCaptureEvent = vi.fn(() => 'mock-event-id');
+      const fakeClient = {
+        captureEvent: fakeCaptureEvent,
+      } as unknown as Client;
+      const scope = new Scope();
+      scope.setClient(fakeClient);
+
+      const customEventId = uuid4();
+      const eventId = scope.captureEvent({ event_id: customEventId });
+
+      expect(eventId).toBe(customEventId);
+      expect(fakeCaptureEvent).toHaveBeenCalledWith(
+        expect.objectContaining({ event_id: customEventId }),
+        expect.objectContaining({ event_id: customEventId }),
+        scope,
+      );
+    });
+
+    it('should prefer event.event_id over hint.event_id', () => {
+      const fakeCaptureEvent = vi.fn(() => 'mock-event-id');
+      const fakeClient = {
+        captureEvent: fakeCaptureEvent,
+      } as unknown as Client;
+      const scope = new Scope();
+      scope.setClient(fakeClient);
+
+      const eventEventId = uuid4();
+      const hintEventId = uuid4();
+      const eventId = scope.captureEvent({ event_id: eventEventId }, { event_id: hintEventId });
+
+      expect(eventId).toBe(eventEventId);
+      expect(fakeCaptureEvent).toHaveBeenCalledWith(
+        expect.objectContaining({ event_id: eventEventId }),
+        expect.objectContaining({ event_id: eventEventId }),
+        scope,
+      );
+    });
+
+    it('should return event_id from event object when no client is configured', () => {
+      const scope = new Scope();
+
+      const customEventId = uuid4();
+      const eventId = scope.captureEvent({ event_id: customEventId });
+
+      expect(eventId).toBe(customEventId);
+    });
   });
 
   describe('setConversationId() / getScopeData()', () => {

packages/solid/package.json

@@ -77,7 +77,7 @@
     "@testing-library/dom": "^7.21.4",
     "@testing-library/jest-dom": "^6.4.5",
     "@testing-library/user-event": "^14.5.2",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.9.11",
     "vite": "^5.4.11",
     "vite-plugin-solid": "^2.11.6"
   },

packages/solidstart/package.json

@@ -77,7 +77,7 @@
     "@solidjs/testing-library": "0.8.5",
     "@testing-library/jest-dom": "^6.4.5",
     "@testing-library/user-event": "^14.5.2",
-    "solid-js": "^1.8.4",
+    "solid-js": "^1.9.11",
     "vinxi": "^0.5.11",
     "vite": "^5.4.11",
     "vite-plugin-solid": "^2.11.6"

yarn.lock

@@ -4779,9 +4779,9 @@
   integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
 
 "@isaacs/brace-expansion@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
-  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz#0ef5a92d91f2fff2a37646ce54da9e5f599f6eff"
+  integrity sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==
   dependencies:
     "@isaacs/balanced-match" "^4.0.1"
 
@@ -27709,26 +27709,16 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1, serialize-javascript@^
   dependencies:
     randombytes "^2.1.0"
 
-seroval-plugins@^1.3.2, seroval-plugins@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.4.0.tgz#0bd453983a0a26039ca161a341c00eca7d42b19a"
-  integrity sha512-zir1aWzoiax6pbBVjoYVd0O1QQXgIL3eVGBMsBsNmM8Ukq90yGaWlfx0AB9dTS8GPqrOrbXn79vmItCUP9U3BQ==
-
-seroval-plugins@~1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.3.3.tgz#51bcacf09e5384080d7ea4002b08fd9f6166daf5"
-  integrity sha512-16OL3NnUBw8JG1jBLUoZJsLnQq0n5Ua6aHalhJK4fMQkz1lqR7Osz1sA30trBtd9VUDc2NgkuRCn8+/pBwqZ+w==
+seroval-plugins@^1.3.2, seroval-plugins@^1.4.0, seroval-plugins@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.5.0.tgz#c02ba5f41d50b8105d4d9d4c553a4d01cec4226a"
+  integrity sha512-EAHqADIQondwRZIdeW2I636zgsODzoBDwb3PT/+7TLDWyw1Dy/Xv7iGUIEXXav7usHDE9HVhOU61irI3EnyyHA==
 
-seroval@^1.3.2, seroval@^1.4.0, seroval@^1.4.1:
+seroval@^1.3.2, seroval@^1.4.0, seroval@^1.4.1, seroval@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.5.0.tgz#aba4cffbd0c4c8a4351358362acf40ee8d74d97b"
   integrity sha512-OE4cvmJ1uSPrKorFIH9/w/Qwuvi/IMcGbv5RKgcJ/zjA/IohDLU6SVaxFN9FwajbP7nsX0dQqMDes1whk3y+yw==
 
-seroval@~1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.3.2.tgz#7e5be0dc1a3de020800ef013ceae3a313f20eca7"
-  integrity sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==
-
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -28279,14 +28269,14 @@ socks@^2.6.2, socks@^2.8.3:
     ip-address "^10.0.1"
     smart-buffer "^4.2.0"
 
-solid-js@^1.8.11, solid-js@^1.8.4:
-  version "1.9.7"
-  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.9.7.tgz#96ff7800648a30f22d29275264375589f3a725e9"
-  integrity sha512-/saTKi8iWEM233n5OSi1YHCCuh66ZIQ7aK2hsToPe4tqGm7qAejU1SwNuTPivbWAYq7SjuHVVYxxuZQNRbICiw==
+solid-js@^1.9.11:
+  version "1.9.11"
+  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.9.11.tgz#1d36c755d10b7d5f7d016d2421c7e39b5b84f99e"
+  integrity sha512-WEJtcc5mkh/BnHA6Yrg4whlF8g6QwpmXXRg4P2ztPmcKeHHlH4+djYecBLhSpecZY2RRECXYUwIc/C2r3yzQ4Q==
   dependencies:
     csstype "^3.1.0"
-    seroval "~1.3.0"
-    seroval-plugins "~1.3.0"
+    seroval "~1.5.0"
+    seroval-plugins "~1.5.0"
 
 solid-refresh@^0.6.3:
   version "0.6.3"
@@ -29076,7 +29066,6 @@ stylus@0.59.0, stylus@^0.59.0:
 
 sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
   version "3.36.0"
-  uid fd682f6129e507c00bb4e6319cc5d6b767e36061
   resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"