@dxos/observability 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

package/dist/lib/browser/{chunk-K4VFBKST.mjs → chunk-PSFTIG54.mjs}

@@ -6,8 +6,15 @@ var setDiagLogger = (level) => {
     diag.setLogger(new DiagConsoleLogger(), logLevel);
   }
 };
+var resolveOtlpUrl = (url) => {
+  if (typeof window !== "undefined" && url.startsWith("/")) {
+    return new URL(url, window.location.origin).toString();
+  }
+  return url;
+};
 
 export {
-  setDiagLogger
+  setDiagLogger,
+  resolveOtlpUrl
 };
-//# sourceMappingURL=chunk-K4VFBKST.mjs.map
+//# sourceMappingURL=chunk-PSFTIG54.mjs.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/extensions/otel/otel.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';\nimport { type Resource } from '@opentelemetry/resources';\n\nexport type OtelOptions = {\n  endpoint: string;\n  headers: Record<string, string>;\n  resource: Resource;\n  getTags: () => { [key: string]: string };\n  consoleDiagLogLevel?: string;\n};\n\nexport const setDiagLogger = (level?: string) => {\n  const logLevel = DiagLogLevel[level as keyof typeof DiagLogLevel];\n  if (logLevel) {\n    diag.setLogger(new DiagConsoleLogger(), logLevel);\n  }\n};\n\n/**\n * Resolve a possibly-relative OTLP exporter URL to an absolute URL.\n * The OpenTelemetry browser HTTP exporter validates user-provided URLs with `new URL(url)`,\n * which throws on relative paths like `/api/otel/v1/logs`. In a browser context we resolve\n * against `window.location.origin`; outside the browser we return the input unchanged.\n */\nexport const resolveOtlpUrl = (url: string): string => {\n  if (typeof window !== 'undefined' && url.startsWith('/')) {\n    return new URL(url, window.location.origin).toString();\n  }\n  return url;\n};\n"],
+  "mappings": ";AAIA,SAASA,mBAAmBC,cAAcC,YAAY;AAW/C,IAAMC,gBAAgB,CAACC,UAAAA;AAC5B,QAAMC,WAAWJ,aAAaG,KAAAA;AAC9B,MAAIC,UAAU;AACZH,SAAKI,UAAU,IAAIN,kBAAAA,GAAqBK,QAAAA;EAC1C;AACF;AAQO,IAAME,iBAAiB,CAACC,QAAAA;AAC7B,MAAI,OAAOC,WAAW,eAAeD,IAAIE,WAAW,GAAA,GAAM;AACxD,WAAO,IAAIC,IAAIH,KAAKC,OAAOG,SAASC,MAAM,EAAEC,SAAQ;EACtD;AACA,SAAON;AACT;",
+  "names": ["DiagConsoleLogger", "DiagLogLevel", "diag", "setDiagLogger", "level", "logLevel", "setLogger", "resolveOtlpUrl", "url", "window", "startsWith", "URL", "location", "origin", "toString"]
+}

package/dist/lib/browser/index.mjs

@@ -30,23 +30,13 @@ var __dxlog_file = "/__w/dxos/dxos/packages/sdk/observability/src/storage/browse
 var OBSERVABILITY_DISABLED_KEY = "observability-disabled";
 var OBSERVABILITY_GROUP_KEY = "observability-group";
 var showObservabilityBanner = () => {
-  log.warn("showObservabilityBanner is not supported in browser contexts.", void 0, {
-    F: __dxlog_file,
-    L: 16,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
+  log.warn("showObservabilityBanner is not supported in browser contexts.", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 11, S: void 0 });
 };
 var isObservabilityDisabled = async (namespace) => {
   try {
     return await localForage.getItem(compositeKey(namespace, OBSERVABILITY_DISABLED_KEY)) === "true";
   } catch (err) {
-    log.catch("Failed to check if observability is disabled, assuming it is", err, {
-      F: __dxlog_file,
-      L: 26,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log.catch("Failed to check if observability is disabled, assuming it is", err, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 19, S: void 0 });
     return true;
   }
 };
@@ -54,12 +44,7 @@ var storeObservabilityDisabled = async (namespace, value2) => {
   try {
     await localForage.setItem(compositeKey(namespace, OBSERVABILITY_DISABLED_KEY), String(value2));
   } catch (err) {
-    log.catch("Failed to store observability disabled", err, {
-      F: __dxlog_file,
-      L: 38,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log.catch("Failed to store observability disabled", err, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 29, S: void 0 });
   }
   try {
     if (typeof localStorage !== "undefined") {
@@ -72,24 +57,14 @@ var getObservabilityGroup = async (namespace) => {
   try {
     return await localForage.getItem(compositeKey(namespace, OBSERVABILITY_GROUP_KEY)) ?? void 0;
   } catch (err) {
-    log.catch("Failed to get observability group", err, {
-      F: __dxlog_file,
-      L: 58,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log.catch("Failed to get observability group", err, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 47, S: void 0 });
   }
 };
 var storeObservabilityGroup = async (namespace, value2) => {
   try {
     await localForage.setItem(compositeKey(namespace, OBSERVABILITY_GROUP_KEY), value2);
   } catch (err) {
-    log.catch("Failed to store observability group", err, {
-      F: __dxlog_file,
-      L: 69,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log.catch("Failed to store observability group", err, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 56, S: void 0 });
   }
 };
 
@@ -116,12 +91,7 @@ var ObservabilityImpl = class {
       this._subscriptions.add(...cleanups.filter((cleanup) => cleanup !== void 0));
       this._initialized = true;
     }).pipe(Effect.catchAll((error) => Effect.gen(this, function* () {
-      log2.catch(error, void 0, {
-        F: __dxlog_file2,
-        L: 85,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 32, S: this });
       for (const extension of initializedExtensions) {
         if (extension.close) {
           yield* extension.close().pipe(Effect.catchAll(() => Effect.succeed(void 0)));
@@ -170,27 +140,11 @@ var ObservabilityImpl = class {
     });
   }
   _addExtension(extension) {
-    invariant(!this._initialized, "Observability is already initialized", {
-      F: __dxlog_file2,
-      L: 142,
-      S: this,
-      A: [
-        "!this._initialized",
-        "'Observability is already initialized'"
-      ]
-    });
+    invariant(!this._initialized, "Observability is already initialized", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 82, S: this, A: ["!this._initialized", "'Observability is already initialized'"] });
     this._extensions.push(extension);
   }
   _addDataProvider(dataProvider) {
-    invariant(!this._initialized, "Observability is already initialized", {
-      F: __dxlog_file2,
-      L: 147,
-      S: this,
-      A: [
-        "!this._initialized",
-        "'Observability is already initialized'"
-      ]
-    });
+    invariant(!this._initialized, "Observability is already initialized", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 86, S: this, A: ["!this._initialized", "'Observability is already initialized'"] });
     this._dataProviders.push(dataProvider);
   }
   /**
@@ -299,29 +253,13 @@ var make = () => Effect.succeed(new ObservabilityImpl());
 var addExtension = (_extension) => Effect.fn(function* (_observability) {
   const observability = yield* _observability;
   const extension = yield* _extension;
-  invariant("_addExtension" in observability && typeof observability._addExtension === "function", void 0, {
-    F: __dxlog_file2,
-    L: 276,
-    S: this,
-    A: [
-      "'_addExtension' in observability && typeof observability._addExtension === 'function'",
-      ""
-    ]
-  });
+  invariant("_addExtension" in observability && typeof observability._addExtension === "function", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 194, S: this, A: ["'_addExtension' in observability && typeof observability._addExtension === 'function'", ""] });
   observability._addExtension(extension);
   return observability;
 });
 var addDataProvider = (dataProvider) => Effect.fn(function* (_observability) {
   const observability = yield* _observability;
-  invariant("_addDataProvider" in observability && typeof observability._addDataProvider === "function", void 0, {
-    F: __dxlog_file2,
-    L: 284,
-    S: this,
-    A: [
-      "'_addDataProvider' in observability && typeof observability._addDataProvider === 'function'",
-      ""
-    ]
-  });
+  invariant("_addDataProvider" in observability && typeof observability._addDataProvider === "function", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 200, S: this, A: ["'_addDataProvider' in observability && typeof observability._addDataProvider === 'function'", ""] });
   observability._addDataProvider(dataProvider);
   return observability;
 });
@@ -395,24 +333,21 @@ var extensions = Effect3.fn(function* ({
   metrics: metricsEnabled = false,
   traces: tracesEnabled = false
 }) {
-  const { OtelLogs } = yield* Effect3.promise(() => import("./logs-ATTRIUTL.mjs"));
-  const { OtelMetrics } = yield* Effect3.promise(() => import("./metrics-PKTV6IGF.mjs"));
-  const { OtelTraces } = yield* Effect3.promise(() => import("./traces-browser-Y4FFWRIR.mjs"));
+  const { OtelLogs } = yield* Effect3.promise(() => import("./logs-UTNIFYHF.mjs"));
+  const { OtelMetrics } = yield* Effect3.promise(() => import("./metrics-PRGSYAZJ.mjs"));
+  const { OtelTraces } = yield* Effect3.promise(() => import("./traces-browser-XRINKQUA.mjs"));
   const cachedDisabled = yield* Effect3.promise(() => isObservabilityDisabled(serviceName));
   const disabled = cachedDisabled || isObservabilityDisabledSync(serviceName);
   const enabledRef = yield* Ref.make(!disabled);
   const tags = /* @__PURE__ */ new Map();
-  const endpoint = isNode() ? process.env.DX_OTEL_ENDPOINT ?? _endpoint ?? cli_observability_secrets_default.OTEL_ENDPOINT : config.values.runtime?.app?.env?.DX_OTEL_ENDPOINT;
+  const endpoint = isNode() ? process.env.DX_OTEL_ENDPOINT ?? _endpoint ?? cli_observability_secrets_default.OTEL_ENDPOINT : config.values.runtime?.app?.env?.DX_OTEL_ENDPOINT ?? _endpoint;
   const headers = _headers ?? Match.value(isNode()).pipe(Match.when(true, () => Option.fromNullable(process.env.DX_OTEL_HEADERS ?? cli_observability_secrets_default.OTEL_HEADERS)), Match.when(false, () => Option.fromNullable(config.values.runtime?.app?.env?.DX_OTEL_HEADERS)), Match.exhaustive, Option.map((raw) => parseHeaders(raw)), Option.getOrElse(() => void 0));
-  if (!endpoint || !headers) {
-    log3.info("Missing OTEL_ENDPOINT or OTEL_HEADERS", void 0, {
-      F: __dxlog_file3,
-      L: 78,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+  if (!endpoint) {
+    log3.info("Missing OTEL_ENDPOINT", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 31, S: this });
     return stubExtension;
   }
+  const resolvedHeaders = headers ?? {};
+  const resolvedEndpoint = !isNode() && endpoint.startsWith("/") ? `${globalThis.location.origin}${endpoint}` : endpoint;
   const clientTag = resolveTelemetryTag(config);
   if (clientTag) {
     tags.set("ctx.tag", clientTag);
@@ -428,21 +363,21 @@ var extensions = Effect3.fn(function* ({
     } : {}
   }));
   const logs = logsEnabled ? new OtelLogs({
-    endpoint,
-    headers,
+    endpoint: resolvedEndpoint,
+    headers: resolvedHeaders,
     resource,
     getTags: () => Object.fromEntries(tags),
     logLevel
   }) : void 0;
   const metrics = metricsEnabled ? new OtelMetrics({
-    endpoint,
-    headers,
+    endpoint: resolvedEndpoint,
+    headers: resolvedHeaders,
     resource,
     getTags: () => Object.fromEntries(tags)
   }) : void 0;
   const traces = tracesEnabled ? new OtelTraces({
-    endpoint,
-    headers,
+    endpoint: resolvedEndpoint,
+    headers: resolvedHeaders,
     resource,
     getTags: () => Object.fromEntries(tags)
   }) : void 0;
@@ -473,12 +408,7 @@ var extensions = Effect3.fn(function* ({
       ]);
       for (const result of results) {
         if (result.status === "rejected") {
-          log3.catch(result.reason, void 0, {
-            F: __dxlog_file3,
-            L: 170,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          log3.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 116, S: this });
         }
       }
       await traces?.close();
@@ -490,12 +420,7 @@ var extensions = Effect3.fn(function* ({
       ]);
       for (const result of results) {
         if (result.status === "rejected") {
-          log3.catch(result.reason, void 0, {
-            F: __dxlog_file3,
-            L: 183,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          log3.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 131, S: this });
         }
       }
       await traces?.flush();
@@ -573,7 +498,7 @@ __export(posthog_exports, {
 
 // src/extensions/posthog/extension.ts
 import * as Effect4 from "effect/Effect";
-import { LogBuffer, log as log4 } from "@dxos/log";
+import { log as log4 } from "@dxos/log";
 var __dxlog_file4 = "/__w/dxos/dxos/packages/sdk/observability/src/extensions/posthog/extension.ts";
 var uploadLogs = async (body) => {
   try {
@@ -587,12 +512,7 @@ var uploadLogs = async (body) => {
     if (!response.ok) {
       log4.warn("feedback log upload failed", {
         status: response.status
-      }, {
-        F: __dxlog_file4,
-        L: 34,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 17, S: void 0 });
       return void 0;
     }
     const { key } = await response.json();
@@ -600,40 +520,24 @@ var uploadLogs = async (body) => {
   } catch (err) {
     log4.warn("feedback log upload error", {
       error: err
-    }, {
-      F: __dxlog_file4,
-      L: 40,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 25, S: void 0 });
     return void 0;
   }
 };
-var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog: posthogConfig, logBuffer: externalLogBuffer }) {
+var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog: posthogConfig, logStore, feedbackLogMaxSize }) {
   if (typeof window === "undefined") {
-    log4("PostHog is being stubbed because it is running in a worker.", void 0, {
-      F: __dxlog_file4,
-      L: 54,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4("PostHog is being stubbed because it is running in a worker.", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 33, S: this });
     return stubExtension;
   }
   const feedbackSurveyId = config.get("runtime.app.env.DX_POSTHOG_FEEDBACK_SURVEY_ID");
   const apiKey = config.get("runtime.app.env.DX_POSTHOG_API_KEY");
   const api_host = config.get("runtime.app.env.DX_POSTHOG_API_HOST");
   if (!apiKey || !api_host) {
-    log4.info("Missing POSTHOG_API_KEY or POSTHOG_API_HOST", void 0, {
-      F: __dxlog_file4,
-      L: 62,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4.info("Missing POSTHOG_API_KEY or POSTHOG_API_HOST", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 40, S: this });
     return stubExtension;
   }
   const { default: posthog } = yield* Effect4.promise(() => import("posthog-js"));
-  const { logProcessor } = yield* Effect4.promise(() => import("./log-processor-A6PJG6CM.mjs"));
-  const logBuffer = externalLogBuffer ?? new LogBuffer();
+  const { logProcessor } = yield* Effect4.promise(() => import("./log-processor-HPHWNBOK.mjs"));
   let feedbackSurveyAvailable = null;
   let unregisterPosthogProcessors;
   const checkFeedbackSurveyAvailable = () => feedbackSurveyId ? Effect4.promise(() => {
@@ -667,21 +571,9 @@ var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog:
         });
       }
       unregisterPosthogProcessors?.();
-      const removePosthogLog = log4.addProcessor(logProcessor, void 0, {
-        F: __dxlog_file4,
-        L: 105,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      const removeLogBuffer = log4.addProcessor(logBuffer.logProcessor, void 0, {
-        F: __dxlog_file4,
-        L: 106,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      const removePosthogLog = log4.addProcessor(logProcessor, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 79, S: this });
       unregisterPosthogProcessors = () => {
         removePosthogLog();
-        removeLogBuffer();
       };
     }),
     close: () => Effect4.sync(() => {
@@ -726,17 +618,17 @@ var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog:
             if (!survey || survey.questions.length === 0) {
               log4.error("Missing feedback survey or survey has no questions", {
                 feedbackSurveyId
-              }, {
-                F: __dxlog_file4,
-                L: 153,
-                S: this,
-                C: (f, a) => f(...a)
-              });
+              }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 124, S: this });
               return;
             }
             let debugLogDumpKey = null;
-            if (form.includeLogs !== false && logBuffer.size > 0) {
-              debugLogDumpKey = await uploadLogs(logBuffer.serialize()) ?? "failed";
+            if (form.includeLogs !== false && logStore !== void 0) {
+              const ndjson = await logStore.export({
+                maxSize: feedbackLogMaxSize
+              });
+              if (ndjson.length > 0) {
+                debugLogDumpKey = await uploadLogs(ndjson) ?? "failed";
+              }
             }
             const question = survey.questions[0];
             posthog.capture("survey sent", {
@@ -814,19 +706,11 @@ var identityProvider = (clientServices) => Effect5.fn(function* (observability)
   });
 });
 var networkMetricsProvider = (clientServices) => Effect5.fn(function* (observability) {
-  const ctx = new Context(void 0, {
-    F: __dxlog_file5,
-    L: 61
-  });
+  const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 50 });
   let lastNetworkStatus;
   const updateSignalMetrics = new Event().debounce(NETWORK_METRICS_MIN_INTERVAL);
   updateSignalMetrics.on(ctx, async () => {
-    log5("send signal metrics", void 0, {
-      F: __dxlog_file5,
-      L: 67,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log5("send signal metrics", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 55, S: this });
     lastNetworkStatus?.signaling?.forEach(({ server, state }) => {
       observability.metrics.gauge("dxos.client.network.signal.connectionState", state, {
         server
@@ -871,20 +755,11 @@ var networkMetricsProvider = (clientServices) => Effect5.fn(function* (observabi
   };
 });
 var runtimeMetricsProvider = (clientServices) => Effect5.fn(function* (observability) {
-  const ctx = new Context(void 0, {
-    F: __dxlog_file5,
-    L: 121
-  });
+  const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 100 });
+  log5("runtimeMetricsProvider: requesting platform from SystemService", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 101, S: this });
   const platform = yield* Effect5.promise(() => clientServices.SystemService.getPlatform());
-  invariant2(platform, "platform is required", {
-    F: __dxlog_file5,
-    L: 123,
-    S: this,
-    A: [
-      "platform",
-      "'platform is required'"
-    ]
-  });
+  log5("runtimeMetricsProvider: platform received", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 103, S: this });
+  invariant2(platform, "platform is required", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 104, S: this, A: ["platform", "'platform is required'"] });
   observability.setTags({
     platformType: Platform.PLATFORM_TYPE[platform.type].toLowerCase(),
     platform: platform.platform,
@@ -908,33 +783,20 @@ var runtimeMetricsProvider = (clientServices) => Effect5.fn(function* (observabi
       }
     }).catch((error) => log5("platform error", {
       error
-    }, {
-      F: __dxlog_file5,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    }));
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 126, S: this }));
   }, RUNTIME_METRICS_MIN_INTERVAL);
   return async () => {
     await ctx.dispose();
   };
 });
 var spacesMetricsProvider = (client) => Effect5.fn(function* (observability) {
-  const ctx = new Context(void 0, {
-    F: __dxlog_file5,
-    L: 165
-  });
+  const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 135 });
   const spaces = client.spaces.get();
   const subscriptions = /* @__PURE__ */ new Map();
   ctx.onDispose(() => subscriptions.forEach((subscription) => subscription.unsubscribe()));
   const updateSpaceMetrics = new Event().debounce(SPACE_METRICS_MIN_INTERVAL);
   updateSpaceMetrics.on(ctx, async () => {
-    log5("send space metrics", void 0, {
-      F: __dxlog_file5,
-      L: 173,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log5("send space metrics", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 142, S: this });
     for (const data of mapSpaces(spaces, {
       truncateKeys: true
     })) {
@@ -1055,12 +917,7 @@ var provider = (config) => (observability) => Effect6.gen(function* () {
 }).pipe(Effect6.provide(FetchHttpClient.layer), Effect6.catchAll((err) => Effect6.sync(() => {
   log6.verbose("ipdata fetch failed", {
     err
-  }, {
-    F: __dxlog_file6,
-    L: 88,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 54, S: void 0 });
 })));
 
 // src/providers/storage.ts