MetaMask
diff --git a/‎app/scripts/controller-init/multichain/multichain-account-service-init.test.ts‎
Lines changed: 1 addition & 0 deletions b/‎app/scripts/controller-init/multichain/multichain-account-service-init.test.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/scripts/controller-init/multichain/multichain-account-service-init.ts‎
Lines changed: 5 additions & 0 deletions b/‎app/scripts/controller-init/multichain/multichain-account-service-init.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎app/scripts/metamask-controller.js‎
Lines changed: 60 additions & 30 deletions b/‎app/scripts/metamask-controller.js‎
Lines changed: 60 additions & 30 deletions
@@ -84,6 +84,7 @@ describe('MultichainAccountServiceInit', () => {
       messenger: requestMock.controllerMessenger,
       providers: expect.any(Array),
       providerConfigs: expect.any(Object),
+      config: expect.any(Object),
     });
   });
 });
@@ -23,6 +23,7 @@ import {
 ///: BEGIN:ONLY_INCLUDE_IF(bitcoin)
 import { isMultichainFeatureEnabled } from '../../../../shared/lib/multichain-feature-flags';
 ///: END:ONLY_INCLUDE_IF
+import { trace } from '../../../../shared/lib/trace';
 
 /**
  * Initialize the multichain account service.
@@ -80,6 +81,10 @@ export const MultichainAccountServiceInit: ControllerInitFunction<
     providerConfigs: {
       [SOL_ACCOUNT_PROVIDER_NAME]: snapAccountProviderConfig,
     },
+    config: {
+      // @ts-expect-error Controller uses string for names rather than enum
+      trace,
+    },
   });
 
   const preferencesState = initMessenger.call('PreferencesController:getState');
 
@@ -4527,6 +4527,10 @@ export default class MetamaskController extends EventEmitter {
    * @returns {Promise<Record<string, number>>} Discovered account counts by chain.
    */
   async discoverAndCreateAccounts(id) {
+    trace({
+      name: TraceName.DiscoverAccounts,
+      op: TraceOperation.AccountDiscover,
+    });
     try {
       // If no keyring id is provided, we assume one keyring was added to the vault
       const keyringIdToDiscover =
@@ -4556,6 +4560,10 @@ export default class MetamaskController extends EventEmitter {
         Solana: 0,
         Tron: 0,
       };
+    } finally {
+      endTrace({
+        name: TraceName.DiscoverAccounts,
+      });
     }
   }
 
@@ -4949,6 +4957,10 @@ export default class MetamaskController extends EventEmitter {
    * For the context, we do not need to import the Solana account if the onboarding flow has not completed yet during the social login import flow.
    */
   async _addAccountsWithBalance(keyringId, shouldImportSolanaAccount = true) {
+    trace({
+      name: TraceName.DiscoverAccounts,
+      op: TraceOperation.AccountDiscover,
+    });
     try {
       // Scan accounts until we find an empty one
       const chainId = this.#getGlobalChainId();
@@ -4970,41 +4982,54 @@ export default class MetamaskController extends EventEmitter {
         );
       let address = accounts[accounts.length - 1];
 
-      for (let count = accounts.length; ; count++) {
-        const balance = await this.getBalance(address, this.provider);
-
-        if (balance === '0x0') {
-          // This account has no balance, so check for tokens
-          await this.tokenDetectionController.detectTokens({
-            chainIds: [chainId],
-            selectedAddress: address,
-          });
+      trace({
+        name: TraceName.EvmDiscoverAccounts,
+        op: TraceOperation.AccountDiscover,
+      });
+      try {
+        for (let count = accounts.length; ; count++) {
+          const balance = await this.getBalance(address, this.provider);
+
+          if (balance === '0x0') {
+            // This account has no balance, so check for tokens
+            await this.tokenDetectionController.detectTokens({
+              chainIds: [chainId],
+              selectedAddress: address,
+            });
 
-          const tokens =
-            this.tokensController.state.allTokens?.[chainId]?.[address];
-          const detectedTokens =
-            this.tokensController.state.allDetectedTokens?.[chainId]?.[address];
+            const tokens =
+              this.tokensController.state.allTokens?.[chainId]?.[address];
+            const detectedTokens =
+              this.tokensController.state.allDetectedTokens?.[chainId]?.[
+                address
+              ];
 
-          if (
-            (tokens?.length ?? 0) === 0 &&
-            (detectedTokens?.length ?? 0) === 0
-          ) {
-            // This account has no balance or tokens
-            if (count !== 1) {
-              await this.removeAccount(address);
+            if (
+              (tokens?.length ?? 0) === 0 &&
+              (detectedTokens?.length ?? 0) === 0
+            ) {
+              // This account has no balance or tokens
+              if (count !== 1) {
+                await this.removeAccount(address);
+              }
+              break;
             }
-            break;
           }
-        }
 
-        // This account has assets, so check the next one
-        address = await this.keyringController.withKeyring(
-          keyringSelector,
-          async ({ keyring }) => {
-            const [newAddress] = await keyring.addAccounts(1);
-            return newAddress;
-          },
-        );
+          // This account has assets, so check the next one
+          address = await this.keyringController.withKeyring(
+            keyringSelector,
+            async ({ keyring }) => {
+              const [newAddress] = await keyring.addAccounts(1);
+              return newAddress;
+            },
+          );
+        }
+      } finally {
+        endTrace({
+          name: TraceName.EvmDiscoverAccounts,
+          op: TraceOperation.AccountDiscover,
+        });
       }
 
       const discoveredAccounts = {
@@ -5081,6 +5106,11 @@ export default class MetamaskController extends EventEmitter {
         Solana: 0,
         Tron: 0,
       };
+    } finally {
+      endTrace({
+        name: TraceName.DiscoverAccounts,
+        op: TraceOperation.AccountDiscover,
+      });
     }
   }