Merge branch 'develop' into jb/profiling/requrie

Author: JonasBa

.github/workflows/build.yml

@@ -152,7 +152,7 @@ jobs:
         id: install_dependencies
 
       - name: Check for Affected Nx Projects
-        uses: dkhunt27/action-nx-affected-list@v5.3
+        uses: dkhunt27/action-nx-affected-list@v6.1
         id: checkForAffected
         if: github.event_name == 'pull_request'
         with:

.github/workflows/external-contributors.yml

@@ -38,6 +38,9 @@ jobs:
       - name: Create PR with changes
         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
         with:
+          # This token is scoped to Daniel Griesser
+          # If we used the default GITHUB_TOKEN, the resulting PR would not trigger CI :(
+          token: ${{ secrets.REPO_SCOPED_TOKEN }}
           commit-message: "ref: Add external contributor to CHANGELOG.md"
           title: "ref: Add external contributor to CHANGELOG.md"
           branch: 'external-contributor/patch-${{ github.event.pull_request.user.login }}'

CHANGELOG.md

@@ -10,6 +10,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @trzeciak and @lizhiyao. Thank you for your contributions!
+
 ## 8.33.1
 
 - fix(core): Update trpc middleware types ([#13859](https://github.com/getsentry/sentry-javascript/pull/13859))
@@ -1158,12 +1160,12 @@ with full support for ESM-based node apps using **Node.js 18.19.0 or higher**.
 [**ES2018+**](https://caniuse.com/?feats=mdn-javascript_builtins_regexp_dotall,js-regexp-lookbehind,mdn-javascript_builtins_regexp_named_capture_groups,mdn-javascript_builtins_regexp_property_escapes,mdn-javascript_builtins_symbol_asynciterator,mdn-javascript_functions_method_definitions_async_generator_methods,mdn-javascript_grammar_template_literals_template_literal_revision,mdn-javascript_operators_destructuring_rest_in_objects,mdn-javascript_operators_destructuring_rest_in_arrays,promise-finally)
 compatible browsers. New minimum browser versions:
 
-- Chrome 63
+- Chrome 71
 - Edge 79
-- Safari/iOS Safari 12
-- Firefox 58
-- Opera 50
-- Samsung Internet 8.2
+- Safari 12.1, iOS Safari 12.2
+- Firefox 65
+- Opera 58
+- Samsung Internet 10
 
 For more details, please see the
 [version support section in our migration guide](./MIGRATION.md#1-version-support-changes).

MIGRATION.md

@@ -24,18 +24,20 @@ higher. Lower versions may continue to work, but may not support all features (e
 applies to `@sentry/node` and all of our node-based server-side sdks (`@sentry/nextjs`, `@sentry/serverless`, etc.). We
 no longer test against Node 8, 10, or 12 and cannot guarantee that the SDK will work as expected on these versions.
 
-**Browser**: Our browser SDKs (`@sentry/browser`, `@sentry/react`, `@sentry/vue`, etc.) now require ES2018+ compatible
-browsers. This means that we no longer support IE11 (end of an era). This also means that the Browser SDK requires the
-fetch API to be available in the environment.
+**Browser**: Our browser SDKs (`@sentry/browser`, `@sentry/react`, `@sentry/vue`, etc.) now require ES2018+
+compatibility plus support for
+[`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis). This means
+that we no longer support IE11 (end of an era). This also means that the Browser SDK requires the fetch API to be
+available in the environment.
 
 New minimum supported browsers:
 
-- Chrome 63
+- Chrome 71
 - Edge 79
-- Safari/iOS Safari 12
-- Firefox 58
-- Opera 50
-- Samsung Internet 8.2
+- Safari 12.1, iOS Safari 12.2
+- Firefox 65
+- Opera 58
+- Samsung Internet 10
 
 For IE11 support please transpile your code to ES5 using babel or similar and add required polyfills.
 

README.md

@@ -62,7 +62,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
 - [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
 - [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
   for AWS Lambda Functions
-- [`@sentry/google-cloud-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud):
+- [`@sentry/google-cloud-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless):
   SDK for Google Cloud Functions
 - [`@sentry/electron`](https://github.com/getsentry/sentry-electron): SDK for Electron with support for native crashes
 - [`@sentry/react-native`](https://github.com/getsentry/sentry-react-native): SDK for React Native with support for

dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-memory-test.js

@@ -1,4 +1,3 @@
-import * as childProcess from 'child_process';
 import * as path from 'path';
 import { conditionalTest } from '../../../utils';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
@@ -89,29 +88,4 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
   test('Includes local variables for caught exceptions when enabled', done => {
     createRunner(__dirname, 'local-variables-caught.js').expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT }).start(done);
   });
-
-  test('Should not leak memory', done => {
-    const testScriptPath = path.resolve(__dirname, 'local-variables-memory-test.js');
-
-    const child = childProcess.spawn('node', [testScriptPath], {
-      stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-    });
-
-    let reportedCount = 0;
-
-    child.on('message', msg => {
-      reportedCount++;
-      const rssMb = (msg as { memUsage: { rss: number } }).memUsage.rss / 1024 / 1024;
-      // We shouldn't use more than 135MB of memory
-      expect(rssMb).toBeLessThan(135);
-    });
-
-    // Wait for 20 seconds
-    setTimeout(() => {
-      // Ensure we've had memory usage reported at least 15 times
-      expect(reportedCount).toBeGreaterThan(15);
-      child.kill();
-      done();
-    }, 20000);
-  });
 });

dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

@@ -6,6 +6,7 @@ Sentry.init({
   release: '1.0',
   tracesSampleRate: 1.0,
   transport: loggingTransport,
+  integrations: [Sentry.dataloaderIntegration()],
 });
 
 const PORT = 8008;

dev-packages/node-integration-tests/suites/tracing/dataloader/scenario.js

@@ -6,7 +6,7 @@ import {
 
 export * from './index.bundle.base';
 
-export { replayIntegration } from '@sentry-internal/replay';
+export { replayIntegration, getReplay } from '@sentry-internal/replay';
 
 export {
   browserTracingIntegrationShim as browserTracingIntegration,

packages/browser/src/index.bundle.replay.ts

@@ -29,4 +29,4 @@ import { feedbackAsyncIntegration } from './feedbackAsync';
 export { getFeedback } from '@sentry-internal/feedback';
 export { feedbackAsyncIntegration as feedbackAsyncIntegration, feedbackAsyncIntegration as feedbackIntegration };
 
-export { replayIntegration } from '@sentry-internal/replay';
+export { replayIntegration, getReplay } from '@sentry-internal/replay';

packages/browser/src/index.bundle.tracing.replay.feedback.ts

@@ -27,4 +27,4 @@ export {
 import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
 export { feedbackIntegrationShim as feedbackAsyncIntegration, feedbackIntegrationShim as feedbackIntegration };
 
-export { replayIntegration } from '@sentry-internal/replay';
+export { replayIntegration, getReplay } from '@sentry-internal/replay';

packages/browser/src/index.bundle.tracing.replay.ts

@@ -1,7 +1,7 @@
 import { captureException, withScope } from '@sentry/core';
+import { vercelWaitUntil } from '@sentry/utils';
 import type { NextPageContext } from 'next';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
-import { vercelWaitUntil } from './utils/vercelWaitUntil';
 
 type ContextOrProps = {
   req?: NextPageContext['req'];

packages/nextjs/src/common/_error.ts

@@ -9,12 +9,11 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/core';
-import { winterCGRequestToRequestData } from '@sentry/utils';
+import { vercelWaitUntil, winterCGRequestToRequestData } from '@sentry/utils';
 
 import type { EdgeRouteHandler } from '../../edge/types';
 import { flushSafelyWithTimeout } from './responseEnd';
 import { commonObjectToIsolationScope, escapeNextjsTracing } from './tracingUtils';
-import { vercelWaitUntil } from './vercelWaitUntil';
 
 /**
  * Wraps a function on the edge runtime with error and performance monitoring.

packages/nextjs/src/common/utils/edgeWrapperUtils.ts

@@ -14,11 +14,10 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import type { Span } from '@sentry/types';
-import { isString } from '@sentry/utils';
+import { isString, vercelWaitUntil } from '@sentry/utils';
 
 import { autoEndSpanOnResponseEnd, flushSafelyWithTimeout } from './responseEnd';
 import { commonObjectToIsolationScope, escapeNextjsTracing } from './tracingUtils';
-import { vercelWaitUntil } from './vercelWaitUntil';
 
 declare module 'http' {
   interface IncomingMessage {

packages/nextjs/src/common/utils/wrapperUtils.ts

@@ -5,13 +5,12 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import { captureException, continueTrace, getClient, handleCallbackErrors, startSpan } from '@sentry/core';
-import { logger } from '@sentry/utils';
+import { logger, vercelWaitUntil } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
 import { escapeNextjsTracing } from './utils/tracingUtils';
-import { vercelWaitUntil } from './utils/vercelWaitUntil';
 
 interface Options {
   formData?: FormData;

packages/nextjs/src/common/withServerActionInstrumentation.ts

@@ -6,13 +6,12 @@ import {
   startSpanManual,
   withIsolationScope,
 } from '@sentry/core';
-import { consoleSandbox, isString, logger, objectify } from '@sentry/utils';
+import { consoleSandbox, isString, logger, objectify, vercelWaitUntil } from '@sentry/utils';
 
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import type { AugmentedNextApiRequest, AugmentedNextApiResponse, NextApiHandler } from './types';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
 import { escapeNextjsTracing } from './utils/tracingUtils';
-import { vercelWaitUntil } from './utils/vercelWaitUntil';
 
 /**
  * Wrap the given API route handler for tracing and error capturing. Thin wrapper around `withSentry`, which only

packages/nextjs/src/common/wrapApiHandlerWithSentry.ts

@@ -10,7 +10,7 @@ import {
   withIsolationScope,
   withScope,
 } from '@sentry/core';
-import { propagationContextFromHeaders, winterCGHeadersToDict } from '@sentry/utils';
+import { propagationContextFromHeaders, vercelWaitUntil, winterCGHeadersToDict } from '@sentry/utils';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import type { RouteHandlerContext } from './types';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
@@ -19,7 +19,6 @@ import {
   commonObjectToPropagationContext,
   escapeNextjsTracing,
 } from './utils/tracingUtils';
-import { vercelWaitUntil } from './utils/vercelWaitUntil';
 
 /**
  * Wraps a Next.js App Router Route handler with Sentry error and performance instrumentation.

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -13,14 +13,13 @@ import {
   withIsolationScope,
   withScope,
 } from '@sentry/core';
-import { propagationContextFromHeaders, uuid4, winterCGHeadersToDict } from '@sentry/utils';
+import { propagationContextFromHeaders, uuid4, vercelWaitUntil, winterCGHeadersToDict } from '@sentry/utils';
 
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import type { ServerComponentContext } from '../common/types';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
-import { vercelWaitUntil } from './utils/vercelWaitUntil';
 
 /**
  * Wraps an `app` directory server component with Sentry error instrumentation.

packages/nextjs/src/common/wrapServerComponentWithSentry.ts

@@ -86,7 +86,7 @@ let rateLimiter: RateLimitIncrement | undefined;
 async function handlePaused(
   session: Session,
   { reason, data: { objectId }, callFrames }: PausedExceptionEvent,
-): Promise<string | undefined> {
+): Promise<void> {
   if (reason !== 'exception' && reason !== 'promiseRejection') {
     return;
   }
@@ -126,7 +126,7 @@ async function handlePaused(
     objectId,
   });
 
-  return objectId;
+  await session.post('Runtime.releaseObject', { objectId });
 }
 
 async function startDebugger(): Promise<void> {
@@ -145,19 +145,11 @@ async function startDebugger(): Promise<void> {
     isPaused = true;
 
     handlePaused(session, event.params as PausedExceptionEvent).then(
-      async objectId => {
+      async () => {
         // After the pause work is complete, resume execution!
         if (isPaused) {
           await session.post('Debugger.resume');
         }
-
-        if (objectId) {
-          // The object must be released after the debugger has resumed or we get a memory leak.
-          // For node v20, setImmediate is enough here but for v22 a longer delay is required
-          setTimeout(async () => {
-            await session.post('Runtime.releaseObject', { objectId });
-          }, 1_000);
-        }
       },
       async _ => {
         if (isPaused) {

packages/node/src/integrations/local-variables/worker.ts

@@ -3,7 +3,6 @@ import { instrumentHttp } from '../http';
 
 import { amqplibIntegration, instrumentAmqplib } from './amqplib';
 import { connectIntegration, instrumentConnect } from './connect';
-import { dataloaderIntegration, instrumentDataloader } from './dataloader';
 import { expressIntegration, instrumentExpress } from './express';
 import { fastifyIntegration, instrumentFastify } from './fastify';
 import { genericPoolIntegration, instrumentGenericPool } from './genericPool';
@@ -44,7 +43,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
     connectIntegration(),
     genericPoolIntegration(),
     kafkaIntegration(),
-    dataloaderIntegration(),
     amqplibIntegration(),
     lruMemoizerIntegration(),
   ];
@@ -74,7 +72,6 @@ export function getOpenTelemetryInstrumentationToPreload(): (((options?: any) =>
     instrumentGraphql,
     instrumentRedis,
     instrumentGenericPool,
-    instrumentDataloader,
     instrumentAmqplib,
   ];
 }

packages/node/src/integrations/tracing/index.ts

@@ -1,5 +1,13 @@
-/*! Sentry Replay Worker 7.77.0 (cce7d5ecf) | https://github.com/getsentry/sentry-javascript */
+/*! Sentry Replay Worker 8.33.1 (c992b3fad) | https://github.com/getsentry/sentry-javascript */
 // DEFLATE is a complex format; to read this code, you should probably check the RFC first:
+// https://tools.ietf.org/html/rfc1951
+// You may also wish to take a look at the guide I made about this program:
+// https://gist.github.com/101arrowz/253f31eb5abc3d9275ab943003ffecad
+// Some of the following code is similar to that of UZIP.js:
+// https://github.com/photopea/UZIP.js
+// However, the vast majority of the codebase has diverged from UZIP.js to increase performance and reduce bundle size.
+// Sometimes 0 will appear where -1 would be more appropriate. This is because using a uint
+// is better for memory in most engines (I *think*).
 
 // aliases for shorter compressed code (most minifers don't do this)
 var u8 = Uint8Array,
@@ -849,12 +857,13 @@ function compress(data) {
 function mergeUInt8Arrays(chunks) {
   // calculate data length
   let len = 0;
-  for (let i = 0, l = chunks.length; i < l; i++) {
-    len += chunks[i].length;
+  for (const chunk of chunks) {
+    len += chunk.length;
   }
   // join chunks
   const result = new Uint8Array(len);
   for (let i = 0, pos = 0, l = chunks.length; i < l; i++) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const chunk = chunks[i];
     result.set(chunk, pos);
     pos += chunk.length;