Merge branch 'develop' into lforst-rm-autoinstrremix

Author: lforst

.github/workflows/build.yml

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

CHANGELOG.md

@@ -10,7 +10,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, and @kunal-511. Thank you for your contributions!
+Work in this release was contributed by @tjhiggins, @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, and @kunal-511. Thank you for your contributions!
 
 - **feat(solidstart)!: Default to `--import` setup and add `autoInjectServerSentry` ([#14862](https://github.com/getsentry/sentry-javascript/pull/14862))**
 

dev-packages/browser-integration-tests/package.json

@@ -46,8 +46,8 @@
     "@sentry/browser": "8.45.0",
     "axios": "1.7.7",
     "babel-loader": "^8.2.2",
-    "html-webpack-plugin": "^5.5.0",
     "fflate": "0.8.2",
+    "html-webpack-plugin": "^5.5.0",
     "webpack": "^5.95.0"
   },
   "devDependencies": {

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

@@ -13,7 +13,7 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-export const handleError = Sentry.wrapRemixHandleError;
+export const handleError = Sentry.sentryHandleError;
 
 export default function handleRequest(
   request: Request,

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

@@ -13,7 +13,7 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-export const handleError = Sentry.wrapRemixHandleError;
+export const handleError = Sentry.sentryHandleError;
 
 export default function handleRequest(
   request: Request,

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

@@ -13,7 +13,7 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-export const handleError = Sentry.wrapRemixHandleError;
+export const handleError = Sentry.sentryHandleError;
 
 export default function handleRequest(
   request: Request,

dev-packages/e2e-tests/test-applications/nestjs-fastify/src/app.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Param, ParseIntPipe, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
+import { All, Controller, Get, Param, ParseIntPipe, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
 import { flush } from '@sentry/nestjs';
 import { AppService } from './app.service';
 import { AsyncInterceptor } from './async-example.interceptor';
@@ -121,4 +121,9 @@ export class AppController {
   testFunctionName() {
     return this.appService.getFunctionName();
   }
+
+  @All('test-all')
+  testAll() {
+    return {};
+  }
 }

dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts

@@ -808,3 +808,8 @@ test('Calling canActivate method on service with Injectable decorator returns 20
   const response = await fetch(`${baseURL}/test-service-canActivate`);
   expect(response.status).toBe(200);
 });
+
+test('Calling @All method on service with Injectable decorator returns 200', async ({ baseURL }) => {
+  const response = await fetch(`${baseURL}/test-all`);
+  expect(response.status).toBe(200);
+});

dev-packages/node-integration-tests/scripts/use-ts-3_8.js

@@ -1,10 +1,23 @@
 /* eslint-disable no-console */
 const { execSync } = require('child_process');
 const { join } = require('path');
-const { writeFileSync } = require('fs');
+const { readFileSync, writeFileSync } = require('fs');
 
 const cwd = join(__dirname, '../../..');
 
+// Newer versions of the Express types use syntax that isn't supported by TypeScript 3.8.
+// We'll pin to the last version of those types that are compatible.
+console.log('Pinning Express types to old versions...');
+
+const packageJsonPath = join(cwd, 'package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+
+if (!packageJson.resolutions) packageJson.resolutions = {};
+packageJson.resolutions['@types/express'] = '4.17.13';
+packageJson.resolutions['@types/express-serve-static-core'] = '4.17.30';
+
+writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+
 const tsVersion = '3.8';
 
 console.log(`Installing typescript@${tsVersion}, and @types/node@14...`);
@@ -20,7 +33,7 @@ const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');
 
 const tsConfig = require(baseTscConfigPath);
 
-// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
+// TS 3.8 fails build when it encounters a config option it does not understand, so we remove it :(
 delete tsConfig.compilerOptions.noUncheckedIndexedAccess;
 
 writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

docs/migration/v8-to-v9.md

@@ -38,6 +38,8 @@ We no longer test against Node 14 and Node 16 and cannot guarantee that the SDK
 
 If you need to support older browsers, we recommend transpiling your code using Babel or similar tooling.
 
+**Deno:** The minimum supported Deno version is now **2.0.0**.
+
 ### Framework Support Changes
 
 Support for the following Framework versions is dropped:
@@ -271,6 +273,8 @@ Let us know if this is causing issues in your setup by opening an issue on GitHu
 
 ### `@sentry/deno`
 
+The minimum supported Deno version is now **2.0.0**.
+
 - `@sentry/deno` is no longer published on `deno.land` so you'll need to import
   from npm:
 
@@ -345,6 +349,7 @@ The `enableTracing` option was removed. In v9, to emulate `enableTracing: true`,
 To enable session tracking, it is recommended to unset `autoSessionTracking` and ensure that either, in browser environments the `browserSessionIntegration` is added, or in server environments the `httpIntegration` is added.
 
 To disable session tracking, it is recommended unset `autoSessionTracking` and to remove the `browserSessionIntegration` in browser environments, or in server environments configure the `httpIntegration` with the `trackIncomingRequestsAsSessions` option set to `false`.
+Additionally, in Node.js environments, a session was automatically created for every node process when `autoSessionTracking` was set to `true`. This behavior has been replaced by the `processSessionIntegration` which is configured by default.
 
 - **The metrics API has been removed from the SDK.**
 

packages/aws-serverless/package.json

@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/instrumentation": "^0.56.0",
-    "@opentelemetry/instrumentation-aws-lambda": "0.50.0",
-    "@opentelemetry/instrumentation-aws-sdk": "0.48.0",
+    "@opentelemetry/instrumentation": "^0.57.1",
+    "@opentelemetry/instrumentation-aws-lambda": "0.50.2",
+    "@opentelemetry/instrumentation-aws-sdk": "0.49.0",
     "@sentry/core": "8.45.0",
     "@sentry/node": "8.45.0",
     "@types/aws-lambda": "^8.10.62"

packages/browser-utils/src/metrics/web-vitals/types/base.ts

@@ -104,15 +104,6 @@ export type MetricWithAttribution =
  */
 export type MetricRatingThresholds = [number, number];
 
-/**
- * @deprecated Use metric-specific function types instead, such as:
- * `(metric: LCPMetric) => void`. If a single callback type is needed for
- * multiple metrics, use `(metric: MetricType) => void`.
- */
-export interface ReportCallback {
-  (metric: MetricType): void;
-}
-
 export interface ReportOpts {
   reportAllChanges?: boolean;
   durationThreshold?: number;

packages/browser/src/index.ts

@@ -39,8 +39,6 @@ export {
 } from './tracing/browserTracingIntegration';
 export type { RequestInstrumentationOptions } from './tracing/request';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addTracingExtensions,
   registerSpanErrorInstrumentation,
   getActiveSpan,
   getRootSpan,

packages/core/src/client.ts

@@ -758,7 +758,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
 
   /** Updates existing session based on the provided event */
   protected _updateSessionFromEvent(session: Session, event: Event): void {
-    let crashed = false;
+    let crashed = event.level === 'fatal';
     let errored = false;
     const exceptions = event.exception?.values;
 
@@ -1111,11 +1111,13 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
 /**
  * @deprecated Use `Client` instead. This alias may be removed in a future major version.
  */
+// TODO(v10): Remove
 export type BaseClient = Client;
 
 /**
  * @deprecated Use `Client` instead. This alias may be removed in a future major version.
  */
+// TODO(v10): Remove
 export const BaseClient = Client;
 
 /**

packages/core/src/fetch.ts

@@ -1,5 +1,3 @@
-import type { Client } from './client';
-import type { Scope } from './scope';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes';
 import { SPAN_STATUS_ERROR, setHttpStatus, startInactiveSpan } from './tracing';
 import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
@@ -201,27 +199,6 @@ function _addTracingHeadersToFetchRequest(
   }
 }
 
-/**
- * Adds sentry-trace and baggage headers to the various forms of fetch headers.
- *
- * @deprecated This function will not be exported anymore in v9.
- */
-export function addTracingHeadersToFetchRequest(
-  request: string | unknown,
-  _client: Client | undefined,
-  _scope: Scope | undefined,
-  fetchOptionsObj: {
-    headers?:
-      | {
-          [key: string]: string[] | string | undefined;
-        }
-      | PolymorphicRequestHeaders;
-  },
-  span?: Span,
-): PolymorphicRequestHeaders | undefined {
-  return _addTracingHeadersToFetchRequest(request as Request, fetchOptionsObj, span);
-}
-
 function getFullURL(url: string): string | undefined {
   try {
     const parsed = new URL(url);

packages/core/src/index.ts

@@ -110,11 +110,7 @@ export { rewriteFramesIntegration } from './integrations/rewriteframes';
 export { zodErrorsIntegration } from './integrations/zoderrors';
 export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
 export { profiler } from './profiling';
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  addTracingHeadersToFetchRequest,
-  instrumentFetchRequest,
-} from './fetch';
+export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';

packages/core/src/tracing/hubextensions.ts

@@ -1,7 +1,5 @@
 export { registerSpanErrorInstrumentation } from './errors';
 export { setCapturedScopesOnSpan, getCapturedScopesOnSpan } from './utils';
-// eslint-disable-next-line deprecation/deprecation
-export { addTracingExtensions } from './hubextensions';
 export { startIdleSpan, TRACING_DEFAULTS } from './idleSpan';
 export { SentrySpan } from './sentrySpan';
 export { SentryNonRecordingSpan } from './sentryNonRecordingSpan';

packages/core/src/tracing/index.ts

@@ -47,8 +47,7 @@ export {
   parseSemver,
   uuid4,
 } from './misc';
-// eslint-disable-next-line deprecation/deprecation
-export { dynamicRequire, isNodeEnv, loadModule } from './node';
+export { isNodeEnv, loadModule } from './node';
 export { normalize, normalizeToSize, normalizeUrlToBase } from './normalize';
 export {
   addNonEnumerableProperty,
@@ -136,8 +135,6 @@ export { eventFromMessage, eventFromUnknownInput, exceptionFromError, parseStack
 export { callFrameToStackFrame, watchdogTimer } from './anr';
 export { LRUMap } from './lru';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  generatePropagationContext,
   generateTraceId,
   generateSpanId,
 } from './propagationContext';

packages/core/src/utils-hoist/index.ts

@@ -23,10 +23,9 @@ export function isNodeEnv(): boolean {
  * Requires a module which is protected against bundler minification.
  *
  * @param request The module path to resolve
- * @deprecated This function will be removed in the next major version.
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function dynamicRequire(mod: any, request: string): any {
+function dynamicRequire(mod: any, request: string): any {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
   return mod.require(request);
 }
@@ -48,17 +47,14 @@ export function loadModule<T>(moduleName: string): T | undefined {
   let mod: T | undefined;
 
   try {
-    // eslint-disable-next-line deprecation/deprecation
     mod = dynamicRequire(module, moduleName);
   } catch (e) {
     // no-empty
   }
 
   if (!mod) {
     try {
-      // eslint-disable-next-line deprecation/deprecation
       const { cwd } = dynamicRequire(module, 'process');
-      // eslint-disable-next-line deprecation/deprecation
       mod = dynamicRequire(module, `${cwd()}/node_modules/${moduleName}`) as T;
     } catch (e) {
       // no-empty

packages/core/src/utils-hoist/node.ts

@@ -1,18 +1,5 @@
-import type { PropagationContext } from '../types-hoist';
 import { uuid4 } from './misc';
 
-/**
- * Returns a new minimal propagation context.
- *
- * @deprecated Use `generateTraceId` and `generateSpanId` instead.
- */
-export function generatePropagationContext(): PropagationContext {
-  return {
-    traceId: generateTraceId(),
-    sampleRand: Math.random(),
-  };
-}
-
 /**
  * Generate a random, valid trace ID.
  */

packages/core/src/utils-hoist/propagationContext.ts

@@ -12,7 +12,6 @@
 
 ## Links
 
-- [SDK on Deno registry](https://deno.land/x/sentry)
 - [Official SDK Docs](https://docs.sentry.io/quickstart/)
 - [TypeDoc](http://getsentry.github.io/sentry-javascript/)
 

packages/deno/README.md

@@ -44,9 +44,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.29.0",
-    "@opentelemetry/instrumentation": "^0.56.0",
-    "@opentelemetry/instrumentation-nestjs-core": "0.43.0",
+    "@opentelemetry/core": "^1.30.1",
+    "@opentelemetry/instrumentation": "^0.57.1",
+    "@opentelemetry/instrumentation-nestjs-core": "0.44.0",
     "@sentry/core": "8.45.0",
     "@sentry/node": "8.45.0"
   },

packages/nestjs/package.json

@@ -4,9 +4,9 @@
 // https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
 interface FastifyRequest {
   routeOptions?: {
-    method?: string;
     url?: string;
   };
+  method?: string;
 }
 
 // Partial extract of ExpressRequest interface

packages/nestjs/src/integrations/types.ts

@@ -16,9 +16,9 @@ import { isExpectedError } from './helpers';
 // https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
 interface FastifyRequest {
   routeOptions?: {
-    method?: string;
     url?: string;
   };
+  method?: string;
 }
 
 // Partial extract of ExpressRequest interface
@@ -57,9 +57,7 @@ class SentryTracingInterceptor implements NestInterceptor {
       const req = context.switchToHttp().getRequest() as FastifyRequest | ExpressRequest;
       if ('routeOptions' in req && req.routeOptions?.url) {
         // fastify case
-        getIsolationScope().setTransactionName(
-          `${(req.routeOptions.method || 'GET').toUpperCase()} ${req.routeOptions.url}`,
-        );
+        getIsolationScope().setTransactionName(`${(req.method || 'GET').toUpperCase()} ${req.routeOptions.url}`);
       } else if ('route' in req && req.route?.path) {
         // express case
         getIsolationScope().setTransactionName(`${(req.method || 'GET').toUpperCase()} ${req.route.path}`);

packages/nestjs/src/setup.ts

@@ -122,7 +122,7 @@ export type SentryBuildOptions = {
    */
   sourcemaps?: {
     /**
-     * Disable any functionality related to source maps upload.
+     * Disable any functionality related to source maps.
      */
     disable?: boolean;