chore: Revert custom span

app/components/Nav/App/index.js

@@ -127,7 +127,6 @@
 import OptionsSheet from '../../UI/SelectOptionSheet/OptionsSheet';
 import FoxLoader from '../../../components/UI/FoxLoader';
 import { AppStateEventProcessor } from '../../../core/AppStateEventListener';
-import { trace, TraceName, TraceOperation } from '../../../util/trace';
 
 const clearStackNavigatorOptions = {
   headerShown: false,
@@ -336,15 +335,7 @@
       setOnboarded(!!existingUser);
       try {
         if (existingUser) {
-          await trace(
-            {
-              name: TraceName.BiometricAuthentication,
-              op: TraceOperation.BiometricAuthentication,
-            },
-            async () => {
-              await Authentication.appTriggeredAuth();
-            },
-          );
+          await Authentication.appTriggeredAuth();
           // we need to reset the navigator here so that the user cannot go back to the login screen
           navigator.reset({ routes: [{ name: Routes.ONBOARDING.HOME_NAV }] });
         } else {
@@ -555,7 +546,7 @@
     }
   };
 
   const DetectedTokensFlow = () => (
     <Stack.Navigator
       mode={'modal'}
       screenOptions={clearStackNavigatorOptions}
@@ -569,7 +560,7 @@
     </Stack.Navigator>
   );
 
   const RootModalFlow = () => (
     <Stack.Navigator mode={'modal'} screenOptions={clearStackNavigatorOptions}>
       <Stack.Screen
         name={Routes.MODAL.WALLET_ACTIONS}
@@ -712,7 +703,7 @@
     </Stack.Navigator>
   );
 
   const ImportPrivateKeyView = () => (
     <Stack.Navigator
       screenOptions={{
         headerShown: false,
@@ -733,7 +724,7 @@
     </Stack.Navigator>
   );
 
   const ConnectQRHardwareFlow = () => (
     <Stack.Navigator
       screenOptions={{
         headerShown: false,
@@ -743,7 +734,7 @@
     </Stack.Navigator>
   );
 
   const LedgerConnectFlow = () => (
     <Stack.Navigator
       screenOptions={{
         headerShown: false,
@@ -757,7 +748,7 @@
     </Stack.Navigator>
   );
 
   const ConnectHardwareWalletFlow = () => (
     <Stack.Navigator name="ConnectHardwareWallet">
       <Stack.Screen
         name={Routes.HW.SELECT_DEVICE}
@@ -767,14 +758,14 @@
     </Stack.Navigator>
   );
 
   const EditAccountNameFlow = () => (
     <Stack.Navigator>
       <Stack.Screen name="EditAccountName" component={EditAccountName} />
     </Stack.Navigator>
   );
 
   // eslint-disable-next-line react/prop-types
   const AddNetworkFlow = ({ route }) => (
     <Stack.Navigator>
       <Stack.Screen
         name="AddNetwork"

app/components/Views/LockScreen/index.js

@@ -22,7 +22,6 @@ import {
 import Routes from '../../../constants/navigation/Routes';
 import { CommonActions } from '@react-navigation/native';
 import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
-import { trace, TraceName, TraceOperation } from '../../../util/trace';
 
 const LOGO_SIZE = 175;
 const createStyles = (colors) =>
@@ -135,19 +134,10 @@ class LockScreen extends PureComponent {
       // Retrieve the credentials
       Logger.log('Lockscreen::unlockKeychain - getting credentials');
 
-      await trace(
-        {
-          name: TraceName.BiometricAuthentication,
-          op: TraceOperation.BiometricAuthentication,
-        },
-        async () => {
-          await Authentication.appTriggeredAuth({
-            bioStateMachineId,
-            disableAutoLogout: true,
-          });
-        },
-      );
-
+      await Authentication.appTriggeredAuth({
+        bioStateMachineId,
+        disableAutoLogout: true,
+      });
       this.setState({ ready: true });
       Logger.log('Lockscreen::unlockKeychain - state: ready');
     } catch (error) {

app/components/Views/Login/index.js

@@ -59,12 +59,6 @@ import { LoginViewSelectors } from '../../../../e2e/selectors/LoginView.selector
 import { withMetricsAwareness } from '../../../components/hooks/useMetrics';
 import trackErrorAsAnalytics from '../../../util/metrics/TrackError/trackErrorAsAnalytics';
 import { downloadStateLogs } from '../../../util/logs';
-import {
-  trace,
-  endTrace,
-  TraceName,
-  TraceOperation,
-} from '../../../util/trace';
 
 const deviceHeight = Device.getDeviceHeight();
 const breakPoint = deviceHeight < 700;
@@ -251,10 +245,6 @@ class Login extends PureComponent {
   fieldRef = React.createRef();
 
   async componentDidMount() {
-    trace({
-      name: TraceName.LoginToPasswordEntry,
-      op: TraceOperation.LoginToPasswordEntry,
-    });
     this.props.metrics.trackEvent(MetaMetricsEvents.LOGIN_SCREEN_VIEWED);
     BackHandler.addEventListener('hardwareBackPress', this.handleBackPress);
 
@@ -378,15 +368,7 @@ class Login extends PureComponent {
     );
 
     try {
-      await trace(
-        {
-          name: TraceName.AuthenticateUser,
-          op: TraceOperation.AuthenticateUser,
-        },
-        async () => {
-          await Authentication.userEntryAuth(password, authType);
-        },
-      );
+      await Authentication.userEntryAuth(password, authType);
 
       Keyboard.dismiss();
 
@@ -454,15 +436,7 @@ class Login extends PureComponent {
     const { current: field } = this.fieldRef;
     field?.blur();
     try {
-      await trace(
-        {
-          name: TraceName.BiometricAuthentication,
-          op: TraceOperation.BiometricAuthentication,
-        },
-        async () => {
-          await Authentication.appTriggeredAuth();
-        },
-      );
+      await Authentication.appTriggeredAuth();
       const onboardingWizard = await StorageWrapper.getItem(ONBOARDING_WIZARD);
       if (!onboardingWizard) this.props.setOnboardingWizardStep(1);
       this.props.navigation.replace(Routes.ONBOARDING.HOME_NAV);
@@ -481,7 +455,6 @@ class Login extends PureComponent {
   };
 
   triggerLogIn = () => {
-    endTrace({ name: TraceName.LoginToPasswordEntry });
     this.onLogin();
   };
 

app/components/Views/Onboarding/index.js

@@ -49,7 +49,6 @@ import { OnboardingSelectorIDs } from '../../../../e2e/selectors/Onboarding/Onbo
 import Routes from '../../../constants/navigation/Routes';
 import { selectAccounts } from '../../../selectors/accountTrackerController';
 import trackOnboarding from '../../../util/metrics/TrackOnboarding/trackOnboarding';
-import { trace, TraceName, TraceOperation } from '../../../util/trace';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -276,33 +275,24 @@ class Onboarding extends PureComponent {
   };
 
   onPressCreate = () => {
-    const action = () => {
-      trace(
-        {
-          name: TraceName.CreateNewWalletToChoosePassword,
-          op: TraceOperation.CreateNewWalletToChoosePassword,
-        },
-        () => {
-          const { metrics } = this.props;
-          if (metrics.isEnabled()) {
-            this.props.navigation.navigate('ChoosePassword', {
+    const action = async () => {
+      const { metrics } = this.props;
+      if (metrics.isEnabled()) {
+        this.props.navigation.navigate('ChoosePassword', {
+          [PREVIOUS_SCREEN]: ONBOARDING,
+        });
+        this.track(MetaMetricsEvents.WALLET_SETUP_STARTED);
+      } else {
+        this.props.navigation.navigate('OptinMetrics', {
+          onContinue: () => {
+            this.props.navigation.replace('ChoosePassword', {
               [PREVIOUS_SCREEN]: ONBOARDING,
             });
             this.track(MetaMetricsEvents.WALLET_SETUP_STARTED);
-          } else {
-            this.props.navigation.navigate('OptinMetrics', {
-              onContinue: () => {
-                this.props.navigation.replace('ChoosePassword', {
-                  [PREVIOUS_SCREEN]: ONBOARDING,
-                });
-                this.track(MetaMetricsEvents.WALLET_SETUP_STARTED);
-              },
-            });
-          }
-        },
-      );
+          },
+        });
+      }
     };
-
     this.handleExistingUser(action);
   };
 

app/components/Views/Wallet/index.tsx

@@ -96,7 +96,6 @@ import {
 } from '../../../selectors/notifications';
 import { ButtonVariants } from '../../../component-library/components/Buttons/Button';
 import { useListNotifications } from '../../../util/notifications/hooks/useNotifications';
-
 const createStyles = ({ colors, typography }: Theme) =>
   StyleSheet.create({
     base: {

app/selectors/nftController.ts

@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { Nft, NftState } from '@metamask/assets-controllers';
+import { NftState } from '@metamask/assets-controllers';
 import { RootState } from '../reducers';
 
 const selectNftControllerState = (state: RootState) =>
@@ -14,14 +14,3 @@ export const selectAllNfts = createSelector(
   selectNftControllerState,
   (nftControllerState: NftState) => nftControllerState.allNfts,
 );
-
-export const selectAllNftsFlat = createSelector(
-  selectAllNfts,
-  (nftsByChainByAccount) => {
-    const nftsByChainArray = Object.values(nftsByChainByAccount);
-    return nftsByChainArray.reduce((acc, nftsByChain) => {
-      const nftsArrays = Object.values(nftsByChain);
-      return acc.concat(...nftsArrays);
-    }, [] as Nft[]);
-  },
-);

app/selectors/tokensController.ts

@@ -34,23 +34,3 @@ export const selectDetectedTokens = createSelector(
   selectTokensControllerState,
   (tokensControllerState: TokensState) => tokensControllerState?.detectedTokens,
 );
-
-const selectAllTokens = createSelector(
-  selectTokensControllerState,
-  (tokensControllerState: TokensState) => tokensControllerState?.allTokens,
-);
-
-export const selectAllTokensFlat = createSelector(
-  selectAllTokens,
-  (tokensByAccountByChain) => {
-    if (Object.values(tokensByAccountByChain).length === 0) {
-      return [];
-    }
-    const tokensByAccountArray = Object.values(tokensByAccountByChain);
-
-    return tokensByAccountArray.reduce((acc, tokensByAccount) => {
-      const tokensArray = Object.values(tokensByAccount);
-      return acc.concat(...tokensArray);
-    }, [] as Token[]);
-  },
-);

app/store/index.ts

@@ -9,14 +9,10 @@ import { Authentication } from '../core';
 import LockManagerService from '../core/LockManagerService';
 import ReadOnlyNetworkStore from '../util/test/network-store';
 import { isE2E } from '../util/test/utils';
-import { trace, endTrace, TraceName, TraceOperation } from '../util/trace';
-import StorageWrapper from './storage-wrapper';
-
 import thunk from 'redux-thunk';
 
 import persistConfig from './persistConfig';
 import { AppStateEventProcessor } from '../core/AppStateEventListener';
-import { getTraceTags } from '../util/sentry/tags';
 
 // TODO: Improve type safety by using real Action types instead of `any`
 // TODO: Replace "any" with type
@@ -28,7 +24,7 @@ const pReducer = persistReducer<RootState, any>(persistConfig, rootReducer);
 // TODO: Replace "any" with type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, import/no-mutable-exports
 let store: Store<RootState, any>, persistor;
-const createStoreAndPersistor = async (appStartTime: number) => {
+const createStoreAndPersistor = async () => {
   // Obtain the initial state from ReadOnlyNetworkStore for E2E tests.
   const initialState = isE2E
     ? await ReadOnlyNetworkStore.getState()
@@ -50,24 +46,6 @@ const createStoreAndPersistor = async (appStartTime: number) => {
     middlewares.push(createReduxFlipperDebugger());
   }
 
-  const jsStartTime = performance.now();
-
-  trace({
-    name: TraceName.LoadScripts,
-    op: TraceOperation.LoadScripts,
-    startTime: appStartTime,
-  });
-
-  endTrace({
-    name: TraceName.LoadScripts,
-    timestamp: appStartTime + jsStartTime,
-  });
-
-  trace({
-    name: TraceName.CreateStore,
-    op: TraceOperation.CreateStore,
-  });
-
   store = configureStore({
     reducer: pReducer,
     middleware: middlewares,
@@ -76,19 +54,10 @@ const createStoreAndPersistor = async (appStartTime: number) => {
 
   sagaMiddleware.run(rootSaga);
 
-  endTrace({ name: TraceName.CreateStore });
-
-  trace({
-    name: TraceName.StorageRehydration,
-    op: TraceOperation.StorageRehydration,
-  });
-
   /**
    * Initialize services after persist is completed
    */
-  const onPersistComplete = async () => {
-    endTrace({ name: TraceName.StorageRehydration });
-
+  const onPersistComplete = () => {
     /**
      * EngineService.initalizeEngine(store) with SES/lockdown:
      * Requires ethjs nested patches (lib->src)
@@ -104,7 +73,6 @@ const createStoreAndPersistor = async (appStartTime: number) => {
      * - TypeError: undefined is not an object (evaluating 'TokenListController.tokenList')
      * - V8: SES_UNHANDLED_REJECTION
      */
-
     store.dispatch({
       type: 'TOGGLE_BASIC_FUNCTIONALITY',
       basicFunctionalityEnabled:
@@ -115,18 +83,7 @@ const createStoreAndPersistor = async (appStartTime: number) => {
       store.dispatch({
         type: 'FETCH_FEATURE_FLAGS',
       });
-
-    await trace(
-      {
-        name: TraceName.EngineInitialization,
-        op: TraceOperation.EngineInitialization,
-        tags: getTraceTags(store.getState?.()),
-      },
-      () => {
-        EngineService.initalizeEngine(store);
-      },
-    );
-
+    EngineService.initalizeEngine(store);
     Authentication.init(store);
     AppStateEventProcessor.init(store);
     LockManagerService.init(store);
@@ -136,16 +93,7 @@ const createStoreAndPersistor = async (appStartTime: number) => {
 };
 
 (async () => {
-  const appStartTime = await StorageWrapper.getItem('appStartTime');
-
-  await trace(
-    {
-      name: TraceName.UIStartup,
-      op: TraceOperation.UIStartup,
-      startTime: appStartTime,
-    },
-    async () => await createStoreAndPersistor(appStartTime),
-  );
+  await createStoreAndPersistor();
 })();
 
 export { store, persistor };