@dxos/observability 0.8.4-main.84f28bd → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/observability",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.a4bbb77",
   "description": "Provides a common interface for app and platform observability",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,19 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./segment": {
+      "source": "./src/segment/index.ts",
       "types": "./dist/types/src/segment/index.d.ts",
       "browser": "./dist/lib/browser/segment/index.mjs",
       "node": "./dist/lib/node-esm/segment/index.mjs"
     },
     "./sentry": {
+      "source": "./src/sentry/index.ts",
       "types": "./dist/types/src/sentry/index.d.ts",
       "browser": "./dist/lib/browser/sentry/index.mjs",
       "node": "./dist/lib/node-esm/sentry/index.mjs"
@@ -48,18 +51,18 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/api-logs": "^0.52.1",
-    "@opentelemetry/auto-instrumentations-web": "^0.40.0",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.52.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
-    "@opentelemetry/instrumentation": "^0.52.1",
-    "@opentelemetry/resources": "^1.25.1",
-    "@opentelemetry/sdk-logs": "^0.52.1",
-    "@opentelemetry/sdk-metrics": "^1.25.1",
-    "@opentelemetry/sdk-trace-base": "^1.25.1",
-    "@opentelemetry/sdk-trace-web": "^1.25.1",
-    "@opentelemetry/semantic-conventions": "^1.25.0",
+    "@opentelemetry/api-logs": "^0.203.0",
+    "@opentelemetry/auto-instrumentations-web": "^0.51.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.203.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
+    "@opentelemetry/instrumentation": "^0.203.0",
+    "@opentelemetry/resources": "^2.1.0",
+    "@opentelemetry/sdk-logs": "^0.203.0",
+    "@opentelemetry/sdk-metrics": "^2.1.0",
+    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/sdk-trace-web": "^2.1.0",
+    "@opentelemetry/semantic-conventions": "^1.37.0",
     "@segment/analytics-node": "^2.1.0",
     "@segment/snippet": "^4.15.3",
     "@sentry/browser": "^8.8.0",
@@ -68,20 +71,20 @@
     "js-yaml": "^4.1.0",
     "localforage": "^1.10.0",
     "uuid": "^9.0.0",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/client": "0.8.4-main.84f28bd",
-    "@dxos/client-protocol": "0.8.4-main.84f28bd",
-    "@dxos/client-services": "0.8.4-main.84f28bd",
-    "@dxos/config": "0.8.4-main.84f28bd",
-    "@dxos/context": "0.8.4-main.84f28bd",
-    "@dxos/debug": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/network-manager": "0.8.4-main.84f28bd",
-    "@dxos/node-std": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/protocols": "0.8.4-main.84f28bd",
-    "@dxos/tracing": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@dxos/async": "0.8.4-main.a4bbb77",
+    "@dxos/client": "0.8.4-main.a4bbb77",
+    "@dxos/client-protocol": "0.8.4-main.a4bbb77",
+    "@dxos/client-services": "0.8.4-main.a4bbb77",
+    "@dxos/context": "0.8.4-main.a4bbb77",
+    "@dxos/config": "0.8.4-main.a4bbb77",
+    "@dxos/invariant": "0.8.4-main.a4bbb77",
+    "@dxos/debug": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/network-manager": "0.8.4-main.a4bbb77",
+    "@dxos/node-std": "0.8.4-main.a4bbb77",
+    "@dxos/protocols": "0.8.4-main.a4bbb77",
+    "@dxos/tracing": "0.8.4-main.a4bbb77",
+    "@dxos/util": "0.8.4-main.a4bbb77"
   },
   "devDependencies": {
     "@sentry/types": "^8.8.0",

package/src/helpers/browser-observability.ts

@@ -11,9 +11,10 @@ import * as localForage from 'localforage';
 import type { Config } from '@dxos/client';
 import { log } from '@dxos/log';
 
-import type { IPData } from './common';
 import type { Mode, Observability } from '../observability';
 
+import type { IPData } from './common';
+
 export const OBSERVABILITY_DISABLED_KEY = 'observability-disabled';
 export const OBSERVABILITY_GROUP_KEY = 'observability-group';
 

package/src/helpers/node-observability.ts

@@ -1,16 +1,17 @@
 //
 // Copyright 2022 DXOS.org
 //
-import yaml from 'js-yaml';
 import { existsSync, statSync } from 'node:fs';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
+
+import yaml from 'js-yaml';
 import { v4 as uuid, validate as validateUuid } from 'uuid';
 
 import type { Config } from '@dxos/client';
 import { log } from '@dxos/log';
 
-import { Observability, type Mode } from '../observability';
+import { type Mode, Observability } from '../observability';
 
 /**
  * Print observability banner once per installation.
@@ -63,7 +64,7 @@ const initializeState = async (idPath: string): Promise<PersistentObservabilityS
   const observabilityState = {
     installationId: uuid(),
     group: process.env.DX_OBSERVABILITY_GROUP ?? undefined,
-    mode: (process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : process.env.DX_OBSERVABILITY_MODE ?? 'basic') as Mode,
+    mode: (process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : (process.env.DX_OBSERVABILITY_MODE ?? 'basic')) as Mode,
   };
 
   await writeFile(
@@ -80,7 +81,7 @@ const validate = (contextString: string) => {
   if (Boolean(context.installationId) && validateUuid(context.installationId!)) {
     return {
       ...context,
-      mode: process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : context.mode ?? 'basic',
+      mode: process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : (context.mode ?? 'basic'),
     };
   }
 };

package/src/helpers/setup-telemetry-listeners.ts

@@ -4,9 +4,10 @@
 
 import type { Client } from '@dxos/client';
 
-import { getTelemetryIdentity } from './common';
 import { type Observability } from '../observability';
 
+import { getTelemetryIdentity } from './common';
+
 let lastFocusEvent = new Date();
 let totalTime = 0;
 

package/src/observability.ts

@@ -3,19 +3,19 @@
 //
 
 import { Event, scheduleTaskInterval } from '@dxos/async';
-import { PublicKey, type Client, type Config } from '@dxos/client';
+import { type Client, type Config, PublicKey } from '@dxos/client';
 import { type ClientServices, type Space } from '@dxos/client-protocol';
 import { Context } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
-import { log, LogLevel } from '@dxos/log';
+import { LogLevel, log } from '@dxos/log';
 import { ConnectionState } from '@dxos/network-manager';
 import { DeviceKind, type NetworkStatus, Platform } from '@dxos/protocols/proto/dxos/client/services';
 import { isNode } from '@dxos/util';
 
 import buildSecrets from './cli-observability-secrets.json';
-import { getTelemetryIdentity, type IPData, mapSpaces } from './helpers';
+import { type IPData, getTelemetryIdentity, mapSpaces } from './helpers';
 import { type OtelLogs, type OtelMetrics, type OtelTraces } from './otel';
-import { type SegmentTelemetry, type TrackOptions, type PageOptions, TelemetryEvent } from './segment';
+import { type PageOptions, type SegmentTelemetry, TelemetryEvent, type TrackOptions } from './segment';
 import { type InitOptions, type captureException as SentryCaptureException } from './sentry';
 import { type SentryLogProcessor } from './sentry/sentry-log-processor';
 

package/src/otel/logs.ts

@@ -4,17 +4,17 @@
 
 import { SeverityNumber } from '@opentelemetry/api-logs';
 import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
-import { Resource } from '@opentelemetry/resources';
+import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
 import { BatchLogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs';
 import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 
 import {
-  getContextFromEntry,
-  getRelativeFilename,
   type LogConfig,
   type LogEntry,
   LogLevel,
   type LogProcessor,
+  getContextFromEntry,
+  getRelativeFilename,
 } from '@dxos/log';
 import { jsonlogify } from '@dxos/util';
 
@@ -33,8 +33,8 @@ export class OtelLogs {
   private _loggerProvider: LoggerProvider;
   constructor(private readonly options: OtelLogOptions) {
     setDiagLogger(options.consoleDiagLogLevel);
-    const resource = Resource.default().merge(
-      new Resource({
+    const resource = defaultResource().merge(
+      resourceFromAttributes({
         [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
         [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
       }),
@@ -46,8 +46,10 @@ export class OtelLogs {
       },
       concurrencyLimit: 10, // an optional limit on pending requests
     });
-    this._loggerProvider = new LoggerProvider({ resource });
-    this._loggerProvider.addLogRecordProcessor(new BatchLogRecordProcessor(logExporter));
+    this._loggerProvider = new LoggerProvider({
+      resource,
+      processors: [new BatchLogRecordProcessor(logExporter)],
+    });
   }
 
   public readonly logProcessor: LogProcessor = (config: LogConfig, entry: LogEntry) => {

package/src/otel/metrics.ts

@@ -2,36 +2,29 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Attributes, type Meter, type ObservableGauge } from '@opentelemetry/api';
+import { type Meter } from '@opentelemetry/api';
 import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
-import { Resource } from '@opentelemetry/resources';
+import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
 import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
 import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 
 import { log } from '@dxos/log';
-import { TRACE_PROCESSOR, type MetricData } from '@dxos/tracing';
+import { type MetricData, TRACE_PROCESSOR } from '@dxos/tracing';
 
 import { type OtelOptions, setDiagLogger } from './otel';
 
 const EXPORT_INTERVAL = 60 * 1000;
 
-type SynchronousGauge = {
-  gauge: ObservableGauge<Attributes>;
-  nextValue: number;
-  nextTags?: any;
-};
-
 export class OtelMetrics {
   private _meterProvider: MeterProvider;
   private _meter: Meter;
-  private _gauges = new Map<string, SynchronousGauge>();
 
   constructor(private readonly options: OtelOptions) {
     // TODO: improve error handling/logging
     //  https://github.com/open-telemetry/opentelemetry-js/issues/4823
     setDiagLogger(options.consoleDiagLogLevel);
-    const resource = Resource.default().merge(
-      new Resource({
+    const resource = defaultResource().merge(
+      resourceFromAttributes({
         [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
         [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
       }),

package/src/otel/otel.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
+import { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
 
 export type OtelOptions = {
   endpoint: string;

package/src/otel/traces-browser.ts

@@ -2,45 +2,48 @@
 // Copyright 2024 DXOS.org
 //
 
-import { trace, type Tracer } from '@opentelemetry/api';
+import { type Tracer, trace } from '@opentelemetry/api';
 import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
-import { Resource } from '@opentelemetry/resources';
-import { ConsoleSpanExporter, SimpleSpanProcessor, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
+import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
+import { BatchSpanProcessor, ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
 import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 
 import { log } from '@dxos/log';
-import { TRACE_PROCESSOR, type StartSpanOptions } from '@dxos/tracing';
+import { type StartSpanOptions, TRACE_PROCESSOR } from '@dxos/tracing';
 
 import { type OtelOptions } from './otel';
 
 export class OtelTraces {
   private _tracer: Tracer;
   constructor(private readonly options: OtelOptions) {
-    const resource = Resource.default().merge(
-      new Resource({
+    const resource = defaultResource().merge(
+      resourceFromAttributes({
         [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
         [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
       }),
     );
 
-    const tracerProvider = new WebTracerProvider({ resource });
-    tracerProvider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-    tracerProvider.addSpanProcessor(
-      new BatchSpanProcessor(
-        new OTLPTraceExporter({
-          url: this.options.endpoint + '/v1/traces',
-          headers: {
-            Authorization: this.options.authorizationHeader,
-          },
-          concurrencyLimit: 10, // an optional limit on pending requests
-        }),
-      ),
-    );
+    const tracerProvider = new WebTracerProvider({
+      resource,
+      spanProcessors: [
+        new SimpleSpanProcessor(new ConsoleSpanExporter()),
+        new BatchSpanProcessor(
+          new OTLPTraceExporter({
+            url: this.options.endpoint + '/v1/traces',
+            headers: {
+              Authorization: this.options.authorizationHeader,
+            },
+            concurrencyLimit: 10, // an optional limit on pending requests
+          }),
+        ),
+      ],
+    });
+
     // TODO(nf): ContextManager? Propogator?
-    tracerProvider.register({});
+    trace.setGlobalTracerProvider(tracerProvider);
     this._tracer = trace.getTracer('dxos-observability', this.options.serviceVersion);
   }
 

package/src/otel/traces.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { trace, type Tracer } from '@opentelemetry/api';
+import { type Tracer, trace } from '@opentelemetry/api';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { Resource } from '@opentelemetry/resources';
+import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
 import {
   BasicTracerProvider,
   BatchSpanProcessor,
@@ -14,34 +14,37 @@ import {
 import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 import { log } from 'debug';
 
-import { TRACE_PROCESSOR, type StartSpanOptions } from '@dxos/tracing';
+import { type StartSpanOptions, TRACE_PROCESSOR } from '@dxos/tracing';
 
 import { type OtelOptions } from './otel';
 
 export class OtelTraces {
   private _tracer: Tracer;
   constructor(private readonly options: OtelOptions) {
-    const resource = Resource.default().merge(
-      new Resource({
+    const resource = defaultResource().merge(
+      resourceFromAttributes({
         [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
         [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
       }),
     );
 
-    const tracerProvider = new BasicTracerProvider({ resource });
-    tracerProvider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-    tracerProvider.addSpanProcessor(
-      new BatchSpanProcessor(
-        new OTLPTraceExporter({
-          url: this.options.endpoint + '/v1/traces',
-          headers: {
-            Authorization: this.options.authorizationHeader,
-          },
-          concurrencyLimit: 10, // an optional limit on pending requests
-        }),
-      ),
-    );
-    tracerProvider.register();
+    const tracerProvider = new BasicTracerProvider({
+      resource,
+      spanProcessors: [
+        new SimpleSpanProcessor(new ConsoleSpanExporter()),
+        new BatchSpanProcessor(
+          new OTLPTraceExporter({
+            url: this.options.endpoint + '/v1/traces',
+            headers: {
+              Authorization: this.options.authorizationHeader,
+            },
+            concurrencyLimit: 10, // an optional limit on pending requests
+          }),
+        ),
+      ],
+    });
+
+    trace.setGlobalTracerProvider(tracerProvider);
     this._tracer = trace.getTracer('dxos-observability', this.options.serviceVersion);
   }
 

package/src/segment/base.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type TrackParams, type PageParams, type IdentifyParams } from '@segment/analytics-node';
+import { type IdentifyParams, type PageParams, type TrackParams } from '@segment/analytics-node';
 
 import { log } from '@dxos/log';
 

package/src/segment/browser.ts

@@ -7,10 +7,11 @@ import snippet from '@segment/snippet';
 
 import { log } from '@dxos/log';
 
-import { AbstractSegmentTelemetry } from './base';
-import type { TrackOptions, SegmentTelemetryOptions, PageOptions } from './types';
 import { captureException } from '../sentry';
 
+import { AbstractSegmentTelemetry } from './base';
+import type { PageOptions, SegmentTelemetryOptions, TrackOptions } from './types';
+
 /**
  * Browser telemetry.
  */

package/src/segment/node.ts

@@ -7,10 +7,11 @@ import { Analytics, type IdentifyParams } from '@segment/analytics-node';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
-import { AbstractSegmentTelemetry } from './base';
-import type { SegmentTelemetryOptions, PageOptions, TrackOptions } from './types';
 import { captureException } from '../sentry';
 
+import { AbstractSegmentTelemetry } from './base';
+import type { PageOptions, SegmentTelemetryOptions, TrackOptions } from './types';
+
 /**
  * Node telemetry.
  */

package/src/sentry/browser.ts

@@ -3,19 +3,19 @@
 //
 
 import {
-  init as naturalInit,
-  setTag,
+  breadcrumbsIntegration,
+  browserTracingIntegration,
+  feedbackIntegration,
+  httpClientIntegration,
+  metrics,
   addBreadcrumb as naturalAddBreadcrumb,
   captureException as naturalCaptureException,
   captureMessage as naturalCaptureMessage,
+  init as naturalInit,
   sendFeedback as naturalSendFeedback,
   withScope as naturalWithScope,
-  breadcrumbsIntegration,
-  browserTracingIntegration,
-  feedbackIntegration,
-  httpClientIntegration,
   replayIntegration,
-  metrics,
+  setTag,
   startInactiveSpan,
 } from '@sentry/browser';
 

package/src/sentry/index.ts

@@ -3,4 +3,4 @@
 //
 
 export * from './node';
-export * from './types';
+export type * from './types';

package/src/sentry/node.node.test.ts

@@ -5,9 +5,10 @@
 import type { Stacktrace } from '@sentry/types';
 import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
 
-import * as Sentry from './node';
 import { sentryTestkit } from '../testing';
 
+import * as Sentry from './node';
+
 const { testkit, sentryTransport } = sentryTestkit();
 
 // TODO(burdon): https://example.com?

package/src/sentry/node.ts

@@ -4,13 +4,13 @@
 
 import {
   type Event,
-  init as naturalInit,
-  setTag,
+  metrics,
   addBreadcrumb as naturalAddBreadcrumb,
   captureException as naturalCaptureException,
   captureMessage as naturalCaptureMessage,
+  init as naturalInit,
   withScope as naturalWithScope,
-  metrics,
+  setTag,
   startInactiveSpan,
 } from '@sentry/node';
 

package/src/sentry/sentry-log-processor.ts

@@ -2,13 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { Breadcrumb, SeverityLevel, Event } from '@sentry/types';
+import type { Breadcrumb, Event, SeverityLevel } from '@sentry/types';
 
 import { InvariantViolation } from '@dxos/invariant';
 import { type LogConfig, type LogEntry, LogLevel, type LogProcessor, shouldLog } from '@dxos/log';
 import { CircularBuffer, getDebugName } from '@dxos/util';
 
-import { withScope, captureException, captureMessage } from './node';
+import { captureException, captureMessage, withScope } from './node';
 
 const MAX_LOG_BREADCRUMBS = 150;
 
@@ -20,7 +20,12 @@ export class SentryLogProcessor {
     // Don't forward logs from remote sessions.
     if (!shouldLog(entry, config.captureFilters) || meta?.S?.remoteSessionId) {
       if (entry.level > LogLevel.DEBUG) {
-        this._addBreadcrumb(undefined, entry.message, convertLevel(entry.level), undefined);
+        this._addBreadcrumb(
+          undefined,
+          entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : ''),
+          convertLevel(entry.level),
+          undefined,
+        );
       }
       return;
     }
@@ -66,7 +71,8 @@ export class SentryLogProcessor {
         return;
       }
 
-      scope.setFingerprint([entry.message]);
+      const message = entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : '');
+      scope.setFingerprint([message]);
       const eventId = captureMessage(extendedMessage);
       this._addBreadcrumb(eventId, extendedMessage, severity, entry.context);
     });
@@ -117,18 +123,20 @@ export class SentryLogProcessor {
   }
 }
 
-const formatMessageForSentry = (entry: LogEntry) => {
+const formatMessageForSentry = (entry: LogEntry): string => {
+  const message = entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : '');
+
   let scopePrefix: string | undefined;
   if (entry.meta?.S) {
     const scope = entry.meta?.S;
     scopePrefix = scope.name || getDebugName(scope);
   }
   if (scopePrefix == null) {
-    return entry.message;
+    return message;
   }
 
   const workerPrefix = entry.meta?.S?.hostSessionId ? '[worker] ' : '';
-  return `${workerPrefix}${scopePrefix} ${entry.message}`;
+  return `${workerPrefix}${scopePrefix} ${message}`;
 };
 
 const convertLevel = (level: LogLevel): SeverityLevel => {

package/src/sentry/sentry.node.test.ts

@@ -4,9 +4,10 @@
 
 import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
 
-import * as Sentry from './node';
 import { sentryTestkit } from '../testing';
 
+import * as Sentry from './node';
+
 const { testkit, sentryTransport } = sentryTestkit();
 
 const MOCK_DESTINATION = 'https://acacaeaccacacacabcaacdacdacadaca@sentry.io/000001';

package/dist/lib/browser/chunk-5OQYI27L.mjs

@@ -1 +0,0 @@
-//# sourceMappingURL=chunk-5OQYI27L.mjs.map

package/dist/lib/browser/chunk-MWTIKIBZ.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/segment/browser.ts", "../../../src/segment/base.ts", "../../../src/segment/types.ts"],
-  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { type IdentifyParams } from '@segment/analytics-node';\nimport snippet from '@segment/snippet';\n\nimport { log } from '@dxos/log';\n\nimport { AbstractSegmentTelemetry } from './base';\nimport type { TrackOptions, SegmentTelemetryOptions, PageOptions } from './types';\nimport { captureException } from '../sentry';\n\n/**\n * Browser telemetry.\n */\n// https://segment.com/docs/connections/sources/catalog/libraries/website/javascript/#basic-tracking-methods\nexport class SegmentTelemetry extends AbstractSegmentTelemetry {\n  constructor({ apiKey, batchSize, getTags }: SegmentTelemetryOptions) {\n    super(getTags);\n    try {\n      const contents = snippet.min({ apiKey, page: false });\n      const script = document.createElement('script');\n      script.innerHTML = contents;\n      document.body.append(script);\n    } catch (err) {\n      log.catch('failed to initialize telemetry', err);\n    }\n  }\n\n  identify(options: IdentifyParams): void {\n    try {\n      (window as any).analytics?.identify(options.userId, options.traits);\n    } catch (err) {\n      log.catch('failed to identify', err);\n    }\n  }\n\n  page(options: PageOptions): void {\n    try {\n      const props = this.createPageProps(options);\n      (window as any).analytics?.page(props.category, props.name, props.properties);\n    } catch (err) {\n      log.catch('failed to track page', err);\n    }\n  }\n\n  track(options: TrackOptions): void {\n    try {\n      const props = this.createTrackProps(options);\n      (window as any).analytics?.track(props.event, props.properties);\n    } catch (err) {\n      log.catch('failed to track event', err);\n    }\n  }\n\n  async flush(): Promise<void> {\n    try {\n      await (window as any).analytics?.flush((err: any) => {\n        captureException(err);\n      });\n    } catch (err) {\n      log.catch('failed to flush telemetry', err);\n    }\n  }\n\n  async close(): Promise<void> {}\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type TrackParams, type PageParams, type IdentifyParams } from '@segment/analytics-node';\n\nimport { log } from '@dxos/log';\n\nimport {\n  type IdentityOptions,\n  type PageOptions,\n  type SegmentIdentityOptions,\n  type Tags,\n  TelemetryEvent,\n  type TrackOptions,\n} from './types';\n\n/**\n * NOTE: Segment provides a default ID if we don't provide one.\n */\nconst getIdentityOptions = ({ did, installationId }: IdentityOptions): SegmentIdentityOptions => {\n  if (!did && !installationId) {\n    log.warn('No telemetry identifier provided.');\n  }\n\n  return {\n    userId: did,\n    anonymousId: installationId,\n  } as SegmentIdentityOptions;\n};\n\n/**\n * Base class for Node and BrowserSegment telemetry.\n */\nexport abstract class AbstractSegmentTelemetry {\n  constructor(private readonly _getTags: () => Tags) {}\n\n  abstract identify(options: IdentifyParams): void;\n\n  abstract page(options: PageOptions): void;\n\n  abstract track(options: TrackOptions): void;\n\n  protected createPageProps(options: PageOptions): PageParams {\n    const { properties, ...rest } = options;\n    return {\n      ...getIdentityOptions(options),\n      ...rest,\n      properties: {\n        common: this._getTags(),\n        custom: properties,\n      },\n    };\n  }\n\n  protected createTrackProps(options: TrackOptions): TrackParams {\n    const { event, action, properties, ...rest } = options;\n    return {\n      ...getIdentityOptions(options),\n      ...rest,\n      event: event ?? TelemetryEvent.ACTION,\n      properties: {\n        action,\n        common: this._getTags(),\n        custom: properties,\n      },\n    };\n  }\n}\n", "//\n// Copyright 2022 DXOS.org\n//\n\nexport type Tags = Record<string, string>;\n\nexport type SegmentTelemetryOptions = {\n  apiKey?: string;\n  batchSize?: number;\n  enable?: boolean;\n  getTags: () => Tags;\n};\n\n// Copied from @segment/analytics-node.\nexport type SegmentIdentityOptions =\n  | { userId: string; anonymousId?: string }\n  | { userId?: string; anonymousId: string };\n\n// TODO(burdon): Should require one or the other.\nexport type IdentityOptions = { did?: string; installationId?: string };\n\nexport type CommonOptions = IdentityOptions & {\n  timestamp?: Date;\n  properties?: Record<string, unknown>;\n};\n\n/**\n * Page views.\n * https://segment.com/docs/connections/sources/catalog/libraries/server/node/#page\n */\nexport type PageOptions = CommonOptions & {\n  category?: string;\n  name?: string;\n};\n\n/**\n * Track actions.\n * https://segment.com/docs/connections/sources/catalog/libraries/server/node/#track\n */\nexport type TrackOptions = CommonOptions & {\n  event?: TelemetryEvent;\n  action: string;\n};\n\n/**\n * Each event will be mapped to a different Postgres table via segment.\n */\nexport enum TelemetryEvent {\n  /**\n   * Use actions.\n   */\n  ACTION = 'action',\n  /**\n   * High-volume technical metrics.\n   */\n  METRICS = 'metrics',\n}\n"],
-  "mappings": ";;;;;AAKA,OAAOA,aAAa;AAEpB,SAASC,OAAAA,YAAW;;;ACDpB,SAASC,WAAW;;;ACyCb,IAAKC,iBAAAA,yBAAAA,iBAAAA;AAGT,EAAAA,gBAAA,QAAA,IAAA;AAIA,EAAAA,gBAAA,SAAA,IAAA;SAPSA;;;;;AD3BZ,IAAMC,qBAAqB,CAAC,EAAEC,KAAKC,eAAc,MAAmB;AAClE,MAAI,CAACD,OAAO,CAACC,gBAAgB;AAC3BC,QAAIC,KAAK,qCAAA,QAAA;;;;;;EACX;AAEA,SAAO;IACLC,QAAQJ;IACRK,aAAaJ;EACf;AACF;AAKO,IAAeK,2BAAf,MAAeA;EACpB,YAA6BC,UAAsB;SAAtBA,WAAAA;EAAuB;EAQ1CC,gBAAgBC,SAAkC;AAC1D,UAAM,EAAEC,YAAY,GAAGC,KAAAA,IAASF;AAChC,WAAO;MACL,GAAGV,mBAAmBU,OAAAA;MACtB,GAAGE;MACHD,YAAY;QACVE,QAAQ,KAAKL,SAAQ;QACrBM,QAAQH;MACV;IACF;EACF;EAEUI,iBAAiBL,SAAoC;AAC7D,UAAM,EAAEM,OAAOC,QAAQN,YAAY,GAAGC,KAAAA,IAASF;AAC/C,WAAO;MACL,GAAGV,mBAAmBU,OAAAA;MACtB,GAAGE;MACHI,OAAOA,SAASE,eAAeC;MAC/BR,YAAY;QACVM;QACAJ,QAAQ,KAAKL,SAAQ;QACrBM,QAAQH;MACV;IACF;EACF;AACF;;;;ADnDO,IAAMS,mBAAN,cAA+BC,yBAAAA;EACpC,YAAY,EAAEC,QAAQC,WAAWC,QAAO,GAA6B;AACnE,UAAMA,OAAAA;AACN,QAAI;AACF,YAAMC,WAAWC,QAAQC,IAAI;QAAEL;QAAQM,MAAM;MAAM,CAAA;AACnD,YAAMC,SAASC,SAASC,cAAc,QAAA;AACtCF,aAAOG,YAAYP;AACnBK,eAASG,KAAKC,OAAOL,MAAAA;IACvB,SAASM,KAAK;AACZC,MAAAA,KAAIC,MAAM,kCAAkCF,KAAAA;;;;;;IAC9C;EACF;EAEAG,SAASC,SAA+B;AACtC,QAAI;AACDC,aAAeC,WAAWH,SAASC,QAAQG,QAAQH,QAAQI,MAAM;IACpE,SAASR,KAAK;AACZC,MAAAA,KAAIC,MAAM,sBAAsBF,KAAAA;;;;;;IAClC;EACF;EAEAP,KAAKW,SAA4B;AAC/B,QAAI;AACF,YAAMK,QAAQ,KAAKC,gBAAgBN,OAAAA;AAClCC,aAAeC,WAAWb,KAAKgB,MAAME,UAAUF,MAAMG,MAAMH,MAAMI,UAAU;IAC9E,SAASb,KAAK;AACZC,MAAAA,KAAIC,MAAM,wBAAwBF,KAAAA;;;;;;IACpC;EACF;EAEAc,MAAMV,SAA6B;AACjC,QAAI;AACF,YAAMK,QAAQ,KAAKM,iBAAiBX,OAAAA;AACnCC,aAAeC,WAAWQ,MAAML,MAAMO,OAAOP,MAAMI,UAAU;IAChE,SAASb,KAAK;AACZC,MAAAA,KAAIC,MAAM,yBAAyBF,KAAAA;;;;;;IACrC;EACF;EAEA,MAAMiB,QAAuB;AAC3B,QAAI;AACF,YAAOZ,OAAeC,WAAWW,MAAM,CAACjB,QAAAA;AACtCkB,yBAAiBlB,GAAAA;MACnB,CAAA;IACF,SAASA,KAAK;AACZC,MAAAA,KAAIC,MAAM,6BAA6BF,KAAAA;;;;;;IACzC;EACF;EAEA,MAAMmB,QAAuB;EAAC;AAChC;",
-  "names": ["snippet", "log", "log", "TelemetryEvent", "getIdentityOptions", "did", "installationId", "log", "warn", "userId", "anonymousId", "AbstractSegmentTelemetry", "_getTags", "createPageProps", "options", "properties", "rest", "common", "custom", "createTrackProps", "event", "action", "TelemetryEvent", "ACTION", "SegmentTelemetry", "AbstractSegmentTelemetry", "apiKey", "batchSize", "getTags", "contents", "snippet", "min", "page", "script", "document", "createElement", "innerHTML", "body", "append", "err", "log", "catch", "identify", "options", "window", "analytics", "userId", "traits", "props", "createPageProps", "category", "name", "properties", "track", "createTrackProps", "event", "flush", "captureException", "close"]
-}

package/dist/lib/browser/observability-EEM6BEY6.mjs

@@ -1,10 +0,0 @@
-import {
-  Observability
-} from "./chunk-33TCMAUB.mjs";
-import "./chunk-MWTIKIBZ.mjs";
-import "./chunk-5OQYI27L.mjs";
-import "./chunk-YEPQFAES.mjs";
-export {
-  Observability
-};
-//# sourceMappingURL=observability-EEM6BEY6.mjs.map