@metamask-previews/assets-controller 11.2.1-preview-3d3ef9d3a → 11.2.1-preview-e0f702919

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Nest AssetsController Sentry spans (`AssetsDataSourceTiming`, `AssetsDataSourceError`, `AssetsControllerFirstInitFetch`, pipeline summaries) as subspans under parent `AssetsFullFetch` / `AssetsUpdatePipeline` / `AssetsBackgroundFetch` traces, and emit a single `AggregatedBalanceSelector` span for `calculateBalanceForAllWallets` instead of one root span per account group, to avoid Sentry rate limits ([#9672](https://github.com/MetaMask/core/pull/9672))
+  - Pipeline traces (`AssetsFullFetch`, `AssetsUpdatePipeline`, per-source timings, etc.) run on cold start only (first `#start` fetch per unlock session); later fetches/updates skip Sentry wrapping. Subscription errors and the one-shot state-size trace remain enabled.
+
 ## [11.2.1]
 
 ### Fixed

package/dist/AssetsController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_onUnapprovedTransactionAdded, _AssetsController_onTransactionConfirmed, _AssetsController_onAccountActivityBalanceUpdated, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_runAccountTreeRefresh, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_fetchMissingPricesWithoutCache, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_getAssetFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleNetworkAdded, _AssetsController_refreshActiveChainsOnNetworkSwitch, _AssetsController_getSelectedEvmChainIdFromNetworkState, _AssetsController_handleNetworkDidChange, _AssetsController_refreshAssetsAfterNetworkChange, _AssetsController_refreshAssetsAfterNetworkAdded;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_withTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_onUnapprovedTransactionAdded, _AssetsController_onTransactionConfirmed, _AssetsController_onAccountActivityBalanceUpdated, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_runAccountTreeRefresh, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_fetchMissingPricesWithoutCache, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_getAssetFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleNetworkAdded, _AssetsController_refreshActiveChainsOnNetworkSwitch, _AssetsController_getSelectedEvmChainIdFromNetworkState, _AssetsController_handleNetworkDidChange, _AssetsController_refreshAssetsAfterNetworkChange, _AssetsController_refreshAssetsAfterNetworkAdded;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -72,6 +72,7 @@ const DEFAULT_POLLING_INTERVAL_MS = 30000;
 // ============================================================================
 const TRACE_FIRST_INIT_FETCH = 'AssetsControllerFirstInitFetch';
 const TRACE_FULL_FETCH = 'AssetsFullFetch';
+const TRACE_BACKGROUND_FETCH = 'AssetsBackgroundFetch';
 const TRACE_DATA_SOURCE_TIMING = 'AssetsDataSourceTiming';
 const TRACE_DATA_SOURCE_ERROR = 'AssetsDataSourceError';
 const TRACE_UPDATE_PIPELINE = 'AssetsUpdatePipeline';
@@ -455,94 +456,111 @@ class AssetsController extends base_controller_1.BaseController {
             customAssets.push(...accountCustomAssets);
         }
         if (options?.forceUpdate) {
-            const startTime = performance.now();
-            const request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
-                assetTypes,
-                dataTypes,
-                customAssets: customAssets.length > 0 ? customAssets : undefined,
-                forceUpdate: true,
-                assetsForPriceUpdate: options?.assetsForPriceUpdate,
-            });
-            // Fast pipeline: accountsApi + stakedBalance → detection → token + price.
-            // Snap and RPC are excluded here due to their latency (snap triggers account
-            // creation, RPC is slow on many chains). Results are committed to state
-            // immediately so the UI can display balances without waiting for them.
-            //
-            // Fast/slow pipelines use merge so partial API snapshots cannot wipe
-            // tokens missing from the response (e.g. USDC when only native balance
-            // is returned). Balances present in the response are still refreshed.
-            const fastSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                ? [
-                    (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)([
-                        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
-                        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
-                    ]),
-                    // Graduation must run BEFORE the RPC fallback so it only sees
-                    // AccountsApi/Websocket balances. RPC intentionally carries
-                    // custom assets and must never trigger graduation.
-                    __classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                    (0, ParallelMiddleware_js_1.createParallelMiddleware)([
-                        __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                    ]),
-                ]
-                : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
-            const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, fastSources, request);
-            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
-                ...response,
-                updateMode: 'merge',
-                replaceCoveredChainBalances: true,
-            });
-            // Background pipeline: snap and RPC run in parallel after the fast path
-            // commits to state. Their balances are merged together before detection.
-            // Token + price enrichment matches the pre-split behavior: only when basic
-            // functionality is on (RPC-only mode must not call token/price APIs).
-            const slowPipelineChainIds = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, response);
-            if (slowPipelineChainIds.length > 0) {
-                const slowSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                    ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
-                    : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
-                const slowRequest = { ...request, chainIds: slowPipelineChainIds };
-                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-                    (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)(slowSources),
-                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                    ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                        ? [
-                            (0, ParallelMiddleware_js_1.createParallelMiddleware)([
-                                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                            ]),
-                        ]
-                        : []),
-                ], slowRequest)
-                    .then(({ response: slowResponse }) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...slowResponse, updateMode: 'merge' }))
-                    .catch((error) => log('Background pipeline failed', { error }));
-            }
-            const durationMs = performance.now() - startTime;
-            // Emit trace for every full fetch (Assets Health dashboard)
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_FULL_FETCH, {
-                duration_ms: durationMs,
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_withTrace).call(this, TRACE_FULL_FETCH, {
                 chain_count: chainIds.length,
                 account_count: accounts.length,
                 basic_functionality: __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this),
-                asset_count: response.assetsBalance
-                    ? Object.values(response.assetsBalance).reduce((sum, acct) => sum + Object.keys(acct).length, 0)
-                    : 0,
-                price_count: response.assetsPrice
-                    ? Object.keys(response.assetsPrice).length
-                    : 0,
-                ...durationByDataSource,
-            });
-            if (!__classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")) {
-                __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
-                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_FIRST_INIT_FETCH, {
+            }, async (parentContext) => {
+                const startTime = performance.now();
+                const request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
+                    assetTypes,
+                    dataTypes,
+                    customAssets: customAssets.length > 0 ? customAssets : undefined,
+                    forceUpdate: true,
+                    assetsForPriceUpdate: options?.assetsForPriceUpdate,
+                });
+                // Fast pipeline: accountsApi + stakedBalance → detection → token + price.
+                // Snap and RPC are excluded here due to their latency (snap triggers account
+                // creation, RPC is slow on many chains). Results are committed to state
+                // immediately so the UI can display balances without waiting for them.
+                //
+                // Fast/slow pipelines use merge so partial API snapshots cannot wipe
+                // tokens missing from the response (e.g. USDC when only native balance
+                // is returned). Balances present in the response are still refreshed.
+                const fastSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                    ? [
+                        (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)([
+                            __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                            __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                        ]),
+                        // Graduation must run BEFORE the RPC fallback so it only sees
+                        // AccountsApi/Websocket balances. RPC intentionally carries
+                        // custom assets and must never trigger graduation.
+                        __classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                        (0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                            __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                            __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                        ]),
+                    ]
+                    : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
+                const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, fastSources, request, {}, parentContext);
+                await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                    ...response,
+                    updateMode: 'merge',
+                    replaceCoveredChainBalances: true,
+                });
+                // Background pipeline: snap and RPC run in parallel after the fast path
+                // commits to state. Their balances are merged together before detection.
+                // Token + price enrichment matches the pre-split behavior: only when basic
+                // functionality is on (RPC-only mode must not call token/price APIs).
+                // Own parent span so timings nest instead of becoming extra root traces
+                // after the fast-path parent has ended.
+                const slowPipelineChainIds = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, response);
+                if (slowPipelineChainIds.length > 0) {
+                    const slowSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                        ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
+                        : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
+                    const slowRequest = { ...request, chainIds: slowPipelineChainIds };
+                    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_withTrace).call(this, TRACE_BACKGROUND_FETCH, {
+                        chain_count: slowPipelineChainIds.length,
+                        account_count: accounts.length,
+                    }, async (slowParentContext) => {
+                        const { response: slowResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+                            (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)(slowSources),
+                            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                            ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                                ? [
+                                    (0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                                        __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                                        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                                    ]),
+                                ]
+                                : []),
+                        ], slowRequest, {}, slowParentContext);
+                        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                            ...slowResponse,
+                            updateMode: 'merge',
+                        });
+                    }).catch((error) => log('Background pipeline failed', { error }));
+                }
+                const durationMs = performance.now() - startTime;
+                // Summary fields for Assets Health (nested under the parent span so
+                // they do not create additional root transactions).
+                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_FULL_FETCH, {
                     duration_ms: durationMs,
-                    chain_ids: JSON.stringify(chainIds),
+                    chain_count: chainIds.length,
+                    account_count: accounts.length,
+                    basic_functionality: __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this),
+                    asset_count: response.assetsBalance
+                        ? Object.values(response.assetsBalance).reduce((sum, acct) => sum + Object.keys(acct).length, 0)
+                        : 0,
+                    price_count: response.assetsPrice
+                        ? Object.keys(response.assetsPrice).length
+                        : 0,
                     ...durationByDataSource,
-                });
-            }
+                }, { controller: 'AssetsController' }, parentContext);
+                if (!__classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")) {
+                    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_FIRST_INIT_FETCH, {
+                        duration_ms: durationMs,
+                        chain_ids: JSON.stringify(chainIds),
+                        ...durationByDataSource,
+                    }, { controller: 'AssetsController' }, parentContext);
+                    // Mark after emitting so the first-init span itself is not gated.
+                    __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
+                }
+            });
         }
         const result = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
         return result;
@@ -921,57 +939,67 @@ class AssetsController extends base_controller_1.BaseController {
      * @param request - Optional original request for context when enriching
      */
     async handleAssetsUpdate(response, sourceId, request) {
-        const updateStart = performance.now();
         log('Assets updated from data source', {
             sourceId,
             hasBalance: Boolean(response.assetsBalance),
             hasPrice: Boolean(response.assetsPrice),
         });
-        const resolvedRequest = request ?? {
-            accountsWithSupportedChains: [],
-            chainIds: [],
-            dataTypes: ['balance', 'metadata', 'price'],
-        };
-        // RPC-only mode (basic functionality off): never run token/price APIs. Strip
-        // those data types so downstream middleware cannot treat them as requested.
-        const pipelineRequest = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-            ? resolvedRequest
-            : {
-                ...resolvedRequest,
-                dataTypes: resolvedRequest.dataTypes.filter((dt) => dt !== 'metadata' && dt !== 'price'),
-            };
-        // Graduate custom assets only when AccountsAPI / Websocket reports them.
-        // RPC already fetches custom assets on purpose, and Snap handles non-EVM
-        // chains the rule does not apply to, so skip the middleware for those.
-        const shouldGraduateCustomAssets = sourceId === 'AccountsApiDataSource' ||
-            sourceId === 'BackendWebsocketDataSource' ||
-            sourceId === 'AccountActivityService';
-        const enrichmentSources = [
-            ...(shouldGraduateCustomAssets
-                ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
-                : []),
-            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-        ];
-        if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
-            enrichmentSources.push((0, ParallelMiddleware_js_1.createParallelMiddleware)([
-                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-            ]));
-        }
-        const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, enrichmentSources, pipelineRequest, response);
-        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
-            ...enrichedResponse,
-            replaceCoveredChainBalances: response.replaceCoveredChainBalances,
-        });
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_UPDATE_PIPELINE, {
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_withTrace).call(this, TRACE_UPDATE_PIPELINE, {
             source: sourceId,
-            duration_ms: performance.now() - updateStart,
             has_balance: Boolean(response.assetsBalance),
             has_price: Boolean(response.assetsPrice),
-            has_metadata: Boolean(enrichedResponse.assetsInfo),
             balance_account_count: response.assetsBalance
                 ? Object.keys(response.assetsBalance).length
                 : 0,
+        }, async (parentContext) => {
+            const updateStart = performance.now();
+            const resolvedRequest = request ?? {
+                accountsWithSupportedChains: [],
+                chainIds: [],
+                dataTypes: ['balance', 'metadata', 'price'],
+            };
+            // RPC-only mode (basic functionality off): never run token/price APIs. Strip
+            // those data types so downstream middleware cannot treat them as requested.
+            const pipelineRequest = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                ? resolvedRequest
+                : {
+                    ...resolvedRequest,
+                    dataTypes: resolvedRequest.dataTypes.filter((dt) => dt !== 'metadata' && dt !== 'price'),
+                };
+            // Graduate custom assets only when AccountsAPI / Websocket reports them.
+            // RPC already fetches custom assets on purpose, and Snap handles non-EVM
+            // chains the rule does not apply to, so skip the middleware for those.
+            const shouldGraduateCustomAssets = sourceId === 'AccountsApiDataSource' ||
+                sourceId === 'BackendWebsocketDataSource' ||
+                sourceId === 'AccountActivityService';
+            const enrichmentSources = [
+                ...(shouldGraduateCustomAssets
+                    ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
+                    : []),
+                __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+            ];
+            if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+                enrichmentSources.push((0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                    __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                ]));
+            }
+            const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, enrichmentSources, pipelineRequest, response, parentContext);
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                ...enrichedResponse,
+                replaceCoveredChainBalances: response.replaceCoveredChainBalances,
+            });
+            // Summary fields for Assets Health (nested under the parent span).
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_UPDATE_PIPELINE, {
+                source: sourceId,
+                duration_ms: performance.now() - updateStart,
+                has_balance: Boolean(response.assetsBalance),
+                has_price: Boolean(response.assetsPrice),
+                has_metadata: Boolean(enrichedResponse.assetsInfo),
+                balance_account_count: response.assetsBalance
+                    ? Object.keys(response.assetsBalance).length
+                    : 0,
+            }, { controller: 'AssetsController' }, parentContext);
         });
     }
     // ============================================================================
@@ -1013,13 +1041,42 @@ class AssetsController extends base_controller_1.BaseController {
 exports.AssetsController = AssetsController;
 _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_captureException = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_accountRefreshMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_customAssetGraduationMiddleware = new WeakMap(), _AssetsController_rpcFallbackMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
     controller: 'AssetsController',
-}) {
+}, parentContext) {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f")) {
         return;
     }
-    __classPrivateFieldGet(this, _AssetsController_trace, "f").call(this, { name, data, tags }, () => undefined)?.catch(() => {
+    // Cold-start only: skip root spans after the first init fetch. Nested
+    // subspans (parentContext set) and error/state-size traces still allowed.
+    if (__classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f") &&
+        parentContext === undefined &&
+        name !== TRACE_SUBSCRIPTION_ERROR &&
+        name !== TRACE_STATE_SIZE) {
+        return;
+    }
+    __classPrivateFieldGet(this, _AssetsController_trace, "f").call(this, { name, data, tags, parentContext }, () => undefined)?.catch(() => {
         // Telemetry failure must not break.
     });
+}, _AssetsController_withTrace = 
+/**
+ * Run work inside a parent Sentry span and pass its context so callers can
+ * emit nested subspans via {@link #emitTrace}.
+ *
+ * Only wraps work on cold start (before the first init fetch is reported).
+ * Later calls still run `fn`, but without creating a Sentry parent span.
+ *
+ * @param name - Parent span name.
+ * @param data - Key-value pairs attached as span data.
+ * @param fn - Work to run; receives the parent span context.
+ * @param tags - Key-value pairs used for Sentry filtering.
+ * @returns The result of `fn`.
+ */
+async function _AssetsController_withTrace(name, data, fn, tags = {
+    controller: 'AssetsController',
+}) {
+    if (!__classPrivateFieldGet(this, _AssetsController_trace, "f") || __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")) {
+        return fn(undefined);
+    }
+    return await __classPrivateFieldGet(this, _AssetsController_trace, "f").call(this, { name, data, tags }, (parentContext) => fn(parentContext));
 }, _AssetsController_emitStateSizeTrace = function _AssetsController_emitStateSizeTrace() {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f") || __classPrivateFieldGet(this, _AssetsController_stateSizeReported, "f")) {
         return;
@@ -1383,9 +1440,10 @@ async function _AssetsController_runStartupRefresh(accounts) {
  * @param sources - Data sources or middlewares with getName() and assetsMiddleware (executed in order).
  * @param request - The data request.
  * @param initialResponse - Optional initial response (for enriching existing data).
+ * @param parentContext - Optional parent Sentry span; per-source timings nest under it.
  * @returns Response and durationByDataSource (exclusive ms per source name).
  */
-async function _AssetsController_executeMiddlewares(sources, request, initialResponse = {}) {
+async function _AssetsController_executeMiddlewares(sources, request, initialResponse = {}, parentContext) {
     const names = sources.map((source) => source.getName());
     const middlewares = sources.map((source) => source.assetsMiddleware);
     const inclusive = [];
@@ -1429,14 +1487,14 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             durationByDataSource[key] = ms;
         }
     }
-    // Emit per-source timing traces for the Assets Health dashboard
+    // Emit per-source timing as subspans under the parent fetch/update span
     for (const [sourceName, durationMs] of Object.entries(durationByDataSource)) {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_DATA_SOURCE_TIMING, {
             source: sourceName,
             duration_ms: durationMs,
             chain_count: request.chainIds.length,
             account_count: request.accountsWithSupportedChains.length,
-        });
+        }, { controller: 'AssetsController' }, parentContext);
     }
     // Failed middlewares: Issues (optional) + perf/Dashboard spans
     if (middlewareErrors.length > 0) {
@@ -1460,7 +1518,7 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             controller: 'AssetsController',
             severity: 'error',
             error_type: assetsError.name,
-        });
+        }, parentContext);
     }
     return { response: result.response, durationByDataSource };
 }, _AssetsController_fetchMissingPricesWithoutCache = function _AssetsController_fetchMissingPricesWithoutCache(accounts, chainIds) {