Merge remote-tracking branch 'origin/develop' into lforst-min-nextjs-version

Author: lforst

.github/workflows/build.yml

@@ -871,7 +871,7 @@ jobs:
           yarn test
 
   job_remix_integration_tests:
-    name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) ${{ matrix.tracingIntegration && 'TracingIntegration'}} Tests
+    name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_get_metadata.outputs.changed_remix == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-20.04

.size-limit.js

@@ -55,12 +55,26 @@ module.exports = [
     limit: '35 KB',
   },
   {
-    name: '@sentry/browser (incl. Feedback) - Webpack (gzipped)',
+    name: '@sentry/browser (incl. feedbackIntegration) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
     import: '{ init, feedbackIntegration }',
     gzip: true,
     limit: '50 KB',
   },
+  {
+    name: '@sentry/browser (incl. feedbackModalIntegration) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, feedbackIntegration, feedbackModalIntegration }',
+    gzip: true,
+    limit: '50 KB',
+  },
+  {
+    name: '@sentry/browser (incl. feedbackScreenshotIntegration) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, feedbackIntegration, feedbackModalIntegration, feedbackScreenshotIntegration }',
+    gzip: true,
+    limit: '50 KB',
+  },
   {
     name: '@sentry/browser (incl. sendFeedback) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx

@@ -1,25 +1,25 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+});
+
 import { PassThrough } from 'node:stream';
 
 import type { AppLoadContext, EntryContext } from '@remix-run/node';
 import { createReadableStreamFromReadable } from '@remix-run/node';
 import { installGlobals } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import * as isbotModule from 'isbot';
 import { renderToPipeableStream } from 'react-dom/server';
 
 installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-  tunnel: 'http://localhost:3031/', // proxy server
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/behaviour-server.test.ts

@@ -7,7 +7,13 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   // We use this to identify the transactions
   const testTag = uuid4();
 
-  // no server span here!
+  const httpServerTransactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'http.server' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
 
   const pageLoadTransactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
     return (
@@ -20,16 +26,25 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   page.goto(`/?tag=${testTag}`);
 
   const pageloadTransaction = await pageLoadTransactionPromise;
+  const httpServerTransaction = await httpServerTransactionPromise;
 
   expect(pageloadTransaction).toBeDefined();
+  expect(httpServerTransaction).toBeDefined();
+
+  const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
+  const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 
   const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
   const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
   const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
 
+  expect(httpServerTransaction.transaction).toBe('routes/_index');
   expect(pageloadTransaction.transaction).toBe('routes/_index');
 
-  expect(pageLoadTraceId).toBeDefined();
-  expect(pageLoadParentSpanId).toBeUndefined();
-  expect(pageLoadSpanId).toBeDefined();
+  expect(httpServerTraceId).toBeDefined();
+  expect(httpServerSpanId).toBeDefined();
+
+  expect(pageLoadTraceId).toEqual(httpServerTraceId);
+  expect(pageLoadParentSpanId).toEqual(httpServerSpanId);
+  expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
 });

dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx

@@ -1,3 +1,12 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+});
+
 /**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
@@ -10,22 +19,13 @@ import type { AppLoadContext, EntryContext } from '@remix-run/node';
 import { createReadableStreamFromReadable } from '@remix-run/node';
 import { installGlobals } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import isbot from 'isbot';
 import { renderToPipeableStream } from 'react-dom/server';
 
 installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-  tunnel: 'http://localhost:3031/', // proxy server
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx

@@ -1,3 +1,12 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+});
+
 /**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
@@ -9,20 +18,11 @@ import { PassThrough } from 'node:stream';
 import type { AppLoadContext, EntryContext } from '@remix-run/node';
 import { Response } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import isbot from 'isbot';
 import { renderToPipeableStream } from 'react-dom/server';
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-  tunnel: 'http://localhost:3031/', // proxy server
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -71,7 +71,7 @@ const DEPENDENTS: Dependent[] = [
   },
   {
     package: '@sentry/remix',
-    compareWith: nodeExperimentalExports,
+    compareWith: nodeExports,
     exports: Object.keys(SentryRemix),
   },
   {

dev-packages/rollup-utils/npmHelpers.mjs

@@ -52,6 +52,10 @@ export function makeBaseNPMConfig(options = {}) {
 
       sourcemap: true,
 
+      // Include __esModule property when generating exports
+      // Before the upgrade to Rollup 4 this was included by default and when it was gone it broke tests
+      esModule: true,
+
       // output individual files rather than one big bundle
       preserveModules: true,
 

dev-packages/rollup-utils/plugins/bundlePlugins.mjs

@@ -13,8 +13,8 @@ import * as childProcess from 'child_process';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
+import terser from '@rollup/plugin-terser';
 import license from 'rollup-plugin-license';
-import { terser } from 'rollup-plugin-terser';
 
 /**
  * Create a plugin to add an identification banner to the top of stand-alone bundles.

jest/jest.config.js

@@ -19,4 +19,11 @@ module.exports = {
     __DEBUG_BUILD__: true,
   },
   testPathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/'],
+
+  // On CI, we do not need the pretty CLI output, as it makes logs harder to parse
+  ...(process.env.CI
+    ? {
+        coverageReporters: ['json', 'lcov', 'clover'],
+      }
+    : {}),
 };

package.json

@@ -86,12 +86,13 @@
   ],
   "devDependencies": {
     "@biomejs/biome": "^1.4.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-replace": "^3.0.1",
-    "@rollup/plugin-sucrase": "^4.0.3",
-    "@rollup/plugin-typescript": "^8.3.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-sucrase": "^5.0.2",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@size-limit/file": "~11.0.1",
     "@size-limit/webpack": "~11.0.1",
     "@strictsoftware/typedoc-plugin-monorepo": "^0.3.1",
@@ -120,10 +121,9 @@
     "prettier": "^3.1.1",
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.67.1",
-    "rollup-plugin-cleanup": "3.2.1",
-    "rollup-plugin-license": "^2.6.1",
-    "rollup-plugin-terser": "^7.0.2",
+    "rollup": "^4.13.0",
+    "rollup-plugin-cleanup": "^3.2.1",
+    "rollup-plugin-license": "^3.3.1",
     "sinon": "^7.3.2",
     "size-limit": "~11.0.1",
     "ts-jest": "^27.1.4",
@@ -134,7 +134,8 @@
     "yalc": "^1.0.0-pre.53"
   },
   "resolutions": {
-    "**/agent-base": "5",
+    "wrap-ansi": "7.0.0",
+    "string-width": "4.1.0",
     "**/terser/source-map": "0.7.4"
   },
   "version": "0.0.0",

packages/astro/package.json

@@ -58,7 +58,6 @@
   },
   "devDependencies": {
     "astro": "^3.5.0",
-    "rollup": "^3.20.2",
     "vite": "4.0.5"
   },
   "scripts": {

packages/astro/src/index.types.ts

@@ -24,15 +24,11 @@ export declare function flush(timeout?: number | undefined): PromiseLike<boolean
 
 // eslint-disable-next-line deprecation/deprecation
 export declare const makeMain: typeof clientSdk.makeMain;
-export declare const getActiveSpan: typeof clientSdk.getActiveSpan;
 // eslint-disable-next-line deprecation/deprecation
 export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
 export declare const getClient: typeof clientSdk.getClient;
-export declare const startSpan: typeof clientSdk.startSpan;
-export declare const startInactiveSpan: typeof clientSdk.startInactiveSpan;
-export declare const startSpanManual: typeof clientSdk.startSpanManual;
-export declare const withActiveSpan: typeof clientSdk.withActiveSpan;
-export declare const getRootSpan: typeof clientSdk.getRootSpan;
+export declare const continueTrace: typeof clientSdk.continueTrace;
+
 export declare const Span: clientSdk.Span;
 
 export declare const metrics: typeof clientSdk.metrics & typeof serverSdk.metrics;

packages/core/src/envelope.ts

@@ -1,4 +1,6 @@
 import type {
+  Attachment,
+  AttachmentItem,
   DsnComponents,
   Event,
   EventEnvelope,
@@ -11,6 +13,7 @@ import type {
   SessionItem,
 } from '@sentry/types';
 import {
+  createAttachmentEnvelopeItem,
   createEnvelope,
   createEventEnvelopeHeaders,
   dsnToString,
@@ -86,3 +89,31 @@ export function createEventEnvelope(
   const eventItem: EventItem = [{ type: eventType }, event];
   return createEnvelope<EventEnvelope>(envelopeHeaders, [eventItem]);
 }
+
+/**
+ * Create an Envelope from an event.
+ */
+export function createAttachmentEnvelope(
+  event: Event,
+  attachments: Attachment[],
+  dsn?: DsnComponents,
+  metadata?: SdkMetadata,
+  tunnel?: string,
+): EventEnvelope {
+  const sdkInfo = getSdkMetadataForEnvelopeHeader(metadata);
+  enhanceEventWithSdkInfo(event, metadata && metadata.sdk);
+
+  const envelopeHeaders = createEventEnvelopeHeaders(event, sdkInfo, tunnel, dsn);
+
+  // Prevent this data (which, if it exists, was used in earlier steps in the processing pipeline) from being sent to
+  // sentry. (Note: Our use of this property comes and goes with whatever we might be debugging, whatever hacks we may
+  // have temporarily added, etc. Even if we don't happen to be using it at some point in the future, let's not get rid
+  // of this `delete`, lest we miss putting it back in the next time the property is in use.)
+  delete event.sdkProcessingMetadata;
+
+  const attachmentItems: AttachmentItem[] = [];
+  for (const attachment of attachments || []) {
+    attachmentItems.push(createAttachmentEnvelopeItem(attachment));
+  }
+  return createEnvelope<EventEnvelope>(envelopeHeaders, attachmentItems);
+}

packages/core/src/index.ts

@@ -8,7 +8,7 @@ export type { IntegrationIndex } from './integration';
 
 export * from './tracing';
 export * from './semanticAttributes';
-export { createEventEnvelope, createSessionEnvelope } from './envelope';
+export { createEventEnvelope, createSessionEnvelope, createAttachmentEnvelope } from './envelope';
 export {
   captureCheckIn,
   withMonitor,

packages/core/src/utils/spanUtils.ts

@@ -162,8 +162,7 @@ export function spanIsSampled(span: Span): boolean {
   // We align our trace flags with the ones OpenTelemetry use
   // So we also check for sampled the same way they do.
   const { traceFlags } = span.spanContext();
-  // eslint-disable-next-line no-bitwise
-  return Boolean(traceFlags & TRACE_FLAG_SAMPLED);
+  return traceFlags === TRACE_FLAG_SAMPLED;
 }
 
 /** Get the status message to use for a JSON representation of a span. */

packages/deno/package.json

@@ -39,7 +39,7 @@
     "deno-types": "node ./scripts/download-deno-types.mjs",
     "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
-    "build:transpile": "yarn deno-types && rollup -c rollup.config.js",
+    "build:transpile": "yarn deno-types && rollup -c rollup.config.mjs",
     "build:types": "run-s deno-types build:types:tsc build:types:bundle",
     "build:types:tsc": "tsc -p tsconfig.types.json",
     "build:types:bundle": "rollup -c rollup.types.config.mjs",

packages/deno/rollup.config.js renamed to packages/deno/rollup.config.mjs

@@ -11,26 +11,6 @@ module.exports = {
       parserOptions: {
         project: ['tsconfig.test.json'],
       },
-      rules: {
-        'no-console': 'off',
-      },
-    },
-    {
-      files: ['test/**/*.ts'],
-
-      rules: {
-        // most of these errors come from `new Promise(process.nextTick)`
-        '@typescript-eslint/unbound-method': 'off',
-        // TODO: decide if we want to enable this again after the migration
-        // We can take the freedom to be a bit more lenient with tests
-        '@typescript-eslint/no-floating-promises': 'off',
-      },
-    },
-    {
-      files: ['src/types/deprecated.ts'],
-      rules: {
-        '@typescript-eslint/naming-convention': 'off',
-      },
     },
   ],
 };