@dxos/observability 0.6.3-main.e6314a6 → 0.6.3-main.fe243fc

package/dist/lib/browser/{chunk-2CXA7PYK.mjs → chunk-7HCG6KYK.mjs}

@@ -1,3 +1,9 @@
+import {
+  captureException,
+  captureMessage,
+  withScope
+} from "./chunk-3LKCQYWD.mjs";
+
 // packages/sdk/observability/src/observability.ts
 import { Event, scheduleTaskInterval } from "@dxos/async";
 import { Context } from "@dxos/context";
@@ -13,9 +19,7 @@ var cli_observability_secrets_default = {
   TELEMETRY_API_KEY: "B00QG6PtJJrJ0VVFe0H5a6bcUUShKyZM",
   IPDATA_API_KEY: "73dfdecdf979c18f07d50cf841bbdd9e589f237256326ac8cca23786",
   DATADOG_API_KEY: null,
-  DATADOG_APP_KEY: null,
-  OTEL_ENDPOINT: null,
-  OTEL_AUTHORIZATION: null
+  DATADOG_APP_KEY: null
 };
 
 // packages/sdk/observability/src/helpers/browser-observability.ts
@@ -86,7 +90,7 @@ var initializeAppObservability = async ({ namespace, config, mode = "basic", tra
   const release = `${namespace}@${config.get("runtime.app.build.version")}`;
   const environment = config.get("runtime.app.env.DX_ENVIRONMENT");
   const observabilityDisabled = await isObservabilityDisabled(namespace);
-  const { Observability: Observability2 } = await import("./observability-MXAPN7J6.mjs");
+  const { Observability: Observability2 } = await import("./observability-IFDZJFY2.mjs");
   const observability = new Observability2({
     namespace,
     release,
@@ -136,7 +140,6 @@ var initializeAppObservability = async ({ namespace, config, mode = "basic", tra
       }
     };
     await observability.initialize();
-    observability.startErrorLogs();
     const ipData = await getIPData(config);
     ipData && observability.addIPDataTelemetryTags(ipData);
     if (typeof navigator !== "undefined" && navigator.storage?.estimate) {
@@ -148,7 +151,7 @@ var initializeAppObservability = async ({ namespace, config, mode = "basic", tra
         } catch (error) {
           log.warn("Failed to run estimate()", error, {
             F: __dxlog_file,
-            L: 171,
+            L: 170,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -158,7 +161,7 @@ var initializeAppObservability = async ({ namespace, config, mode = "basic", tra
   } catch (err) {
     log.error("Failed to initialize app observability", err, {
       F: __dxlog_file,
-      L: 176,
+      L: 175,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -382,6 +385,129 @@ var setupTelemetryListeners = (namespace, client, observability) => {
   };
 };
 
+// packages/sdk/observability/src/sentry/sentry-log-processor.ts
+import { InvariantViolation } from "@dxos/invariant";
+import { LogLevel, shouldLog } from "@dxos/log";
+import { CircularBuffer, getDebugName } from "@dxos/util";
+var MAX_LOG_BREADCRUMBS = 80;
+var SentryLogProcessor = class {
+  constructor() {
+    this._breadcrumbs = new CircularBuffer(MAX_LOG_BREADCRUMBS);
+    this.logProcessor = (config, entry) => {
+      const { level, meta, error } = entry;
+      if (!shouldLog(entry, config.captureFilters) || meta?.S?.remoteSessionId) {
+        return;
+      }
+      if (entry.level !== LogLevel.WARN && entry.level !== LogLevel.ERROR) {
+        return;
+      }
+      withScope((scope) => {
+        const severity = convertLevel(level);
+        scope.setLevel(severity);
+        scope.setContext("dxoslog", entry.context ?? null);
+        if (meta) {
+          scope.setTag("transaction", `${getRelativeFilename(meta.F)}:${meta.L}`);
+          if (meta.S?.hostSessionId) {
+            scope.setTags({
+              service_host_issue: true,
+              service_host_session: meta.S?.hostSessionId
+            });
+          }
+          if (!Number.isNaN(meta.S?.uptimeSeconds)) {
+            scope.setExtra("uptime_seconds", meta.S?.uptimeSeconds);
+          }
+        }
+        const extendedMessage = formatMessageForSentry(entry);
+        let capturedError = error;
+        if (capturedError == null && entry.level === LogLevel.ERROR) {
+          capturedError = Object.values(entry.context ?? {}).find((v) => v instanceof Error);
+        }
+        if (capturedError) {
+          if (capturedError instanceof InvariantViolation) {
+            scope.setExtra("invariant_violation", true);
+          }
+          const isMessageDifferentFromStackTrace = error == null;
+          if (isMessageDifferentFromStackTrace) {
+            scope.setExtra("message", extendedMessage);
+          }
+          const eventId2 = captureException(capturedError);
+          this._addBreadcrumb(eventId2, extendedMessage, severity, entry.context);
+          return;
+        }
+        scope.setFingerprint([
+          entry.message
+        ]);
+        const eventId = captureMessage(extendedMessage);
+        this._addBreadcrumb(eventId, extendedMessage, severity, entry.context);
+      });
+    };
+  }
+  addLogBreadcrumbsTo(event) {
+    event.breadcrumbs ??= [];
+    for (const breadcrumb of this._breadcrumbs) {
+      event.breadcrumbs.push(breadcrumb);
+    }
+    event.breadcrumbs.sort((b1, b2) => {
+      if (b1.timestamp === void 0 || b2.timestamp === void 0) {
+        return b1.timestamp === b2.timestamp ? 0 : b1.timestamp === void 0 ? -1 : 1;
+      }
+      return b1.timestamp - b2.timestamp;
+    });
+  }
+  _addBreadcrumb(eventId, message, severity, context) {
+    const breadcrumb = {
+      type: "console",
+      level: severity,
+      event_id: eventId,
+      category: "log",
+      message,
+      data: context,
+      timestamp: Math.floor(Date.now() / 1e3)
+    };
+    const lastRecorded = this._breadcrumbs.getLast();
+    if (lastRecorded && lastRecorded.message === breadcrumb.message) {
+      const firstBreadcrumbData = lastRecorded.data?.firstBreadcrumbData ?? lastRecorded.data ?? {};
+      const mergedBreadcrumbCount = Number.isNaN(lastRecorded.data?.mergedBreadcrumbCount) ? 1 : Number(lastRecorded.data?.mergedBreadcrumbCount);
+      lastRecorded.data = {
+        mergedBreadcrumbCount: mergedBreadcrumbCount + 1,
+        firstBreadcrumbData,
+        lastBreadcrumbData: breadcrumb.data
+      };
+      return;
+    }
+    this._breadcrumbs.push(breadcrumb);
+  }
+};
+var formatMessageForSentry = (entry) => {
+  let scopePrefix;
+  if (entry.meta?.S) {
+    const scope = entry.meta?.S;
+    scopePrefix = scope.name || getDebugName(scope);
+  }
+  if (scopePrefix == null) {
+    return entry.message;
+  }
+  const workerPrefix = entry.meta?.S?.hostSessionId ? "[worker] " : "";
+  return `${workerPrefix}${scopePrefix} ${entry.message}`;
+};
+var convertLevel = (level) => {
+  if (level === LogLevel.TRACE) {
+    return "debug";
+  }
+  if (level === LogLevel.WARN) {
+    return "warning";
+  }
+  return LogLevel[level].toLowerCase();
+};
+var getRelativeFilename = (filename) => {
+  const match = filename.match(/.+\/(packages\/.+\/.+)/);
+  if (match) {
+    const [, filePath] = match;
+    return filePath;
+  }
+  return filename;
+};
+
 // packages/sdk/observability/src/observability.ts
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/observability/src/observability.ts";
 var SPACE_METRICS_MIN_INTERVAL = 1e3 * 60;
@@ -393,7 +519,7 @@ var Observability = class {
     // TODO(nf): accept upstream context?
     this._ctx = new Context(void 0, {
       F: __dxlog_file3,
-      L: 91
+      L: 84
     });
     this._tags = /* @__PURE__ */ new Map();
     this.addIPDataTelemetryTags = (ipData) => {
@@ -440,8 +566,6 @@ var Observability = class {
       process.env.IPDATA_API_KEY && (mergedSecrets.IPDATA_API_KEY = process.env.IPDATA_API_KEY);
       process.env.DATADOG_API_KEY && (mergedSecrets.DATADOG_API_KEY = process.env.DATADOG_API_KEY);
       process.env.DATADOG_APP_KEY && (mergedSecrets.DATADOG_APP_KEY = process.env.DATADOG_APP_KEY);
-      process.env.DX_OTEL_ENDPOINT && (mergedSecrets.OTEL_ENDPOINT = process.env.DX_OTEL_ENDPOINT);
-      process.env.DX_OTEL_AUTHORIZATION && (mergedSecrets.OTEL_AUTHORIZATION = process.env.DX_OTEL_AUTHORIZATION);
       return mergedSecrets;
     } else {
       log3("config", {
@@ -449,7 +573,7 @@ var Observability = class {
         config
       }, {
         F: __dxlog_file3,
-        L: 156,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -461,8 +585,6 @@ var Observability = class {
         IPDATA_API_KEY: config?.get("runtime.app.env.DX_IPDATA_API_KEY"),
         DATADOG_API_KEY: config?.get("runtime.app.env.DX_DATADOG_API_KEY"),
         DATADOG_APP_KEY: config?.get("runtime.app.env.DX_DATADOG_APP_KEY"),
-        OTEL_ENDPOINT: config?.get("runtime.app.env.DX_OTEL_ENDPOINT"),
-        OTEL_AUTHORIZATION: config?.get("runtime.app.env.DX_OTEL_AUTHORIZATION"),
         ...secrets
       };
     }
@@ -471,14 +593,11 @@ var Observability = class {
     await this._initMetrics();
     await this._initTelemetry();
     await this._initErrorLogs();
-    await this._initTraces();
   }
   async close() {
-    const closes = [];
-    this._telemetry && closes.push(this._telemetry.close());
-    this._otelMetrics && closes.push(this._otelMetrics.close());
-    this._otelLogs && closes.push(this._otelLogs.close());
-    await Promise.all(closes);
+    if (this._telemetry) {
+      await this._telemetry.close();
+    }
     await this._ctx.dispose();
   }
   setMode(mode) {
@@ -511,7 +630,7 @@ var Observability = class {
             idqr
           }, {
             F: __dxlog_file3,
-            L: 226,
+            L: 210,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -527,7 +646,7 @@ var Observability = class {
             device: dqr
           }, {
             F: __dxlog_file3,
-            L: 236,
+            L: 220,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -535,7 +654,7 @@ var Observability = class {
         }
         invariant(dqr, "empty response from device service", {
           F: __dxlog_file3,
-          L: 239,
+          L: 223,
           S: this,
           A: [
             "dqr",
@@ -548,7 +667,7 @@ var Observability = class {
             device: dqr
           }, {
             F: __dxlog_file3,
-            L: 243,
+            L: 227,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -581,35 +700,7 @@ var Observability = class {
     } else {
       log3("datadog disabled", void 0, {
         F: __dxlog_file3,
-        L: 275,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-    if (this.enabled && this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION) {
-      const { OtelMetrics } = await import("./otel-BUKBDMAL.mjs");
-      this._otelMetrics = new OtelMetrics({
-        endpoint: this._secrets.OTEL_ENDPOINT,
-        authorizationHeader: this._secrets.OTEL_AUTHORIZATION,
-        serviceName: this._namespace,
-        serviceVersion: this.getTag("release")?.value ?? "0.0.0",
-        getTags: () => Object.fromEntries(Array.from(this._tags).filter(([key, value]) => {
-          return value.scope === "all" || value.scope === "metrics";
-        }).map(([key, value]) => [
-          key,
-          value.value
-        ]))
-      });
-      log3("otel metrics enabled", void 0, {
-        F: __dxlog_file3,
-        L: 294,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      log3("otel metrics disabled", void 0, {
-        F: __dxlog_file3,
-        L: 296,
+        L: 259,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -622,7 +713,6 @@ var Observability = class {
   */
   gauge(name, value, extraTags) {
     this._metrics?.gauge(name, value, extraTags);
-    this._otelMetrics?.gauge(name, value, extraTags);
   }
   // TODO(nf): Refactor into ObservabilityExtensions.
   startNetworkMetrics(clientServices) {
@@ -633,7 +723,7 @@ var Observability = class {
     updateSignalMetrics.on(this._ctx, async () => {
       log3("send signal metrics", void 0, {
         F: __dxlog_file3,
-        L: 319,
+        L: 281,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -685,7 +775,7 @@ var Observability = class {
     updateSpaceMetrics.on(this._ctx, async () => {
       log3("send space metrics", void 0, {
         F: __dxlog_file3,
-        L: 373,
+        L: 335,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -710,7 +800,7 @@ var Observability = class {
     updateSpaceTelemetry.on(this._ctx, async () => {
       log3("send space telemetry", void 0, {
         F: __dxlog_file3,
-        L: 384,
+        L: 346,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -746,7 +836,7 @@ var Observability = class {
     const platform = await client.services.services.SystemService?.getPlatform();
     invariant(platform, "platform is required", {
       F: __dxlog_file3,
-      L: 421,
+      L: 383,
       S: this,
       A: [
         "platform",
@@ -766,25 +856,31 @@ var Observability = class {
       }
     }
     scheduleTaskInterval(this._ctx, async () => {
-      if (client.services.constructor.name === "WorkerClientServices") {
-        const memory = window.performance.memory;
-        if (memory) {
-          this.gauge("dxos.client.runtime.heapTotal", memory.totalJSHeapSize);
-          this.gauge("dxos.client.runtime.heapUsed", memory.usedJSHeapSize);
-          this.gauge("dxos.client.runtime.heapSizeLimit", memory.jsHeapSizeLimit);
-        }
-      }
+      log3("platform", void 0, {
+        F: __dxlog_file3,
+        L: 402,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       client.services.services.SystemService?.getPlatform().then((platform2) => {
+        log3("platform", {
+          platform: platform2
+        }, {
+          F: __dxlog_file3,
+          L: 405,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         if (platform2.memory) {
-          this.gauge("dxos.client.services.runtime.rss", platform2.memory.rss);
-          this.gauge("dxos.client.services.runtime.heapTotal", platform2.memory.heapTotal);
-          this.gauge("dxos.client.services.runtime.heapUsed", platform2.memory.heapUsed);
+          this.gauge("dxos.client.runtime.rss", platform2.memory.rss);
+          this.gauge("dxos.client.runtime.heapTotal", platform2.memory.heapTotal);
+          this.gauge("dxos.client.runtime.heapUsed", platform2.memory.heapUsed);
         }
       }).catch((error) => log3("platform error", {
         error
       }, {
         F: __dxlog_file3,
-        L: 456,
+        L: 412,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -809,7 +905,7 @@ var Observability = class {
     } else {
       log3("segment disabled", void 0, {
         F: __dxlog_file3,
-        L: 482,
+        L: 438,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -836,9 +932,8 @@ var Observability = class {
   //
   async _initErrorLogs() {
     if (this._secrets.SENTRY_DESTINATION && this._mode !== "disabled") {
-      const { captureException, captureUserFeedback, init, setTag } = await import("./sentry/index.mjs");
-      const { SentryLogProcessor } = await import("./sentry-log-processor-DVUUOZ6G.mjs");
-      this._captureException = captureException;
+      const { captureException: captureException2, captureUserFeedback, init, setTag } = await import("./sentry/index.mjs");
+      this._captureException = captureException2;
       this._captureUserFeedback = captureUserFeedback;
       this._setTag = setTag;
       log3.info("Initializing Sentry", {
@@ -846,17 +941,18 @@ var Observability = class {
         options: this._errorReportingOptions
       }, {
         F: __dxlog_file3,
-        L: 518,
+        L: 473,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._sentryLogProcessor = new SentryLogProcessor();
+      const logProcessor = new SentryLogProcessor();
       init({
         ...this._errorReportingOptions,
         destination: this._secrets.SENTRY_DESTINATION,
         scrubFilenames: this._mode !== "full",
-        onError: (event) => this._sentryLogProcessor.addLogBreadcrumbsTo(event)
+        onError: (event) => logProcessor.addLogBreadcrumbsTo(event)
       });
+      log3.runtimeConfig.processors.push(logProcessor.logProcessor);
       this._tags.forEach((v, k) => {
         if (v.scope === "all" || v.scope === "errors") {
           setTag(k, v.value);
@@ -865,66 +961,11 @@ var Observability = class {
     } else {
       log3("sentry disabled", void 0, {
         F: __dxlog_file3,
-        L: 538,
+        L: 496,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    if (this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION && this._mode !== "disabled") {
-      const { OtelLogs } = await import("./otel-BUKBDMAL.mjs");
-      this._otelLogs = new OtelLogs({
-        endpoint: this._secrets.OTEL_ENDPOINT,
-        authorizationHeader: this._secrets.OTEL_AUTHORIZATION,
-        serviceName: this._namespace,
-        serviceVersion: this.getTag("release")?.value ?? "0.0.0",
-        getTags: () => Object.fromEntries(Array.from(this._tags).filter(([key, value]) => {
-          return value.scope === "all" || value.scope === "errors";
-        }).map(([key, value]) => [
-          key,
-          value.value
-        ]))
-      });
-      log3("otel logs enabled", {
-        namespace: this._namespace
-      }, {
-        F: __dxlog_file3,
-        L: 557,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      log3("otel logs disabled", void 0, {
-        F: __dxlog_file3,
-        L: 559,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  startErrorLogs() {
-    this._sentryLogProcessor && log3.runtimeConfig.processors.push(this._sentryLogProcessor.logProcessor);
-    this._otelLogs && log3.runtimeConfig.processors.push(this._otelLogs.logProcessor);
-  }
-  startTraces() {
-    this._otelTraces && this._otelTraces.start();
-  }
-  // TODO(nf): refactor init based on providers and their capabilities
-  async _initTraces() {
-    if (this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION && this._mode !== "disabled") {
-      const { OtelTraces } = await import("./otel-BUKBDMAL.mjs");
-      this._otelTraces = new OtelTraces({
-        endpoint: this._secrets.OTEL_ENDPOINT,
-        authorizationHeader: this._secrets.OTEL_AUTHORIZATION,
-        serviceName: this._namespace,
-        serviceVersion: this.getTag("release")?.value ?? "0.0.0",
-        getTags: () => Object.fromEntries(Array.from(this._tags).filter(([key, value]) => {
-          return value.scope === "all" || value.scope === "metrics";
-        }).map(([key, value]) => [
-          key,
-          value.value
-        ]))
-      });
-    }
   }
   /**
   * Manually capture an exception.
@@ -962,4 +1003,4 @@ export {
   mapSpaces,
   setupTelemetryListeners
 };
-//# sourceMappingURL=chunk-2CXA7PYK.mjs.map
+//# sourceMappingURL=chunk-7HCG6KYK.mjs.map