@oxy.so/telemetry 1.2.0 → 2.1.0

package/README.md

@@ -11,6 +11,7 @@ Redis, React, React Native or Expo.
 - `@oxy.so/telemetry/collector` — bounded HTTP/custom-transport flow aggregation.
 - `@oxy.so/telemetry/server` — pure validation, route bucketing and cardinality
   keys/interfaces.
+- `@oxy.so/telemetry/metrics` — operational metrics as CloudWatch EMF lines.
 
 Browser code must import the browser entry point explicitly. Server code must
 import the server entry point explicitly; the root entry point has no platform
@@ -136,6 +137,35 @@ explicit infrastructure coordinates) and one of three ways to authenticate: an
 where the process can attest its workload identity (ADR 0026). Credentials, user
 metadata and paths never enter public snapshots.
 
+## Operational metrics (CloudWatch EMF)
+
+```ts
+import { createEmfPublisher, HTTP_REQUEST_LATENCY, statusClass } from '@oxy.so/telemetry/metrics';
+
+const metrics = createEmfPublisher({ namespace: 'Oxy/Api', service: 'oxy-api' });
+metrics.record(HTTP_REQUEST_LATENCY, elapsedMs, {
+  Route: '/users/:id', // a log property: free, grouped in Logs Insights
+  StatusClass: statusClass(res.statusCode), // a dimension: billed per value
+  Caller: 'anonymous',
+});
+// On shutdown:
+metrics.stop();
+```
+
+Observations are aggregated in memory and written once per interval (60 s) as
+one stdout line per (metric, label set). On ECS with the `awslogs` driver,
+CloudWatch Logs extracts the metrics itself: no agent, sidecar or IAM grant.
+A `distribution` keeps a ~5 % bucketed histogram, so CloudWatch answers
+SampleCount (the count) and percentiles for it.
+
+Every distinct combination of DIMENSION values is a billed custom metric, so a
+label is a dimension only when the definition lists it in `dimensionSets`, and
+only closed, small sets belong there (status class, a first-party caller).
+Route, method, table and every other label stay plain properties on the line:
+`stats sum(RequestLatency.Count) by Route` in Logs Insights. At most
+`maxSeries` (default 2000) series are held per interval; past that, new series
+fold into one whose labels read `other`.
+
 ## Development
 
 ```bash

package/dist/cjs/browser.js

@@ -26,9 +26,9 @@ function createUuid(cryptoApi) {
 function eligibleLocation(location) {
     if (!location || (location.protocol !== 'https:' && location.protocol !== 'http:'))
         return false;
-    return location.hostname !== 'localhost'
-        && location.hostname !== '127.0.0.1'
-        && location.hostname !== '[::1]';
+    return (location.hostname !== 'localhost' &&
+        location.hostname !== '127.0.0.1' &&
+        location.hostname !== '[::1]');
 }
 function createBrowserTelemetry(options = {}) {
     let activityId = null;
@@ -41,7 +41,9 @@ function createBrowserTelemetry(options = {}) {
         if (!hasInjectedBrowser && !hasBrowserRuntime)
             return {};
         const now = (options.now ?? Date.now)();
-        if (!activityId || now < activityIdCreatedAt || now - activityIdCreatedAt >= (options.activityIdRotationMs ?? exports.DEFAULT_ACTIVITY_ID_ROTATION_MS)) {
+        if (!activityId ||
+            now < activityIdCreatedAt ||
+            now - activityIdCreatedAt >= (options.activityIdRotationMs ?? exports.DEFAULT_ACTIVITY_ID_ROTATION_MS)) {
             activityId = createUuid(options.crypto ?? globalThis.crypto);
             if (!activityId)
                 return {};
@@ -58,7 +60,11 @@ function createBrowserTelemetry(options = {}) {
         try {
             const response = await (options.fetchTrace
                 ? options.fetchTrace(controller.signal)
-                : fetch('/cdn-cgi/trace', { cache: 'no-store', credentials: 'omit', signal: controller.signal }));
+                : fetch('/cdn-cgi/trace', {
+                    cache: 'no-store',
+                    credentials: 'omit',
+                    signal: controller.signal,
+                }));
             if (!response.ok)
                 return null;
             const match = (await response.text()).match(/^colo=([a-z]{3})$/im);
@@ -73,7 +79,9 @@ function createBrowserTelemetry(options = {}) {
     };
     const getEdgeRegionHeader = async () => {
         const now = (options.now ?? Date.now)();
-        if (!edgePopPromise || now < edgePopReadAt || now - edgePopReadAt >= (options.edgeCacheMs ?? exports.DEFAULT_EDGE_CACHE_MS)) {
+        if (!edgePopPromise ||
+            now < edgePopReadAt ||
+            now - edgePopReadAt >= (options.edgeCacheMs ?? exports.DEFAULT_EDGE_CACHE_MS)) {
             edgePopReadAt = now;
             edgePopPromise = discoverEdgePop();
         }
@@ -85,7 +93,9 @@ function createBrowserTelemetry(options = {}) {
     let peekInFlight = false;
     const peekEdgeRegionHeader = () => {
         const now = (options.now ?? Date.now)();
-        if (!peekInFlight && (now < peekRefreshAt || now - peekRefreshAt >= (options.edgePeekRefreshMs ?? exports.DEFAULT_EDGE_PEEK_REFRESH_MS))) {
+        if (!peekInFlight &&
+            (now < peekRefreshAt ||
+                now - peekRefreshAt >= (options.edgePeekRefreshMs ?? exports.DEFAULT_EDGE_PEEK_REFRESH_MS))) {
             peekRefreshAt = now;
             peekInFlight = true;
             void discoverEdgePop()
@@ -104,7 +114,7 @@ function createBrowserTelemetry(options = {}) {
         getEdgeRegionHeader,
         peekEdgeRegionHeader,
         async getHeaders() {
-            return { ...await getEdgeRegionHeader(), ...getActivityIdHeader() };
+            return { ...(await getEdgeRegionHeader()), ...getActivityIdHeader() };
         },
     };
 }

package/dist/cjs/collector.js

@@ -9,11 +9,34 @@ exports.infrastructureLocation = infrastructureLocation;
 exports.normalizeInfrastructureRegion = normalizeInfrastructureRegion;
 const server_js_1 = require("./server.js");
 const TYPES = {
-    auth: 'identity', session: 'identity', users: 'identity', profiles: 'identity', accounts: 'identity',
-    ai: 'ai', inference: 'ai', models: 'ai', chat: 'ai', completions: 'ai',
-    stream: 'media', tracks: 'media', episodes: 'media', recordings: 'media', rooms: 'media',
-    messages: 'communication', notifications: 'communication', mail: 'communication',
-    media: 'media', files: 'media', assets: 'media', upload: 'media', uploads: 'media', cdn: 'media', storage: 'media', images: 'media', audio: 'media', videos: 'media',
+    auth: 'identity',
+    session: 'identity',
+    users: 'identity',
+    profiles: 'identity',
+    accounts: 'identity',
+    ai: 'ai',
+    inference: 'ai',
+    models: 'ai',
+    chat: 'ai',
+    completions: 'ai',
+    stream: 'media',
+    tracks: 'media',
+    episodes: 'media',
+    recordings: 'media',
+    rooms: 'media',
+    messages: 'communication',
+    notifications: 'communication',
+    mail: 'communication',
+    media: 'media',
+    files: 'media',
+    assets: 'media',
+    upload: 'media',
+    uploads: 'media',
+    cdn: 'media',
+    storage: 'media',
+    images: 'media',
+    audio: 'media',
+    videos: 'media',
 };
 function trafficType(path) {
     const parts = path.split('?')[0].split('/').filter(Boolean);
@@ -43,7 +66,12 @@ function createTrafficCollector(publish, now = Date.now) {
             if (pending.size === 0)
                 return;
             const emittedAt = new Date(now()).toISOString();
-            const events = [...pending.values()].map(({ flow, requests, startedAt }) => ({ ...flow, requests, windowStartedAt: new Date(startedAt).toISOString(), emittedAt }));
+            const events = [...pending.values()].map(({ flow, requests, startedAt }) => ({
+                ...flow,
+                requests,
+                windowStartedAt: new Date(startedAt).toISOString(),
+                emittedAt,
+            }));
             pending.clear();
             flushing = (async () => {
                 for (let offset = 0; offset < events.length; offset += 256)
@@ -63,7 +91,10 @@ function trafficMiddleware(collector, service, region) {
         response.setHeader?.('X-Oxy-Region', region);
         const path = request.path ?? request.url ?? '/';
         // Never report collection itself, probes or the dashboard transport.
-        if (/^\/(?:api\/)?(?:health|ready|live|platform-stats|platform-activity|platform-infrastructure|infra-status)(?:\/|$)/.test(path) || path.startsWith('/internal/activity') || path.startsWith('/auth/service-token') || path.startsWith('/cdn-cgi/')) {
+        if (/^\/(?:api\/)?(?:health|ready|live|platform-stats|platform-activity|platform-infrastructure|infra-status)(?:\/|$)/.test(path) ||
+            path.startsWith('/internal/activity') ||
+            path.startsWith('/auth/service-token') ||
+            path.startsWith('/cdn-cgi/')) {
             next();
             return;
         }
@@ -72,11 +103,28 @@ function trafficMiddleware(collector, service, region) {
         let finished = false;
         const inboundFlow = () => {
             // Read service identity AFTER the route's shared auth middleware resolved it.
-            const name = request.serviceApp?.appName?.toLowerCase().replace(/[^a-z0-9-]/g, '-').slice(0, 40);
+            const name = request.serviceApp?.appName
+                ?.toLowerCase()
+                .replace(/[^a-z0-9-]/g, '-')
+                .slice(0, 40);
             const internal = Boolean(name);
             const forwardedRegion = request.headers['x-oxy-source-region'];
-            const peerRegion = internal ? normalizeInfrastructureRegion(forwardedRegion) : edgePop ? `edge-${edgePop}` : undefined;
-            return { region, service, activityType, scope: internal ? 'internal' : 'external', direction: 'inbound', sourceRegion: peerRegion, targetRegion: region, sourceService: name, targetService: service };
+            const peerRegion = internal
+                ? normalizeInfrastructureRegion(forwardedRegion)
+                : edgePop
+                    ? `edge-${edgePop}`
+                    : undefined;
+            return {
+                region,
+                service,
+                activityType,
+                scope: internal ? 'internal' : 'external',
+                direction: 'inbound',
+                sourceRegion: peerRegion,
+                targetRegion: region,
+                sourceService: name,
+                targetService: service,
+            };
         };
         const finish = () => {
             if (finished)
@@ -84,7 +132,14 @@ function trafficMiddleware(collector, service, region) {
             finished = true;
             const flow = inboundFlow();
             collector.record(flow);
-            collector.record({ ...flow, direction: 'outbound', sourceRegion: region, targetRegion: flow.sourceRegion, sourceService: service, targetService: flow.sourceService });
+            collector.record({
+                ...flow,
+                direction: 'outbound',
+                sourceRegion: region,
+                targetRegion: flow.sourceRegion,
+                sourceService: service,
+                targetService: flow.sourceService,
+            });
         };
         response.once('finish', finish);
         // Failed/aborted requests are still real inbound activity. Do not invent a
@@ -102,13 +157,21 @@ function instrumentTrafficFetch(fetcher, collector, service, region, resolveEndp
     return Object.assign(async (input, init) => {
         const url = new URL(typeof input === 'string' ? input : input instanceof URL ? input.href : input.url);
         // Collection/auth control traffic cannot generate a feedback loop.
-        if (url.pathname.startsWith('/internal/activity') || url.pathname.startsWith('/auth/service-token') || url.pathname === '/platform-infrastructure')
+        if (url.pathname.startsWith('/internal/activity') ||
+            url.pathname.startsWith('/auth/service-token') ||
+            url.pathname === '/platform-infrastructure')
             return fetcher(input, init);
         const peer = resolveEndpoint(url);
         const flow = {
-            service, region, scope: peer ? 'internal' : 'external', direction: 'outbound',
-            activityType: trafficType(url.pathname), sourceRegion: region, targetRegion: peer?.region,
-            sourceService: service, targetService: peer?.service,
+            service,
+            region,
+            scope: peer ? 'internal' : 'external',
+            direction: 'outbound',
+            activityType: trafficType(url.pathname),
+            sourceRegion: region,
+            targetRegion: peer?.region,
+            sourceService: service,
+            targetService: peer?.service,
         };
         const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
         if (peer)
@@ -121,23 +184,43 @@ function instrumentTrafficFetch(fetcher, collector, service, region, resolveEndp
             collector.record({ ...flow, targetRegion: undefined });
             throw error;
         }
-        const targetRegion = peer ? normalizeInfrastructureRegion(response.headers.get('X-Oxy-Region') ?? undefined) : undefined;
+        const targetRegion = peer
+            ? normalizeInfrastructureRegion(response.headers.get('X-Oxy-Region') ?? undefined)
+            : undefined;
         collector.record({ ...flow, targetRegion });
-        collector.record({ ...flow, direction: 'inbound', sourceRegion: targetRegion, targetRegion: region, sourceService: peer?.service, targetService: service });
+        collector.record({
+            ...flow,
+            direction: 'inbound',
+            sourceRegion: targetRegion,
+            targetRegion: region,
+            sourceService: peer?.service,
+            targetService: service,
+        });
         return response;
     }, fetcher);
 }
 // Exact deployed API hosts; an arbitrary caller-supplied hostname cannot claim
 // to be an internal service. Region is infrastructure metadata, never IP geo.
 const OXY_API_SERVICES = {
-    'api.oxy.so': 'oxy-api', 'api.website.oxy.so': 'website',
-    'website-api.oxy.so': 'website', 'api.mention.earth': 'mention',
-    'api.mercaria.co': 'mercaria', 'api.alia.onl': 'alia', 'kaana.ai': 'kaana',
-    'api.homiio.com': 'homiio', 'api.syra.fm': 'syra',
-    'mention.earth': 'mention', 'mcp.mention.earth': 'mention-mcp',
-    'api.clarity.surf': 'clarity', 'api.peable.to': 'peable',
-    'api.crowdsource.oxy.so': 'crowdsource', 'api.moovo.now': 'moovo',
-    'api.allo.you': 'allo', 'api.noted.oxy.so': 'noted', 'api.schedio.app': 'schedio', 'api.tnp.network': 'tnp-api',
+    'api.oxy.so': 'oxy-api',
+    'api.website.oxy.so': 'website',
+    'website-api.oxy.so': 'website',
+    'api.mention.earth': 'mention',
+    'api.mercaria.co': 'mercaria',
+    'api.alia.onl': 'alia',
+    'kaana.ai': 'kaana',
+    'api.homiio.com': 'homiio',
+    'api.syra.fm': 'syra',
+    'mention.earth': 'mention',
+    'mcp.mention.earth': 'mention-mcp',
+    'api.clarity.surf': 'clarity',
+    'api.peable.to': 'peable',
+    'api.crowdsource.oxy.so': 'crowdsource',
+    'api.moovo.now': 'moovo',
+    'api.allo.you': 'allo',
+    'api.noted.oxy.so': 'noted',
+    'api.schedio.app': 'schedio',
+    'api.tnp.network': 'tnp-api',
 };
 function resolveOxyServiceEndpoint(url) {
     const service = OXY_API_SERVICES[url.hostname];
@@ -174,7 +257,9 @@ const REGION_LOCATIONS = {
     'me-central-1': { label: 'UAE', coordinates: [54.37, 24.45] },
     'il-central-1': { label: 'Tel Aviv', coordinates: [34.78, 32.09] },
 };
-function infrastructureLocation(region) { return REGION_LOCATIONS[region]; }
+function infrastructureLocation(region) {
+    return REGION_LOCATIONS[region];
+}
 function normalizeInfrastructureRegion(value) {
     return typeof value === 'string' && /^[a-z]{2}(?:-[a-z]+)+-\d$/.test(value) ? value : undefined;
 }

package/dist/cjs/metrics.js

@@ -0,0 +1,208 @@
+"use strict";
+/**
+ * Operational metrics for Oxy services, published as CloudWatch Embedded Metric
+ * Format (EMF) log lines.
+ *
+ * WHY EMF ON STDOUT: every Oxy backend runs on ECS with the `awslogs` driver, and
+ * CloudWatch Logs extracts metrics from any log event shaped as EMF — no agent,
+ * no sidecar, no scraper, no IAM grant beyond the logging the task already has.
+ * A registry that only an HTTP scrape can read (Prometheus) measures into a void
+ * when nothing scrapes it, which is how Mention's counters lost every value on
+ * every deploy.
+ *
+ * WHY AGGREGATED: values are folded in memory and flushed once per interval as
+ * ONE line per (metric, label set), not one line per observation. A latency is
+ * kept as a distribution (`Values`/`Counts`), so CloudWatch still answers
+ * SampleCount, p50 and p99 for it — the request COUNT is the distribution's
+ * SampleCount, so a service needs no separate counter for it.
+ *
+ * WHY MOST LABELS ARE NOT DIMENSIONS: every distinct combination of dimension
+ * values is a billed custom metric. Route x method as dimensions once measured
+ * 405 metrics and ~80 % of the account's CloudWatch bill (Mention #1334). So a
+ * label becomes a DIMENSION only when a metric definition names it in
+ * `dimensionSets`, and only labels with a small, closed value set belong there.
+ * Every other label is written as a plain property of the line: free to store,
+ * and grouped in Logs Insights (`stats sum(RequestLatency.Count) by Route`).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTTP_RATE_LIMITED = exports.HTTP_REQUEST_LATENCY = void 0;
+exports.statusClass = statusClass;
+exports.createEmfPublisher = createEmfPublisher;
+/** One HTTP request: SampleCount is the request count, percentiles the latency. */
+exports.HTTP_REQUEST_LATENCY = {
+    name: 'RequestLatency',
+    unit: 'Milliseconds',
+    kind: 'distribution',
+    dimensionSets: [['StatusClass'], ['Caller']],
+};
+/** One request a rate limiter refused (429), per calling application. */
+exports.HTTP_RATE_LIMITED = {
+    name: 'RateLimited',
+    unit: 'Count',
+    kind: 'sum',
+    dimensionSets: [['Caller']],
+};
+/** `2xx`, `4xx`, … — a closed set, safe as a dimension. */
+function statusClass(status) {
+    return Number.isInteger(status) && status >= 100 && status <= 599
+        ? `${Math.floor(status / 100)}xx`
+        : 'other';
+}
+/** EMF allows at most 100 distinct values per metric on one line. */
+const MAX_DISTRIBUTION_VALUES = 100;
+/** Neighbouring values within ~5 % share a bucket, which bounds the set. */
+const BUCKET_BASE = 1.05;
+const LABEL_NAME = /^[A-Za-z][A-Za-z0-9_]{0,63}$/;
+const MAX_LABEL_VALUE_LENGTH = 128;
+const RESERVED = new Set(['_aws', 'Service']);
+/** Representative value of a bucket: values within ~5 % collapse together. */
+function bucketOf(value) {
+    if (value <= 0)
+        return 0;
+    const exponent = Math.round(Math.log(value) / Math.log(BUCKET_BASE));
+    return Number((BUCKET_BASE ** exponent).toPrecision(3));
+}
+/** Merge adjacent buckets (keeping the larger value) until EMF accepts them. */
+function boundedDistribution(buckets) {
+    let entries = [...buckets.entries()].sort(([left], [right]) => left - right);
+    while (entries.length > MAX_DISTRIBUTION_VALUES) {
+        const merged = [];
+        for (let index = 0; index < entries.length; index += 2) {
+            const [value, count] = entries[index];
+            const next = entries[index + 1];
+            merged.push(next ? [next[0], count + next[1]] : [value, count]);
+        }
+        entries = merged;
+    }
+    return { values: entries.map(([value]) => value), counts: entries.map(([, count]) => count) };
+}
+function cleanLabels(metric, labels) {
+    const clean = {};
+    for (const [name, raw] of Object.entries(labels ?? {})) {
+        if (!LABEL_NAME.test(name) || RESERVED.has(name) || name === metric.name)
+            continue;
+        const value = String(raw).slice(0, MAX_LABEL_VALUE_LENGTH);
+        clean[name] = value.length > 0 ? value : 'unknown';
+    }
+    // A dimension named by the definition must be present on every line, or
+    // CloudWatch drops the metric from that line.
+    for (const set of metric.dimensionSets ?? []) {
+        for (const name of set)
+            clean[name] ?? (clean[name] = 'unknown');
+    }
+    return clean;
+}
+function seriesKey(metric, labels) {
+    const pairs = Object.keys(labels)
+        .sort()
+        .map((name) => `${name}=${labels[name]}`);
+    return `${metric.name}\u0000${pairs.join('\u0000')}`;
+}
+/** One line on stdout. Reached through `globalThis`: this package carries no Node types. */
+function defaultWrite(line) {
+    globalThis.process?.stdout?.write?.(`${line}\n`);
+}
+function createEmfPublisher(options) {
+    const flushIntervalMs = options.flushIntervalMs ?? 60000;
+    const maxSeries = options.maxSeries ?? 2000;
+    const write = options.write ?? defaultWrite;
+    const now = options.now ?? Date.now;
+    let series = new Map();
+    const line = (entry, timestamp) => {
+        const { metric } = entry;
+        const dimensions = [
+            ['Service'],
+            ...(metric.dimensionSets ?? []).map((set) => ['Service', ...set]),
+        ];
+        let value;
+        if (metric.kind === 'sum')
+            value = entry.sum;
+        else if (metric.kind === 'gauge')
+            value = entry.last;
+        else {
+            const { values, counts } = boundedDistribution(entry.buckets);
+            value = {
+                Values: values,
+                Counts: counts,
+                Max: entry.max,
+                Min: entry.min,
+                Count: entry.count,
+                Sum: entry.sum,
+            };
+        }
+        return JSON.stringify({
+            _aws: {
+                Timestamp: timestamp,
+                CloudWatchMetrics: [
+                    {
+                        Namespace: options.namespace,
+                        Dimensions: dimensions,
+                        Metrics: [{ Name: metric.name, Unit: metric.unit }],
+                    },
+                ],
+            },
+            ...entry.labels,
+            Service: options.service,
+            [metric.name]: value,
+        });
+    };
+    const flush = () => {
+        if (series.size === 0)
+            return;
+        const current = series;
+        series = new Map();
+        const timestamp = now();
+        for (const entry of current.values()) {
+            try {
+                write(line(entry, timestamp));
+            }
+            catch {
+                // Metrics are best effort; a failed write must never reach a request.
+            }
+        }
+    };
+    const timer = setInterval(flush, flushIntervalMs);
+    timer.unref?.();
+    return {
+        record(metric, value, labels) {
+            if (!Number.isFinite(value))
+                return;
+            if (metric.kind !== 'gauge' && value < 0)
+                return;
+            let clean = cleanLabels(metric, labels);
+            let key = seriesKey(metric, clean);
+            if (!series.has(key) && series.size >= maxSeries) {
+                clean = Object.fromEntries(Object.keys(clean).map((name) => [name, 'other']));
+                key = seriesKey(metric, clean);
+            }
+            let entry = series.get(key);
+            if (!entry) {
+                entry = {
+                    metric,
+                    labels: clean,
+                    sum: 0,
+                    last: 0,
+                    count: 0,
+                    min: Number.POSITIVE_INFINITY,
+                    max: Number.NEGATIVE_INFINITY,
+                    buckets: new Map(),
+                };
+                series.set(key, entry);
+            }
+            entry.sum += value;
+            entry.last = value;
+            entry.count += 1;
+            entry.min = Math.min(entry.min, value);
+            entry.max = Math.max(entry.max, value);
+            if (metric.kind === 'distribution') {
+                const bucket = bucketOf(value);
+                entry.buckets.set(bucket, (entry.buckets.get(bucket) ?? 0) + 1);
+            }
+        },
+        flush,
+        stop() {
+            clearInterval(timer);
+            flush();
+        },
+    };
+}

package/dist/cjs/server.js

@@ -17,7 +17,9 @@ function firstHeaderValue(value) {
     return typeof first === 'string' ? first : undefined;
 }
 function normalizeEdgePop(value) {
-    return firstHeaderValue(value)?.match(/^[a-z]{3}$/i)?.[0]?.toLowerCase();
+    return firstHeaderValue(value)
+        ?.match(/^[a-z]{3}$/i)?.[0]
+        ?.toLowerCase();
 }
 function normalizeActivityId(value) {
     const candidate = firstHeaderValue(value);

package/dist/cjs/socket.js

@@ -6,11 +6,26 @@ exports.observeTrafficWebSocket = observeTrafficWebSocket;
 const collector_js_1 = require("./collector.js");
 const server_js_1 = require("./server.js");
 const CATEGORIES = {
-    auth: 'identity', session: 'identity', user: 'identity', profile: 'identity',
-    chat: 'ai', agent: 'ai', inference: 'ai', completion: 'ai',
-    message: 'communication', notification: 'communication', typing: 'communication',
-    media: 'media', audio: 'media', video: 'media', stream: 'media', player: 'media',
-    track: 'media', playback: 'media', playlist: 'media', room: 'media',
+    auth: 'identity',
+    session: 'identity',
+    user: 'identity',
+    profile: 'identity',
+    chat: 'ai',
+    agent: 'ai',
+    inference: 'ai',
+    completion: 'ai',
+    message: 'communication',
+    notification: 'communication',
+    typing: 'communication',
+    media: 'media',
+    audio: 'media',
+    video: 'media',
+    stream: 'media',
+    player: 'media',
+    track: 'media',
+    playback: 'media',
+    playlist: 'media',
+    room: 'media',
 };
 /** Event names are reduced locally to five categories; payloads are never read. */
 function socketTrafficType(event) {
@@ -32,9 +47,16 @@ function observeTrafficSocket(socket, collector, service, region, options = {})
         const peer = options.getPeer?.();
         const peerService = peer && /^[a-z][a-z0-9-]{0,39}$/.test(peer.service) ? peer.service : undefined;
         const edgePop = (0, server_js_1.metadataFromHeaders)(socket.handshake.headers).edgePop;
-        const peerRegion = peerService ? (0, collector_js_1.normalizeInfrastructureRegion)(peer?.region) : edgePop ? `edge-${edgePop}` : undefined;
+        const peerRegion = peerService
+            ? (0, collector_js_1.normalizeInfrastructureRegion)(peer?.region)
+            : edgePop
+                ? `edge-${edgePop}`
+                : undefined;
         collector.record({
-            region, service, scope: peerService ? 'internal' : 'external', direction,
+            region,
+            service,
+            scope: peerService ? 'internal' : 'external',
+            direction,
             activityType: socketTrafficType(event),
             sourceRegion: direction === 'inbound' ? peerRegion : region,
             targetRegion: direction === 'inbound' ? region : peerRegion,
@@ -66,9 +88,16 @@ function observeTrafficWebSocket(socket, collector, service, region, options = {
         const peer = options.getPeer?.();
         const peerService = peer && /^[a-z][a-z0-9-]{0,39}$/.test(peer.service) ? peer.service : undefined;
         const edgePop = (0, server_js_1.metadataFromHeaders)(options.headers ?? {}).edgePop;
-        const peerRegion = peerService ? (0, collector_js_1.normalizeInfrastructureRegion)(peer?.region) : edgePop ? `edge-${edgePop}` : undefined;
+        const peerRegion = peerService
+            ? (0, collector_js_1.normalizeInfrastructureRegion)(peer?.region)
+            : edgePop
+                ? `edge-${edgePop}`
+                : undefined;
         collector.record({
-            service, region, scope: peerService ? 'internal' : 'external', direction,
+            service,
+            region,
+            scope: peerService ? 'internal' : 'external',
+            direction,
             activityType: options.activityType ?? 'communication',
             sourceRegion: direction === 'inbound' ? peerRegion : region,
             targetRegion: direction === 'inbound' ? region : peerRegion,