fix (cherry-pick): custom tracing in production builds (#27124)

app/scripts/lib/ppom/ppom-middleware.test.ts

@@ -108,6 +108,14 @@ describe('PPOMMiddleware', () => {
     generateSecurityAlertIdMock.mockReturnValue(SECURITY_ALERT_ID_MOCK);
     handlePPOMErrorMock.mockReturnValue(SECURITY_ALERT_RESPONSE_MOCK);
     isChainSupportedMock.mockResolvedValue(true);
+
+    globalThis.sentry = {
+      withIsolationScope: jest
+        .fn()
+        .mockImplementation((fn) => fn({ setTags: jest.fn() })),
+      startSpan: jest.fn().mockImplementation((_, fn) => fn({})),
+      startSpanManual: jest.fn().mockImplementation((_, fn) => fn({})),
+    };
   });
 
   it('updates alert response after validating request', async () => {

app/scripts/metamask-controller.test.js

@@ -358,6 +358,10 @@ describe('MetaMaskController', () => {
           },
         ]),
       );
+
+    globalThis.sentry = {
+      withIsolationScope: jest.fn(),
+    };
   });
 
   afterEach(() => {

development/build/scripts.js

@@ -89,18 +89,15 @@ const scuttlingConfigBase = {
     extra: '',
     stateHooks: '',
     nw: '',
+    // Sentry Custom Tracing
+    document: '',
+    isNaN: '',
+    parseInt: '',
   },
 };
 
 const mv3ScuttlingConfig = { ...scuttlingConfigBase };
-
-const standardScuttlingConfig = {
-  ...scuttlingConfigBase,
-  'scripts/sentry-install.js': {
-    ...scuttlingConfigBase['scripts/sentry-install.js'],
-    document: '',
-  },
-};
+const standardScuttlingConfig = { ...scuttlingConfigBase };
 
 const noopWriteStream = through.obj((_file, _fileEncoding, callback) =>
   callback(),

shared/lib/trace.test.ts

@@ -37,6 +37,12 @@ describe('Trace', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
+    globalThis.sentry = {
+      startSpan: startSpanMock,
+      startSpanManual: startSpanManualMock,
+      withIsolationScope: withIsolationScopeMock,
+    };
+
     startSpanMock.mockImplementation((_, fn) => fn({} as Span));
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

shared/lib/trace.ts

@@ -114,7 +114,7 @@ function traceCallback<T>(request: TraceRequest, fn: TraceCallback<T>): T {
   };
 
   return startSpan(request, (spanOptions) =>
-    Sentry.startSpan(spanOptions, callback),
+    sentryStartSpan(spanOptions, callback),
   );
 }
 
@@ -138,7 +138,7 @@ function startTrace(request: TraceRequest): TraceContext {
   };
 
   return startSpan(request, (spanOptions) =>
-    Sentry.startSpanManual(spanOptions, callback),
+    sentryStartSpanManual(spanOptions, callback),
   );
 }
 
@@ -157,7 +157,7 @@ function startSpan<T>(
     startTime,
   };
 
-  return Sentry.withIsolationScope((scope) => {
+  return sentryWithIsolationScope((scope: Sentry.Scope) => {
     scope.setTags(tags as Record<string, Primitive>);
 
     return callback(spanOptions);
@@ -207,3 +207,44 @@ function tryCatchMaybePromise<T>(
 
   return undefined;
 }
+
+function sentryStartSpan<T>(
+  spanOptions: StartSpanOptions,
+  callback: (span: Sentry.Span | null) => T,
+): T {
+  const actual = globalThis.sentry?.startSpan;
+
+  if (!actual) {
+    return callback(null);
+  }
+
+  return actual(spanOptions, callback);
+}
+
+function sentryStartSpanManual<T>(
+  spanOptions: StartSpanOptions,
+  callback: (span: Sentry.Span | null) => T,
+): T {
+  const actual = globalThis.sentry?.startSpanManual;
+
+  if (!actual) {
+    return callback(null);
+  }
+
+  return actual(spanOptions, callback);
+}
+
+function sentryWithIsolationScope<T>(callback: (scope: Sentry.Scope) => T): T {
+  const actual = globalThis.sentry?.withIsolationScope;
+
+  if (!actual) {
+    const scope = {
+      // eslint-disable-next-line no-empty-function
+      setTags: () => {},
+    } as unknown as Sentry.Scope;
+
+    return callback(scope);
+  }
+
+  return actual(callback);
+}