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

package/dist/utils/trace.mjs

@@ -0,0 +1,115 @@
+const DEFAULT_TAGS = {
+    controller: 'AssetsController',
+};
+/**
+ * Build request tags / startTime for MetaMask's Sentry adapter.
+ * Numeric `data` fields become tags (measurements); `duration_ms` backdates start.
+ *
+ * @param data - Span data attributes.
+ * @param tags - Caller tags.
+ * @param startTime - Optional explicit start override.
+ * @returns tags and optional startTime for the TraceRequest.
+ */
+function buildTraceTiming(data, tags, startTime) {
+    const numericFromData = {};
+    for (const [key, value] of Object.entries(data)) {
+        if (typeof value === 'number') {
+            numericFromData[key] = value;
+        }
+    }
+    const requestTags = {
+        ...tags,
+        ...numericFromData,
+    };
+    if (startTime !== undefined) {
+        return { tags: requestTags, startTime };
+    }
+    const durationMs = typeof data.duration_ms === 'number' ? data.duration_ms : undefined;
+    if (durationMs === undefined) {
+        return { tags: requestTags };
+    }
+    return {
+        tags: requestTags,
+        startTime: performance.timeOrigin + performance.now() - durationMs,
+    };
+}
+/**
+ * Fire-and-forget Sentry span. Swallows errors so telemetry never breaks callers.
+ * Pass `parentContext` to nest as a subspan. Omit `trace` to skip emission.
+ *
+ * @param params - Span configuration.
+ * @param params.name - Trace / span name visible in Sentry.
+ * @param params.trace - Optional client trace callback; omit to no-op.
+ * @param params.data - Key-value pairs attached as span data.
+ * @param params.tags - Key-value pairs used for Sentry filtering.
+ * @param params.parentContext - Optional parent span context for nesting.
+ * @param params.startTime - Optional explicit start; else derived from `duration_ms`.
+ */
+export function emitTrace({ name, trace, data, tags = DEFAULT_TAGS, parentContext, startTime: startTimeOverride, }) {
+    if (!trace) {
+        return;
+    }
+    const { tags: requestTags, startTime } = buildTraceTiming(data, tags, startTimeOverride);
+    trace({
+        name,
+        data,
+        tags: requestTags,
+        parentContext,
+        ...(startTime === undefined ? {} : { startTime }),
+    }, () => undefined)?.catch(() => {
+        // Telemetry failure must not break.
+    });
+}
+/**
+ * Run work inside a parent Sentry span and pass its context for nested
+ * {@link emitTrace} subspans.
+ *
+ * When `trace` is omitted, runs `fn(undefined)` with no span.
+ * Telemetry failures are swallowed; errors from `fn` still propagate.
+ *
+ * @param params - Parent span config and work callback.
+ * @param params.name - Parent span name.
+ * @param params.trace - Optional client trace callback; omit to skip wrapping.
+ * @param params.data - Key-value pairs attached as span data.
+ * @param params.fn - Work to run; receives the parent span context.
+ * @param params.tags - Key-value pairs used for Sentry filtering.
+ * @param params.startTime - Optional explicit start; else derived from `duration_ms`.
+ * @returns The result of `fn`.
+ */
+export async function withTrace({ name, trace, data, fn, tags = DEFAULT_TAGS, startTime: startTimeOverride, }) {
+    if (!trace) {
+        return fn(undefined);
+    }
+    const { tags: requestTags, startTime } = buildTraceTiming(data, tags, startTimeOverride);
+    let workResult;
+    try {
+        await trace({
+            name,
+            data,
+            tags: requestTags,
+            ...(startTime === undefined ? {} : { startTime }),
+        }, async (parentContext) => {
+            try {
+                const value = await fn(parentContext);
+                workResult = { ok: true, value };
+                return value;
+            }
+            catch (error) {
+                workResult = { ok: false, error };
+                throw error;
+            }
+        });
+    }
+    catch {
+        // Telemetry failure must not break — unless the work itself failed.
+    }
+    if (workResult === undefined) {
+        // `trace` failed before invoking `fn` (or never called it).
+        return fn(undefined);
+    }
+    if (workResult.ok) {
+        return workResult.value;
+    }
+    throw workResult.error;
+}
+//# sourceMappingURL=trace.mjs.map

package/dist/utils/trace.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.mjs","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TraceCallback, TraceContext } from '@metamask/controller-utils';\n\nconst DEFAULT_TAGS: Record<string, number | string | boolean> = {\n  controller: 'AssetsController',\n};\n\nexport type TraceSpanData = Record<string, number | string | boolean>;\n\nexport type EmitTraceParams = {\n  name: string;\n  /** When omitted / undefined, this is a no-op (bake call-site gating here). */\n  trace?: TraceCallback;\n  data: TraceSpanData;\n  tags?: TraceSpanData;\n  parentContext?: TraceContext;\n  /** Override span start; otherwise derived from `data.duration_ms` when present. */\n  startTime?: number;\n};\n\nexport type WithTraceParams<Result> = {\n  name: string;\n  /** When omitted / undefined, `fn` runs with no parent context. */\n  trace?: TraceCallback;\n  data: TraceSpanData;\n  fn: (parentContext?: TraceContext) => Promise<Result>;\n  tags?: TraceSpanData;\n  startTime?: number;\n};\n\n/**\n * Build request tags / startTime for MetaMask's Sentry adapter.\n * Numeric `data` fields become tags (measurements); `duration_ms` backdates start.\n *\n * @param data - Span data attributes.\n * @param tags - Caller tags.\n * @param startTime - Optional explicit start override.\n * @returns tags and optional startTime for the TraceRequest.\n */\nfunction buildTraceTiming(\n  data: TraceSpanData,\n  tags: TraceSpanData,\n  startTime?: number,\n): { tags: TraceSpanData; startTime?: number } {\n  const numericFromData: Record<string, number> = {};\n  for (const [key, value] of Object.entries(data)) {\n    if (typeof value === 'number') {\n      numericFromData[key] = value;\n    }\n  }\n  const requestTags = {\n    ...tags,\n    ...numericFromData,\n  };\n\n  if (startTime !== undefined) {\n    return { tags: requestTags, startTime };\n  }\n\n  const durationMs =\n    typeof data.duration_ms === 'number' ? data.duration_ms : undefined;\n  if (durationMs === undefined) {\n    return { tags: requestTags };\n  }\n\n  return {\n    tags: requestTags,\n    startTime: performance.timeOrigin + performance.now() - durationMs,\n  };\n}\n\n/**\n * Fire-and-forget Sentry span. Swallows errors so telemetry never breaks callers.\n * Pass `parentContext` to nest as a subspan. Omit `trace` to skip emission.\n *\n * @param params - Span configuration.\n * @param params.name - Trace / span name visible in Sentry.\n * @param params.trace - Optional client trace callback; omit to no-op.\n * @param params.data - Key-value pairs attached as span data.\n * @param params.tags - Key-value pairs used for Sentry filtering.\n * @param params.parentContext - Optional parent span context for nesting.\n * @param params.startTime - Optional explicit start; else derived from `duration_ms`.\n */\nexport function emitTrace({\n  name,\n  trace,\n  data,\n  tags = DEFAULT_TAGS,\n  parentContext,\n  startTime: startTimeOverride,\n}: EmitTraceParams): void {\n  if (!trace) {\n    return;\n  }\n\n  const { tags: requestTags, startTime } = buildTraceTiming(\n    data,\n    tags,\n    startTimeOverride,\n  );\n\n  trace(\n    {\n      name,\n      data,\n      tags: requestTags,\n      parentContext,\n      ...(startTime === undefined ? {} : { startTime }),\n    },\n    () => undefined,\n  )?.catch(() => {\n    // Telemetry failure must not break.\n  });\n}\n\n/**\n * Run work inside a parent Sentry span and pass its context for nested\n * {@link emitTrace} subspans.\n *\n * When `trace` is omitted, runs `fn(undefined)` with no span.\n * Telemetry failures are swallowed; errors from `fn` still propagate.\n *\n * @param params - Parent span config and work callback.\n * @param params.name - Parent span name.\n * @param params.trace - Optional client trace callback; omit to skip wrapping.\n * @param params.data - Key-value pairs attached as span data.\n * @param params.fn - Work to run; receives the parent span context.\n * @param params.tags - Key-value pairs used for Sentry filtering.\n * @param params.startTime - Optional explicit start; else derived from `duration_ms`.\n * @returns The result of `fn`.\n */\nexport async function withTrace<Result>({\n  name,\n  trace,\n  data,\n  fn,\n  tags = DEFAULT_TAGS,\n  startTime: startTimeOverride,\n}: WithTraceParams<Result>): Promise<Result> {\n  if (!trace) {\n    return fn(undefined);\n  }\n\n  const { tags: requestTags, startTime } = buildTraceTiming(\n    data,\n    tags,\n    startTimeOverride,\n  );\n\n  let workResult:\n    | { ok: true; value: Result }\n    | { ok: false; error: unknown }\n    | undefined;\n\n  try {\n    await trace(\n      {\n        name,\n        data,\n        tags: requestTags,\n        ...(startTime === undefined ? {} : { startTime }),\n      },\n      async (parentContext) => {\n        try {\n          const value = await fn(parentContext);\n          workResult = { ok: true, value };\n          return value;\n        } catch (error) {\n          workResult = { ok: false, error };\n          throw error;\n        }\n      },\n    );\n  } catch {\n    // Telemetry failure must not break — unless the work itself failed.\n  }\n\n  if (workResult === undefined) {\n    // `trace` failed before invoking `fn` (or never called it).\n    return fn(undefined);\n  }\n  if (workResult.ok) {\n    return workResult.value;\n  }\n  throw workResult.error;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/assets-controller",
-  "version": "11.2.1-preview-6cd1bb2f5",
+  "version": "11.3.0-preview-2296abeaf",
   "description": "Tracks assets balances/prices and handles token detection across all digital assets",
   "keywords": [
     "Ethereum",
@@ -60,15 +60,15 @@
     "@ethersproject/providers": "^5.7.0",
     "@metamask/account-tree-controller": "^7.5.5",
     "@metamask/accounts-controller": "^39.0.5",
-    "@metamask/assets-controllers": "^110.0.0",
+    "@metamask/assets-controllers": "^110.0.1",
     "@metamask/base-controller": "^9.1.0",
     "@metamask/client-controller": "^1.0.1",
     "@metamask/controller-utils": "^12.3.0",
-    "@metamask/core-backend": "^7.0.0",
-    "@metamask/keyring-api": "^23.5.0",
+    "@metamask/core-backend": "^8.0.0",
+    "@metamask/keyring-api": "^23.7.0",
     "@metamask/keyring-controller": "^27.1.0",
-    "@metamask/keyring-internal-api": "^11.0.1",
-    "@metamask/keyring-snap-client": "^9.2.0",
+    "@metamask/keyring-internal-api": "^11.0.2",
+    "@metamask/keyring-snap-client": "^9.2.1",
     "@metamask/messenger": "^2.0.0",
     "@metamask/network-controller": "^34.0.0",
     "@metamask/network-enablement-controller": "^5.6.0",
@@ -79,7 +79,7 @@
     "@metamask/remote-feature-flag-controller": "^4.2.2",
     "@metamask/snaps-controllers": "^19.0.0",
     "@metamask/snaps-utils": "^12.1.2",
-    "@metamask/transaction-controller": "^69.2.1",
+    "@metamask/transaction-controller": "^69.3.0",
     "@metamask/utils": "^11.11.0",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.1.2",