feat(remix)!: Remove autoInstrumentRemix

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/instrument.mjs

@@ -6,6 +6,5 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   tunnel: 'http://localhost:3031/', // proxy server
-  autoInstrumentRemix: true, // auto instrument Remix
   integrations: [Sentry.nativeNodeFetchIntegration()],
 });

dev-packages/e2e-tests/test-applications/create-remix-app-express/instrument.mjs

@@ -7,7 +7,6 @@ Sentry.init({
   dsn: process.env.E2E_TEST_DSN,
   tunnel: 'http://localhost:3031/', // proxy server
   sendDefaultPii: true, // Testing the FormData
-  autoInstrumentRemix: true, // auto instrument Remix
   captureActionFormDataKeys: {
     file: true,
     text: true,

dev-packages/e2e-tests/test-applications/create-remix-app-v2/instrument.server.cjs

@@ -5,5 +5,4 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   tunnel: 'http://localhost:3031/', // proxy server
-  autoInstrumentRemix: true, // auto instrument Remix
 });

dev-packages/e2e-tests/test-applications/create-remix-app/instrument.server.cjs

@@ -5,5 +5,4 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   tunnel: 'http://localhost:3031/', // proxy server
-  autoInstrumentRemix: true, // auto instrument Remix
 });

packages/remix/package.json

@@ -52,7 +52,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.39.1",
     "@sentry/core": "8.45.0",
@@ -91,15 +90,10 @@
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "test": "yarn test:unit",
-    "test:integration": "run-s test:integration:otel test:integration:legacy",
-    "test:integration:otel": "export USE_OTEL=1 && run-s test:integration:v1 test:integration:v2",
-    "test:integration:legacy": "export USE_OTEL=0 && run-s test:integration:v1 test:integration:v2",
+    "test:integration": "run-s test:integration:v1 test:integration:v2",
     "test:integration:v1": "run-s test:integration:clean test:integration:prepare test:integration:client test:integration:server",
     "test:integration:v2": "export REMIX_VERSION=2 && yarn test:integration:v1",
-    "test:integration:ci": "run-s test:integration:ci:otel test:integration:ci:legacy",
-    "test:integration:ci:otel": "USE_OTEL=1 yarn test:integration:ci:common",
-    "test:integration:ci:legacy": "USE_OTEL=0 yarn test:integration:ci:common",
-    "test:integration:ci:common": "run-s test:integration:clean test:integration:prepare test:integration:client:ci test:integration:server",
+    "test:integration:ci": "run-s test:integration:clean test:integration:prepare test:integration:client:ci test:integration:server",
     "test:integration:prepare": "(cd test/integration && yarn install)",
     "test:integration:clean": "(cd test/integration && rimraf .cache node_modules build)",
     "test:integration:client": "yarn playwright install-deps && yarn playwright test test/integration/test/client/ --project='chromium'",

packages/remix/playwright.config.ts

@@ -14,7 +14,7 @@ const config: PlaywrightTestConfig = {
   workers: process.env.CI ? 3 : undefined,
   webServer: {
     env: {
-      NODE_OPTIONS: process.env.USE_OTEL === '1' ? '--require ./instrument.server.cjs' : '',
+      NODE_OPTIONS: '--require ./instrument.server.cjs',
     },
     command: '(cd test/integration/ && yarn build && yarn start)',
     port: 3000,

packages/remix/src/client/performance.tsx

@@ -24,27 +24,27 @@ import * as React from 'react';
 import { DEBUG_BUILD } from '../utils/debug-build';
 import { getFutureFlagsBrowser, readRemixVersionFromLoader } from '../utils/futureFlags';
 
-export type Params<Key extends string = string> = {
+type Params<Key extends string = string> = {
   readonly [key in Key]: string | undefined;
 };
 
-export interface RouteMatch<ParamKey extends string = string> {
+interface RouteMatch<ParamKey extends string = string> {
   params: Params<ParamKey>;
   pathname: string;
   id: string;
   handle: unknown;
 }
-export type UseEffect = (cb: () => void, deps: unknown[]) => void;
+type UseEffect = (cb: () => void, deps: unknown[]) => void;
 
-export type UseLocation = () => {
+type UseLocation = () => {
   pathname: string;
   search?: string;
   hash?: string;
   state?: unknown;
   key?: unknown;
 };
 
-export type UseMatches = () => RouteMatch[] | null;
+type UseMatches = () => RouteMatch[] | null;
 
 export type RemixBrowserTracingIntegrationOptions = Partial<Parameters<typeof originalBrowserTracingIntegration>[0]> & {
   useEffect?: UseEffect;

packages/remix/src/index.server.ts

@@ -153,8 +153,7 @@ export function getRemixDefaultIntegrations(options: RemixOptions): Integration[
   return [
     ...getDefaultNodeIntegrations(options as NodeOptions).filter(integration => integration.name !== 'Http'),
     httpIntegration(),
-    // eslint-disable-next-line deprecation/deprecation
-    options.autoInstrumentRemix ? remixIntegration() : undefined,
+    remixIntegration(),
   ].filter(int => int) as Integration[];
 }
 
@@ -186,7 +185,7 @@ export function init(options: RemixOptions): NodeClient | undefined {
 
   const client = nodeInit(options as NodeOptions);
 
-  instrumentServer(options);
+  instrumentServer();
 
   return client;
 }

packages/remix/src/utils/errors.ts

@@ -1,20 +1,16 @@
-import type { AppData, DataFunctionArgs, EntryContext, HandleDocumentRequestFunction } from '@remix-run/node';
+import type { AppData, DataFunctionArgs } from '@remix-run/node';
 import {
   addExceptionMechanism,
   captureException,
-  getClient,
   handleCallbackErrors,
-  isPrimitive,
   logger,
   objectify,
   winterCGRequestToRequestData,
 } from '@sentry/core';
-import type { RequestEventData, Span } from '@sentry/core';
+import type { RequestEventData } from '@sentry/core';
 import { DEBUG_BUILD } from './debug-build';
-import type { RemixOptions } from './remixOptions';
-import { storeFormDataKeys } from './utils';
 import { extractData, isResponse, isRouteErrorResponse } from './vendor/response';
-import type { DataFunction, RemixRequest } from './vendor/types';
+import type { DataFunction } from './vendor/types';
 
 /**
  * Captures an exception happened in the Remix server.
@@ -76,48 +72,6 @@ export async function captureRemixServerException(
     return scope;
   });
 }
-
-/**
- * Wraps the original `HandleDocumentRequestFunction` with error handling.
- *
- * @param origDocumentRequestFunction The original `HandleDocumentRequestFunction`.
- * @param requestContext The request context.
- * @param isRemixV2 Whether the Remix version is v2 or not.
- *
- * @returns The wrapped `HandleDocumentRequestFunction`.
- */
-export function errorHandleDocumentRequestFunction(
-  this: unknown,
-  origDocumentRequestFunction: HandleDocumentRequestFunction,
-  requestContext: {
-    request: RemixRequest;
-    responseStatusCode: number;
-    responseHeaders: Headers;
-    context: EntryContext;
-    loadContext?: Record<string, unknown>;
-  },
-  isRemixV2: boolean,
-): HandleDocumentRequestFunction {
-  const { request, responseStatusCode, responseHeaders, context, loadContext } = requestContext;
-
-  return handleCallbackErrors(
-    () => {
-      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext);
-    },
-    err => {
-      // This exists to capture the server-side rendering errors on Remix v1
-      // On Remix v2, we capture SSR errors at `handleError`
-      // We also skip primitives here, as we can't dedupe them, and also we don't expect any primitive SSR errors.
-      if (!isRemixV2 && !isPrimitive(err)) {
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        captureRemixServerException(err, 'documentRequest', request, isRemixV2);
-      }
-
-      throw err;
-    },
-  );
-}
-
 /**
  * Wraps the original `DataFunction` with error handling.
  * This function also stores the form data keys if the action is being called.
@@ -135,26 +89,15 @@ export async function errorHandleDataFunction(
   origFn: DataFunction,
   name: string,
   args: DataFunctionArgs,
-  isRemixV2: boolean,
-  span?: Span,
 ): Promise<Response | AppData> {
   return handleCallbackErrors(
     async () => {
-      if (name === 'action' && span) {
-        const options = getClient()?.getOptions() as RemixOptions;
-
-        if (options.sendDefaultPii && options.captureActionFormDataKeys) {
-          await storeFormDataKeys(args, span);
-        }
-      }
-
       return origFn.call(this, args);
     },
     err => {
-      // On Remix v2, we capture all unexpected errors (except the `Route Error Response`s / Thrown Responses) in `handleError` function.
+      // We capture all unexpected errors (except the `Route Error Response`s / Thrown Responses) in `handleError` function.
       // This is both for consistency and also avoid duplicates such as primitives like `string` or `number` being captured twice.
-      // Remix v1 does not have a `handleError` function, so we capture all errors here.
-      if (isRemixV2 ? isResponse(err) : true) {
+      if (isResponse(err)) {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         captureRemixServerException(err, name, args.request, true);
       }

packages/remix/src/utils/futureFlags.ts

@@ -2,7 +2,7 @@ import { GLOBAL_OBJ } from '@sentry/core';
 
 import type { FutureConfig, ServerBuild } from './vendor/types';
 
-export type EnhancedGlobal = typeof GLOBAL_OBJ & {
+type EnhancedGlobal = typeof GLOBAL_OBJ & {
   __remixContext?: {
     future?: FutureConfig;
     state?: {
@@ -30,17 +30,6 @@ export function getFutureFlagsBrowser(): FutureConfig | undefined {
   return window.__remixContext.future;
 }
 
-/**
- * Get the future flags from the Remix server build
- *
- * @param build The Remix server build
- *
- * @returns The future flags
- */
-export function getFutureFlagsServer(build: ServerBuild): FutureConfig | undefined {
-  return build.future;
-}
-
 /**
  * Learn Remix version from the server build object
  * V2 Server builds have a non-optional `mode` property