.

Author: lforst

packages/remix/package.json

@@ -91,14 +91,8 @@
     "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 && yarn test:integration:v2",
-    "test:integration:legacy": "export USE_OTEL=0 && yarn test:integration:v2",
-    "test:integration:v2": "run-s test:integration:clean test:integration:prepare test:integration:client test:integration:server",
-    "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": "run-s test:integration:clean test:integration:prepare test:integration:client 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

@@ -13,7 +13,7 @@ const config: PlaywrightTestConfig = {
   // Note that 3 is a random number selected to work well with our CI setup
   workers: process.env.CI ? 3 : undefined,
   webServer: {
-    command: `(cd test/integration/ && yarn build && yarn ${process.env.USE_OTEL === '1' ? 'start:otel' : 'start'})`,
+    command: `(cd test/integration/ && yarn build && yarn start)`,
     port: 3000,
   },
   projects: [

packages/remix/test/integration/app/entry.server.tsx

@@ -1,13 +1,5 @@
 import * as Sentry from '@sentry/remix';
 
-if (process.env.USE_OTEL !== '1') {
-  Sentry.init({
-    dsn: 'https://public@dsn.ingest.sentry.io/1337',
-    tracesSampleRate: 1,
-    tracePropagationTargets: ['example.org'],
-  });
-}
-
 import type { EntryContext } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
 import { renderToString } from 'react-dom/server';

packages/remix/test/integration/package.json

@@ -5,8 +5,7 @@
   "scripts": {
     "build": "remix build",
     "dev": "remix dev",
-    "start": "remix-serve build/index.js",
-    "start:otel": "NODE_OPTIONS='--import=./instrument.server.mjs' remix-serve build/index.js"
+    "start": "NODE_OPTIONS='--import=./instrument.server.mjs' remix-serve build/index.js"
   },
   "dependencies": {
     "@remix-run/express": "2.15.2",