drop the experimental env var

vercel · Jul 17, 2024 · 2013224 · 2013224
1 parent af3b329
commit 2013224
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 22 deletions.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -836,10 +836,7 @@ export default abstract class Server<
   ) {
     const [err, req, ctx] = args
 
-    if (
-      process.env.__NEXT_EXPERIMENTAL_INSTRUMENTATION &&
-      this.instrumentation
-    ) {
+    if (this.instrumentation) {
       try {
         await this.instrumentation.onRequestError?.(
           err,

diff --git a/packages/next/src/server/web/globals.ts b/packages/next/src/server/web/globals.ts
@@ -37,12 +37,7 @@ export async function edgeInstrumentationOnRequestError(
 ) {
   const instrumentation = await getEdgeInstrumentationModule()
   try {
-    if (
-      process.env.__NEXT_EXPERIMENTAL_INSTRUMENTATION &&
-      instrumentation?.onRequestError
-    ) {
-      await instrumentation.onRequestError(...args)
-    }
+    await instrumentation?.onRequestError?.(...args)
   } catch (err) {
     // Log the soft error and continue, since the original error has already been thrown
     console.error('Error in instrumentation.onRequestError:', err)

diff --git a/test/e2e/on-request-error/basic/basic.test.ts b/test/e2e/on-request-error/basic/basic.test.ts
@@ -6,9 +6,6 @@ describe('on-request-error - basic', () => {
   const { next, skipped } = nextTestSetup({
     files: __dirname,
     skipDeployment: true,
-    env: {
-      __NEXT_EXPERIMENTAL_INSTRUMENTATION: '1',
-    },
   })
 
   if (skipped) {

diff --git a/test/e2e/on-request-error/dynamic-routes/dynamic-routes.test.ts b/test/e2e/on-request-error/dynamic-routes/dynamic-routes.test.ts
@@ -6,9 +6,6 @@ describe('on-request-error - dynamic-routes', () => {
   const { next, skipped } = nextTestSetup({
     files: __dirname,
     skipDeployment: true,
-    env: {
-      __NEXT_EXPERIMENTAL_INSTRUMENTATION: '1',
-    },
   })
 
   if (skipped) {

diff --git a/test/e2e/on-request-error/server-action-error/server-action-error.test.ts b/test/e2e/on-request-error/server-action-error/server-action-error.test.ts
@@ -6,9 +6,6 @@ describe('on-request-error - server-action-error', () => {
   const { next, skipped } = nextTestSetup({
     files: __dirname,
     skipDeployment: true,
-    env: {
-      __NEXT_EXPERIMENTAL_INSTRUMENTATION: '1',
-    },
   })
 
   if (skipped) {

diff --git a/test/e2e/on-request-error/skip-next-internal-error/skip-next-internal-error.test.ts b/test/e2e/on-request-error/skip-next-internal-error/skip-next-internal-error.test.ts
@@ -4,9 +4,6 @@ describe('on-request-error - skip-next-internal-error', () => {
   const { next, skipped } = nextTestSetup({
     files: __dirname,
     skipDeployment: true,
-    env: {
-      __NEXT_EXPERIMENTAL_INSTRUMENTATION: '1',
-    },
   })
 
   if (skipped) {