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

package/dist/lib/node/{chunk-HBLKTDQE.cjs → chunk-63FCWS3M.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_HBLKTDQE_exports = {};
-__export(chunk_HBLKTDQE_exports, {
+var chunk_63FCWS3M_exports = {};
+__export(chunk_63FCWS3M_exports, {
   OBSERVABILITY_DISABLED_KEY: () => OBSERVABILITY_DISABLED_KEY,
   OBSERVABILITY_GROUP_KEY: () => OBSERVABILITY_GROUP_KEY,
   Observability: () => Observability,
@@ -43,7 +43,8 @@ __export(chunk_HBLKTDQE_exports, {
   storeObservabilityDisabled: () => storeObservabilityDisabled,
   storeObservabilityGroup: () => storeObservabilityGroup
 });
-module.exports = __toCommonJS(chunk_HBLKTDQE_exports);
+module.exports = __toCommonJS(chunk_63FCWS3M_exports);
+var import_chunk_HKBUNAUG = require("./chunk-HKBUNAUG.cjs");
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_invariant = require("@dxos/invariant");
@@ -59,14 +60,15 @@ var import_promises = require("node:fs/promises");
 var import_node_path = require("node:path");
 var import_uuid = require("uuid");
 var import_log3 = require("@dxos/log");
+var import_invariant2 = require("@dxos/invariant");
+var import_log4 = require("@dxos/log");
+var import_util2 = require("@dxos/util");
 var cli_observability_secrets_default = {
   SENTRY_DESTINATION: "https://2647916221e643869965e78469479aa4@o4504012000067584.ingest.sentry.io/4504012027265029",
   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
 };
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/observability/src/helpers/browser-observability.ts";
 var OBSERVABILITY_DISABLED_KEY = "observability-disabled";
@@ -133,7 +135,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-4R6M4JMU.cjs");
+  const { Observability: Observability2 } = await import("./observability-W7TVZP2V.cjs");
   const observability = new Observability2({
     namespace,
     release,
@@ -183,7 +185,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) {
@@ -195,7 +196,7 @@ var initializeAppObservability = async ({ namespace, config, mode = "basic", tra
         } catch (error) {
           import_log2.log.warn("Failed to run estimate()", error, {
             F: __dxlog_file,
-            L: 171,
+            L: 170,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -205,7 +206,7 @@ var initializeAppObservability = async ({ namespace, config, mode = "basic", tra
   } catch (err) {
     import_log2.log.error("Failed to initialize app observability", err, {
       F: __dxlog_file,
-      L: 176,
+      L: 175,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -414,6 +415,124 @@ var setupTelemetryListeners = (namespace, client, observability) => {
     window.removeEventListener("error", errorCallback);
   };
 };
+var MAX_LOG_BREADCRUMBS = 80;
+var SentryLogProcessor = class {
+  constructor() {
+    this._breadcrumbs = new import_util2.CircularBuffer(MAX_LOG_BREADCRUMBS);
+    this.logProcessor = (config, entry) => {
+      const { level, meta, error } = entry;
+      if (!(0, import_log4.shouldLog)(entry, config.captureFilters) || meta?.S?.remoteSessionId) {
+        return;
+      }
+      if (entry.level !== import_log4.LogLevel.WARN && entry.level !== import_log4.LogLevel.ERROR) {
+        return;
+      }
+      (0, import_chunk_HKBUNAUG.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 === import_log4.LogLevel.ERROR) {
+          capturedError = Object.values(entry.context ?? {}).find((v) => v instanceof Error);
+        }
+        if (capturedError) {
+          if (capturedError instanceof import_invariant2.InvariantViolation) {
+            scope.setExtra("invariant_violation", true);
+          }
+          const isMessageDifferentFromStackTrace = error == null;
+          if (isMessageDifferentFromStackTrace) {
+            scope.setExtra("message", extendedMessage);
+          }
+          const eventId2 = (0, import_chunk_HKBUNAUG.captureException)(capturedError);
+          this._addBreadcrumb(eventId2, extendedMessage, severity, entry.context);
+          return;
+        }
+        scope.setFingerprint([
+          entry.message
+        ]);
+        const eventId = (0, import_chunk_HKBUNAUG.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 || (0, import_util2.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 === import_log4.LogLevel.TRACE) {
+    return "debug";
+  }
+  if (level === import_log4.LogLevel.WARN) {
+    return "warning";
+  }
+  return import_log4.LogLevel[level].toLowerCase();
+};
+var getRelativeFilename = (filename) => {
+  const match = filename.match(/.+\/(packages\/.+\/.+)/);
+  if (match) {
+    const [, filePath] = match;
+    return filePath;
+  }
+  return filename;
+};
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/observability/src/observability.ts";
 var SPACE_METRICS_MIN_INTERVAL = 1e3 * 60;
 var SPACE_TELEMETRY_MIN_INTERVAL = 1e3 * 60 * 60;
@@ -423,7 +542,7 @@ var Observability = class {
   constructor({ namespace, environment, release, config, secrets, group, mode, telemetry, errorLog }) {
     this._ctx = new import_context.Context(void 0, {
       F: __dxlog_file3,
-      L: 91
+      L: 84
     });
     this._tags = /* @__PURE__ */ new Map();
     this.addIPDataTelemetryTags = (ipData) => {
@@ -470,8 +589,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 {
       (0, import_log.log)("config", {
@@ -479,7 +596,7 @@ var Observability = class {
         config
       }, {
         F: __dxlog_file3,
-        L: 156,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -491,8 +608,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
       };
     }
@@ -501,14 +616,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) {
@@ -541,7 +653,7 @@ var Observability = class {
             idqr
           }, {
             F: __dxlog_file3,
-            L: 226,
+            L: 210,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -557,7 +669,7 @@ var Observability = class {
             device: dqr
           }, {
             F: __dxlog_file3,
-            L: 236,
+            L: 220,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -565,7 +677,7 @@ var Observability = class {
         }
         (0, import_invariant.invariant)(dqr, "empty response from device service", {
           F: __dxlog_file3,
-          L: 239,
+          L: 223,
           S: this,
           A: [
             "dqr",
@@ -578,7 +690,7 @@ var Observability = class {
             device: dqr
           }, {
             F: __dxlog_file3,
-            L: 243,
+            L: 227,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -611,35 +723,7 @@ var Observability = class {
     } else {
       (0, import_log.log)("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-TSHMOAB4.cjs");
-      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
-        ]))
-      });
-      (0, import_log.log)("otel metrics enabled", void 0, {
-        F: __dxlog_file3,
-        L: 294,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      (0, import_log.log)("otel metrics disabled", void 0, {
-        F: __dxlog_file3,
-        L: 296,
+        L: 259,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -652,7 +736,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) {
@@ -663,7 +746,7 @@ var Observability = class {
     updateSignalMetrics.on(this._ctx, async () => {
       (0, import_log.log)("send signal metrics", void 0, {
         F: __dxlog_file3,
-        L: 319,
+        L: 281,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -715,7 +798,7 @@ var Observability = class {
     updateSpaceMetrics.on(this._ctx, async () => {
       (0, import_log.log)("send space metrics", void 0, {
         F: __dxlog_file3,
-        L: 373,
+        L: 335,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -740,7 +823,7 @@ var Observability = class {
     updateSpaceTelemetry.on(this._ctx, async () => {
       (0, import_log.log)("send space telemetry", void 0, {
         F: __dxlog_file3,
-        L: 384,
+        L: 346,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -776,7 +859,7 @@ var Observability = class {
     const platform = await client.services.services.SystemService?.getPlatform();
     (0, import_invariant.invariant)(platform, "platform is required", {
       F: __dxlog_file3,
-      L: 421,
+      L: 383,
       S: this,
       A: [
         "platform",
@@ -796,25 +879,31 @@ var Observability = class {
       }
     }
     (0, import_async.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);
-        }
-      }
+      (0, import_log.log)("platform", void 0, {
+        F: __dxlog_file3,
+        L: 402,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       client.services.services.SystemService?.getPlatform().then((platform2) => {
+        (0, import_log.log)("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) => (0, import_log.log)("platform error", {
         error
       }, {
         F: __dxlog_file3,
-        L: 456,
+        L: 412,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -839,7 +928,7 @@ var Observability = class {
     } else {
       (0, import_log.log)("segment disabled", void 0, {
         F: __dxlog_file3,
-        L: 482,
+        L: 438,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -866,9 +955,8 @@ var Observability = class {
   //
   async _initErrorLogs() {
     if (this._secrets.SENTRY_DESTINATION && this._mode !== "disabled") {
-      const { captureException, captureUserFeedback, init, setTag } = await import("./sentry/index.cjs");
-      const { SentryLogProcessor } = await import("./sentry-log-processor-H6FUSKZI.cjs");
-      this._captureException = captureException;
+      const { captureException: captureException2, captureUserFeedback, init, setTag } = await import("./sentry/index.cjs");
+      this._captureException = captureException2;
       this._captureUserFeedback = captureUserFeedback;
       this._setTag = setTag;
       import_log.log.info("Initializing Sentry", {
@@ -876,17 +964,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)
       });
+      import_log.log.runtimeConfig.processors.push(logProcessor.logProcessor);
       this._tags.forEach((v, k) => {
         if (v.scope === "all" || v.scope === "errors") {
           setTag(k, v.value);
@@ -895,65 +984,10 @@ var Observability = class {
     } else {
       (0, import_log.log)("sentry disabled", void 0, {
         F: __dxlog_file3,
-        L: 538,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-    if (this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION && this._mode !== "disabled") {
-      const { OtelLogs } = await import("./otel-TSHMOAB4.cjs");
-      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
-        ]))
-      });
-      (0, import_log.log)("otel logs enabled", {
-        namespace: this._namespace
-      }, {
-        F: __dxlog_file3,
-        L: 557,
+        L: 496,
         S: this,
         C: (f, a) => f(...a)
       });
-    } else {
-      (0, import_log.log)("otel logs disabled", void 0, {
-        F: __dxlog_file3,
-        L: 559,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  startErrorLogs() {
-    this._sentryLogProcessor && import_log.log.runtimeConfig.processors.push(this._sentryLogProcessor.logProcessor);
-    this._otelLogs && import_log.log.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-TSHMOAB4.cjs");
-      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
-        ]))
-      });
     }
   }
   /**
@@ -992,4 +1026,4 @@ var Observability = class {
   storeObservabilityDisabled,
   storeObservabilityGroup
 });
-//# sourceMappingURL=chunk-HBLKTDQE.cjs.map
+//# sourceMappingURL=chunk-63FCWS3M.cjs.map