@metamask-previews/assets-controller 11.2.1-preview-6cd1bb2f5 → 11.3.0-preview-2296abeaf

package/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.3.0]
+
+### Added
+
+- `SnapDataSource` now preserves optional balance `metadata` from snap keyrings into `assetsBalance` when handling `AccountsController:accountBalancesUpdated` and `getAccountBalances` results ([#9564](https://github.com/MetaMask/core/pull/9564))
+
+### Changed
+
+- Bump `@metamask/assets-controllers` from `^110.0.0` to `^110.0.1` ([#9693](https://github.com/MetaMask/core/pull/9693))
+- Bump `@metamask/core-backend` from `^7.0.0` to `^8.0.0` ([#9693](https://github.com/MetaMask/core/pull/9693))
+- Bump `@metamask/transaction-controller` from `^69.2.1` to `^69.3.0` ([#9693](https://github.com/MetaMask/core/pull/9693))
+- 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 / data-source / update enrichment spans emit only on the unlock (first-init) fetch per session; later polls, force updates, and subscription enrichment skip tracing.
+  - Tracing helpers live in `utils/trace.ts` (`emitTrace` / `withTrace`); omit `trace` to no-op so call sites stay free of gating `if`s. Fast and background fetch lanes are sibling `withTrace` calls (not nested).
+  - Dashboard-facing spans (`AssetsFullFetch`, `AssetsUpdatePipeline`, `AggregatedBalanceSelector`, etc.) record `duration_ms` as a Sentry measurement (and backdate `startTime`) so Spans widgets charting `p95(duration_ms)` receive data. Nesting parents use `AssetsFetchPipeline` / `AssetsUpdateEnrichment` / `AssetsBackgroundFetch` / `AggregatedBalance`.
+  - `AggregatedBalanceSelector` is nested under an `AggregatedBalance` parent span via `parentContext`.
+- Bump `@metamask/keyring-api` from `^23.5.0` to `^23.7.0` ([#9676](https://github.com/MetaMask/core/pull/9676))
+- Bump `@metamask/keyring-internal-api` from `^11.0.1` to `^11.0.2` ([#9676](https://github.com/MetaMask/core/pull/9676))
+- Bump `@metamask/keyring-snap-client` from `^9.2.0` to `^9.2.1` ([#9676](https://github.com/MetaMask/core/pull/9676))
+
+### Fixed
+
+- `withTrace` treats a rejected parent `trace` promise as best-effort (like `emitTrace`), so Sentry/adapter failures cannot fail full fetches or `handleAssetsUpdate` enrichment ([#9672](https://github.com/MetaMask/core/pull/9672))
+- `SnapDataSource` now delivers snap-sourced balance updates directly to `AssetsController` via a constructor-supplied `onAssetsUpdate` callback instead of fanning out to `activeSubscriptions`, so updates (e.g. Tron energy/bandwidth) are no longer dropped when no active subscription is tracked for the chain in the SnapDataSource ([#9656](https://github.com/MetaMask/core/pull/9656))
+- Balance aggregation selectors (`getAggregatedBalanceForAccount`, `getAggregatedBalanceForAccountIds`, `calculateBalanceForAllWallets`, `calculateBalanceChangeForAccountGroup`) no longer rescale balances whose amount is greater than or equal to `10^decimals`. Amounts in `assetsBalance` state are always human-readable, so the removed raw-vs-human magnitude heuristic corrupted legitimately large balances (e.g. 54.06B tokens with 9 decimals were divided by `10^9`), excluding them from aggregated fiat totals ([#9653](https://github.com/MetaMask/core/pull/9653))
+
 ## [11.2.1]
 
 ### Fixed
@@ -783,7 +809,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor `RpcDataSource` to delegate polling to `BalanceFetcher` and `TokenDetector` services ([#7709](https://github.com/MetaMask/core/pull/7709))
 - Refactor `BalanceFetcher` and `TokenDetector` to extend `StaticIntervalPollingControllerOnly` for independent polling management ([#7709](https://github.com/MetaMask/core/pull/7709))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@11.2.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@11.3.0...HEAD
+[11.3.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@11.2.1...@metamask/assets-controller@11.3.0
 [11.2.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@11.2.0...@metamask/assets-controller@11.2.1
 [11.2.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@11.1.1...@metamask/assets-controller@11.2.0
 [11.1.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@11.1.0...@metamask/assets-controller@11.1.1

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_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");
@@ -42,6 +42,7 @@ const constants_js_1 = require("./utils/constants.cjs");
 const customAssetsRpcSupplement_js_1 = require("./utils/customAssetsRpcSupplement.cjs");
 const index_js_1 = require("./utils/index.cjs");
 const processAccountActivityBalanceUpdates_js_1 = require("./utils/processAccountActivityBalanceUpdates.cjs");
+const trace_js_1 = require("./utils/trace.cjs");
 const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
 /** Stable empty map so memoized formatters are not busted by `?? {}` identity churn. */
 const EMPTY_NATIVE_ASSET_MAP = {};
@@ -72,9 +73,14 @@ const DEFAULT_POLLING_INTERVAL_MS = 30000;
 // ============================================================================
 const TRACE_FIRST_INIT_FETCH = 'AssetsControllerFirstInitFetch';
 const TRACE_FULL_FETCH = 'AssetsFullFetch';
+/** Parent span that nests per-source timings; dashboard charts {@link TRACE_FULL_FETCH}. */
+const TRACE_FETCH_PIPELINE = 'AssetsFetchPipeline';
+const TRACE_BACKGROUND_FETCH = 'AssetsBackgroundFetch';
 const TRACE_DATA_SOURCE_TIMING = 'AssetsDataSourceTiming';
 const TRACE_DATA_SOURCE_ERROR = 'AssetsDataSourceError';
 const TRACE_UPDATE_PIPELINE = 'AssetsUpdatePipeline';
+/** Parent span that nests update enrichment; dashboard charts {@link TRACE_UPDATE_PIPELINE}. */
+const TRACE_UPDATE_PARENT = 'AssetsUpdateEnrichment';
 const TRACE_SUBSCRIPTION_ERROR = 'AssetsSubscriptionError';
 const TRACE_STATE_SIZE = 'AssetsStateSize';
 const log = (0, logger_js_1.createModuleLogger)(logger_js_1.projectLogger, CONTROLLER_NAME);
@@ -366,6 +372,7 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource_js_1.SnapDataSource({
             messenger: this.messenger,
             onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
+            onAssetsUpdate: (response) => this.handleAssetsUpdate(response, 'SnapDataSource'),
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_rpcDataSource, new RpcDataSource_js_1.RpcDataSource({
             messenger: this.messenger,
@@ -455,7 +462,11 @@ class AssetsController extends base_controller_1.BaseController {
             customAssets.push(...accountCustomAssets);
         }
         if (options?.forceUpdate) {
-            const startTime = performance.now();
+            // Pipeline spans only on unlock/first-init fetch; later forceUpdates pass
+            // `undefined` so `emitTrace` / `withTrace` no-op without call-site if/else.
+            const pipelineTrace = __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")
+                ? undefined
+                : __classPrivateFieldGet(this, _AssetsController_trace, "f");
             const request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
                 assetTypes,
                 dataTypes,
@@ -489,59 +500,101 @@ class AssetsController extends base_controller_1.BaseController {
                     ]),
                 ]
                 : [__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,
+            const { response } = await (0, trace_js_1.withTrace)({
+                name: TRACE_FETCH_PIPELINE,
+                trace: pipelineTrace,
+                data: {
+                    chain_count: chainIds.length,
+                    account_count: accounts.length,
+                    basic_functionality: __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this),
+                },
+                fn: async (parentContext) => {
+                    const startTime = performance.now();
+                    const result = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                        sources: fastSources,
+                        request,
+                        parentContext,
+                        trace: pipelineTrace,
+                    });
+                    await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                        ...result.response,
+                        updateMode: 'merge',
+                        replaceCoveredChainBalances: true,
+                    });
+                    const durationMs = performance.now() - startTime;
+                    // Summary fields for Assets Health (nested under the parent span).
+                    (0, trace_js_1.emitTrace)({
+                        name: TRACE_FULL_FETCH,
+                        trace: pipelineTrace,
+                        data: {
+                            duration_ms: durationMs,
+                            chain_count: chainIds.length,
+                            account_count: accounts.length,
+                            basic_functionality: __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this),
+                            asset_count: result.response.assetsBalance
+                                ? Object.values(result.response.assetsBalance).reduce((sum, acct) => sum + Object.keys(acct).length, 0)
+                                : 0,
+                            price_count: result.response.assetsPrice
+                                ? Object.keys(result.response.assetsPrice).length
+                                : 0,
+                            ...result.durationByDataSource,
+                        },
+                        parentContext,
+                    });
+                    (0, trace_js_1.emitTrace)({
+                        name: TRACE_FIRST_INIT_FETCH,
+                        trace: pipelineTrace,
+                        data: {
+                            duration_ms: durationMs,
+                            chain_ids: JSON.stringify(chainIds),
+                            ...result.durationByDataSource,
+                        },
+                        parentContext,
+                    });
+                    return result;
+                },
             });
-            // 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).
+            // Mark after the unlock/first forceUpdate so later polls skip pipeline spans.
+            __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
+            // Background (slow) lane — flattened sibling of the fast lane (not nested
+            // inside its withTrace callback). Still fire-and-forget so UI is not blocked.
             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,
-                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, {
-                    duration_ms: durationMs,
-                    chain_ids: JSON.stringify(chainIds),
-                    ...durationByDataSource,
-                });
+                (0, trace_js_1.withTrace)({
+                    name: TRACE_BACKGROUND_FETCH,
+                    trace: pipelineTrace,
+                    data: {
+                        chain_count: slowPipelineChainIds.length,
+                        account_count: accounts.length,
+                    },
+                    fn: async (slowParentContext) => {
+                        const { response: slowResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                            sources: [
+                                (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"),
+                                        ]),
+                                    ]
+                                    : []),
+                            ],
+                            request: slowRequest,
+                            parentContext: slowParentContext,
+                            trace: pipelineTrace,
+                        });
+                        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                            ...slowResponse,
+                            updateMode: 'merge',
+                        });
+                    },
+                }).catch((error) => log('Background pipeline failed', { error }));
             }
         }
         const result = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
@@ -921,57 +974,87 @@ 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, {
-            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,
+        // Enrichment spans only before unlock/first-init fetch completes.
+        const pipelineTrace = __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")
+            ? undefined
+            : __classPrivateFieldGet(this, _AssetsController_trace, "f");
+        await (0, trace_js_1.withTrace)({
+            name: TRACE_UPDATE_PARENT,
+            trace: pipelineTrace,
+            data: {
+                source: sourceId,
+                has_balance: Boolean(response.assetsBalance),
+                has_price: Boolean(response.assetsPrice),
+                balance_account_count: response.assetsBalance
+                    ? Object.keys(response.assetsBalance).length
+                    : 0,
+            },
+            fn: 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, {
+                    sources: enrichmentSources,
+                    request: pipelineRequest,
+                    initialResponse: response,
+                    parentContext,
+                    trace: pipelineTrace,
+                });
+                await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                    ...enrichedResponse,
+                    replaceCoveredChainBalances: response.replaceCoveredChainBalances,
+                });
+                // Summary fields for Assets Health (nested under the parent span).
+                (0, trace_js_1.emitTrace)({
+                    name: TRACE_UPDATE_PIPELINE,
+                    trace: pipelineTrace,
+                    data: {
+                        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,
+                    },
+                    parentContext,
+                });
+            },
         });
     }
     // ============================================================================
@@ -1011,16 +1094,7 @@ 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',
-}) {
-    if (!__classPrivateFieldGet(this, _AssetsController_trace, "f")) {
-        return;
-    }
-    __classPrivateFieldGet(this, _AssetsController_trace, "f").call(this, { name, data, tags }, () => undefined)?.catch(() => {
-        // Telemetry failure must not break.
-    });
-}, _AssetsController_emitStateSizeTrace = function _AssetsController_emitStateSizeTrace() {
+_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_emitStateSizeTrace = function _AssetsController_emitStateSizeTrace() {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f") || __classPrivateFieldGet(this, _AssetsController_stateSizeReported, "f")) {
         return;
     }
@@ -1048,14 +1122,20 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
             customAssetEntries += ids.length;
         }
     }
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_STATE_SIZE, {
-        balance_entries: balanceEntries,
-        balance_accounts: Object.keys(balances).length,
-        unique_asset_count: uniqueAssets.size,
-        network_count: uniqueNetworks.size,
-        metadata_entries: Object.keys(assetsInfo).length,
-        price_entries: Object.keys(assetsPrice).length,
-        custom_asset_entries: customAssetEntries,
+    (0, trace_js_1.emitTrace)({
+        name: TRACE_STATE_SIZE,
+        trace: __classPrivateFieldGet(this, _AssetsController_trace, "f"),
+        data: {
+            balance_entries: balanceEntries,
+            balance_accounts: Object.keys(balances).length,
+            // `asset_count` matches the Assets Health dashboard widget field name.
+            asset_count: uniqueAssets.size,
+            unique_asset_count: uniqueAssets.size,
+            network_count: uniqueNetworks.size,
+            metadata_entries: Object.keys(assetsInfo).length,
+            price_entries: Object.keys(assetsPrice).length,
+            custom_asset_entries: customAssetEntries,
+        },
     });
 }, _AssetsController_getSelectedAccounts = function _AssetsController_getSelectedAccounts() {
     const accounts = this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
@@ -1380,12 +1460,16 @@ async function _AssetsController_runStartupRefresh(accounts) {
  * Execute middlewares with request/response context.
  * Returns response and exclusive duration per source (sum ≈ wall time).
  *
- * @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 params - Middleware execution options.
+ * @param params.sources - Data sources or middlewares with getName() and assetsMiddleware.
+ * @param params.request - The data request.
+ * @param params.initialResponse - Optional initial response (for enriching existing data).
+ * @param params.parentContext - Optional parent Sentry span; per-source timings nest under it.
+ * @param params.trace - Optional trace callback; omit after unlock/first-init to skip spans.
  * @returns Response and durationByDataSource (exclusive ms per source name).
  */
-async function _AssetsController_executeMiddlewares(sources, request, initialResponse = {}) {
+async function _AssetsController_executeMiddlewares(params) {
+    const { sources, request, initialResponse = {}, parentContext, trace, } = params;
     const names = sources.map((source) => source.getName());
     const middlewares = sources.map((source) => source.assetsMiddleware);
     const inclusive = [];
@@ -1429,13 +1513,24 @@ 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
+    // (no-op when `trace` is omitted — unlock/first-init only).
     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,
+        (0, trace_js_1.emitTrace)({
+            name: TRACE_DATA_SOURCE_TIMING,
+            trace,
+            data: {
+                source: sourceName,
+                duration_ms: durationMs,
+                chain_count: request.chainIds.length,
+                account_count: request.accountsWithSupportedChains.length,
+            },
+            tags: {
+                controller: 'AssetsController',
+                // String tag so Spans widgets can group by `source`.
+                source: sourceName,
+            },
+            parentContext,
         });
     }
     // Failed middlewares: Issues (optional) + perf/Dashboard spans
@@ -1452,14 +1547,20 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         catch {
             // Never let telemetry throw.
         }
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_DATA_SOURCE_ERROR, {
-            failed_sources: failedSources,
-            error_count: middlewareErrors.length,
-            chain_count: request.chainIds.length,
-        }, {
-            controller: 'AssetsController',
-            severity: 'error',
-            error_type: assetsError.name,
+        (0, trace_js_1.emitTrace)({
+            name: TRACE_DATA_SOURCE_ERROR,
+            trace,
+            data: {
+                failed_sources: failedSources,
+                error_count: middlewareErrors.length,
+                chain_count: request.chainIds.length,
+            },
+            tags: {
+                controller: 'AssetsController',
+                severity: 'error',
+                error_type: assetsError.name,
+            },
+            parentContext,
         });
     }
     return { response: result.response, durationByDataSource };
@@ -2081,9 +2182,13 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
     };
     source.subscribe(subscribeReq).catch((error) => {
         console.error(`[AssetsController] Failed to subscribe to '${sourceId}':`, error);
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_SUBSCRIPTION_ERROR, {
-            source: sourceId,
-            error_message: String(error),
+        (0, trace_js_1.emitTrace)({
+            name: TRACE_SUBSCRIPTION_ERROR,
+            trace: __classPrivateFieldGet(this, _AssetsController_trace, "f"),
+            data: {
+                source: sourceId,
+                error_message: String(error),
+            },
         });
     });
     // Track subscription