@dxos/observability 0.8.4-main.c85a9c8dae → 0.8.4-main.d05539e30a

package/dist/lib/node-esm/index.mjs

@@ -24,10 +24,10 @@ import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
 
 // src/storage/node.ts
+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";
 var showObservabilityBanner = async (configDir, bannercb) => {
   const path = join(configDir, ".observability-banner-printed");
@@ -114,12 +114,7 @@ var ObservabilityImpl = class {
       this._subscriptions.add(...cleanups.filter((cleanup) => cleanup !== void 0));
       this._initialized = true;
     }).pipe(Effect.catchAll((error) => Effect.gen(this, function* () {
-      log.catch(error, void 0, {
-        F: __dxlog_file,
-        L: 85,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 32, S: this });
       for (const extension of initializedExtensions) {
         if (extension.close) {
           yield* extension.close().pipe(Effect.catchAll(() => Effect.succeed(void 0)));
@@ -168,27 +163,11 @@ var ObservabilityImpl = class {
     });
   }
   _addExtension(extension) {
-    invariant(!this._initialized, "Observability is already initialized", {
-      F: __dxlog_file,
-      L: 142,
-      S: this,
-      A: [
-        "!this._initialized",
-        "'Observability is already initialized'"
-      ]
-    });
+    invariant(!this._initialized, "Observability is already initialized", { "~LogMeta": "~LogMeta", F: __dxlog_file, 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_file,
-      L: 147,
-      S: this,
-      A: [
-        "!this._initialized",
-        "'Observability is already initialized'"
-      ]
-    });
+    invariant(!this._initialized, "Observability is already initialized", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 86, S: this, A: ["!this._initialized", "'Observability is already initialized'"] });
     this._dataProviders.push(dataProvider);
   }
   /**
@@ -248,10 +227,12 @@ var ObservabilityImpl = class {
   }
   get feedback() {
     return {
-      captureUserFeedback: (form) => {
+      captureUserFeedback: async (form) => {
+        let eventUuid;
         for (const extension of this._getExtensions("feedback")) {
-          extension.captureUserFeedback(form);
+          eventUuid = await extension.captureUserFeedback(form) ?? eventUuid;
         }
+        return eventUuid;
       }
     };
   }
@@ -297,29 +278,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_file,
-    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_file, L: 196, 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_file,
-    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_file, L: 202, S: this, A: ["'_addDataProvider' in observability && typeof observability._addDataProvider === 'function'", ""] });
   observability._addDataProvider(dataProvider);
   return observability;
 });
@@ -349,6 +314,7 @@ import * as Effect3 from "effect/Effect";
 import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
+import { resolveTelemetryTag } from "@dxos/config";
 import { LogLevel, log as log2 } from "@dxos/log";
 import { isNode, isNonNullable } from "@dxos/util";
 
@@ -356,8 +322,8 @@ import { isNode, isNonNullable } from "@dxos/util";
 var cli_observability_secrets_default = {
   POSTHOG_API_KEY: null,
   IPDATA_API_KEY: "73dfdecdf979c18f07d50cf841bbdd9e589f237256326ac8cca23786",
-  OTEL_ENDPOINT: "https://ingest.eu.signoz.cloud:443",
-  OTEL_HEADERS: "signoz-ingestion-key: 5300e0c9-a5e8-4a10-9c61-f473e539c0b7"
+  OTEL_ENDPOINT: "/api/otel",
+  OTEL_HEADERS: null
 };
 
 // src/extensions/stub.ts
@@ -392,49 +358,60 @@ var extensions = Effect3.fn(function* ({
   metrics: metricsEnabled = false,
   traces: tracesEnabled = false
 }) {
-  const { OtelLogs } = yield* Effect3.promise(() => import("./logs-7J45KLM7.mjs"));
-  const { OtelMetrics } = yield* Effect3.promise(() => import("./metrics-H7DDLYSG.mjs"));
-  const { OtelTraces } = yield* Effect3.promise(() => import("./traces-KMTHMYFX.mjs"));
+  const { OtelLogs } = yield* Effect3.promise(() => import("./logs-ARJUVN3T.mjs"));
+  const { OtelMetrics } = yield* Effect3.promise(() => import("./metrics-DREJOOAC.mjs"));
+  const { OtelTraces } = yield* Effect3.promise(() => import("./traces-74F7JUKF.mjs"));
   const cachedDisabled = yield* Effect3.promise(() => isObservabilityDisabled(serviceName));
-  const enabledRef = yield* Ref.make(!cachedDisabled);
+  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 rawEndpoint = isNode() ? process.env.DX_OTEL_ENDPOINT ?? _endpoint ?? cli_observability_secrets_default.OTEL_ENDPOINT : config.values.runtime?.app?.env?.DX_OTEL_ENDPOINT ?? _endpoint;
+  const endpoint = !isNode() && rawEndpoint?.startsWith("/") ? resolveRelativeEndpoint(rawEndpoint) : rawEndpoint;
   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) {
-    log2.info("Missing OTEL_ENDPOINT or OTEL_HEADERS", void 0, {
-      F: __dxlog_file2,
-      L: 77,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+  if (!endpoint) {
+    log2.info("Missing OTEL_ENDPOINT", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 35, 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);
+  }
   const resource = defaultResource().merge(resourceFromAttributes({
     [ATTR_SERVICE_NAME]: serviceName,
     [ATTR_SERVICE_VERSION]: serviceVersion,
-    "deployment.environment": environment
+    "session.id": crypto.randomUUID(),
+    "deployment.environment": environment,
+    "dxos.process.type": detectProcessType(),
+    ...clientTag ? {
+      "ctx.tag": clientTag
+    } : {}
   }));
   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;
-  return {
+  const extension = {
     initialize: () => Effect3.sync(() => {
+      if (disabled) {
+        return;
+      }
       if (logs) {
         log2.runtimeConfig.processors.push(logs.logProcessor);
       }
@@ -451,12 +428,28 @@ var extensions = Effect3.fn(function* ({
       yield* Ref.update(enabledRef, () => false);
     }),
     close: () => Effect3.promise(async () => {
-      await logs?.close();
-      await metrics?.close();
+      const results = await Promise.allSettled([
+        logs?.close(),
+        metrics?.close()
+      ]);
+      for (const result of results) {
+        if (result.status === "rejected") {
+          log2.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 120, S: this });
+        }
+      }
+      await traces?.close();
     }),
     flush: () => Effect3.promise(async () => {
-      await logs?.flush();
-      await metrics?.flush();
+      const results = await Promise.allSettled([
+        logs?.flush(),
+        metrics?.flush()
+      ]);
+      for (const result of results) {
+        if (result.status === "rejected") {
+          log2.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 135, S: this });
+        }
+      }
+      await traces?.flush();
     }),
     setTags: (incomingTags) => {
       for (const [key, value2] of Object.entries(incomingTags)) {
@@ -484,7 +477,39 @@ var extensions = Effect3.fn(function* ({
       } : void 0
     ].filter(isNonNullable)
   };
+  return extension;
 });
+var isObservabilityDisabledSync = (serviceName) => {
+  if (isNode()) {
+    return process.env.DX_DISABLE_OBSERVABILITY === "true";
+  }
+  try {
+    if (typeof localStorage !== "undefined") {
+      return localStorage.getItem(`${serviceName}/observability-disabled`) === "true";
+    }
+  } catch {
+  }
+  return false;
+};
+var detectProcessType = () => {
+  if (isNode()) {
+    return "node";
+  }
+  if (typeof window !== "undefined") {
+    return "browser";
+  }
+  if (typeof globalThis.ServiceWorkerGlobalScope !== "undefined") {
+    return "service-worker";
+  }
+  if (typeof globalThis.SharedWorkerGlobalScope !== "undefined") {
+    return "shared-worker";
+  }
+  return "dedicated-worker";
+};
+var resolveRelativeEndpoint = (path) => {
+  const origin = globalThis.location?.origin;
+  return origin ? `${origin}${path}` : path;
+};
 var parseHeaders = (unparsedHeaders) => {
   return unparsedHeaders.split(";").reduce((acc, header) => {
     const [key, ...rest] = header.split(":");
@@ -503,7 +528,7 @@ __export(posthog_exports, {
 
 // src/extensions/posthog/extension.ts
 import * as Effect4 from "effect/Effect";
-import { LogBuffer, log as log3 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/sdk/observability/src/extensions/posthog/extension.ts";
 var uploadLogs = async (body) => {
   try {
@@ -517,12 +542,7 @@ var uploadLogs = async (body) => {
     if (!response.ok) {
       log3.warn("feedback log upload failed", {
         status: response.status
-      }, {
-        F: __dxlog_file3,
-        L: 34,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 17, S: void 0 });
       return void 0;
     }
     const { key } = await response.json();
@@ -530,41 +550,26 @@ var uploadLogs = async (body) => {
   } catch (err) {
     log3.warn("feedback log upload error", {
       error: err
-    }, {
-      F: __dxlog_file3,
-      L: 40,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, 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") {
-    log3("PostHog is being stubbed because it is running in a worker.", void 0, {
-      F: __dxlog_file3,
-      L: 54,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log3("PostHog is being stubbed because it is running in a worker.", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, 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) {
-    log3.info("Missing POSTHOG_API_KEY or POSTHOG_API_HOST", void 0, {
-      F: __dxlog_file3,
-      L: 62,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log3.info("Missing POSTHOG_API_KEY or POSTHOG_API_HOST", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 40, S: this });
     return stubExtension;
   }
   const { default: posthog } = yield* Effect4.promise(() => import("posthog-js"));
-  const { logProcessor } = yield* Effect4.promise(() => import("./log-processor-TKJVJJSJ.mjs"));
-  const logBuffer = externalLogBuffer ?? new LogBuffer();
+  const { logProcessor } = yield* Effect4.promise(() => import("./log-processor-ZODHERST.mjs"));
   let feedbackSurveyAvailable = null;
+  let unregisterPosthogProcessors;
   const checkFeedbackSurveyAvailable = () => feedbackSurveyId ? Effect4.promise(() => {
     if (feedbackSurveyAvailable !== null) {
       return Promise.resolve(feedbackSurveyAvailable);
@@ -595,19 +600,15 @@ var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog:
           } : {}
         });
       }
-      log3.runtimeConfig.processors.push(logProcessor);
-      log3.runtimeConfig.processors.push(logBuffer.logProcessor);
+      unregisterPosthogProcessors?.();
+      const removePosthogLog = log3.addProcessor(logProcessor, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 79, S: this });
+      unregisterPosthogProcessors = () => {
+        removePosthogLog();
+      };
     }),
     close: () => Effect4.sync(() => {
-      for (const processor of [
-        logProcessor,
-        logBuffer.logProcessor
-      ]) {
-        const index = log3.runtimeConfig.processors.indexOf(processor);
-        if (index !== -1) {
-          log3.runtimeConfig.processors.splice(index, 1);
-        }
-      }
+      unregisterPosthogProcessors?.();
+      unregisterPosthogProcessors = void 0;
     }),
     enable: () => Effect4.sync(() => posthog.opt_in_capturing()),
     disable: () => Effect4.sync(() => posthog.opt_out_capturing()),
@@ -642,36 +643,47 @@ var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog:
         kind: "feedback",
         // TODO(wittjosiah): Support custom surveys.
         captureUserFeedback: (form) => {
-          posthog.getSurveys(async (surveys) => {
-            const survey = surveys.find((survey2) => survey2.id === feedbackSurveyId);
-            if (!survey || survey.questions.length === 0) {
-              log3.error("Missing feedback survey or survey has no questions", {
-                feedbackSurveyId
-              }, {
-                F: __dxlog_file3,
-                L: 151,
-                S: this,
-                C: (f, a) => f(...a)
-              });
-              return;
-            }
-            let debugLogDumpKey;
-            if (form.includeLogs !== false && logBuffer.size > 0) {
-              debugLogDumpKey = await uploadLogs(logBuffer.serialize());
-            }
-            const question = survey.questions[0];
-            posthog.capture("survey sent", {
-              $survey_id: survey.id,
-              $survey_questions: [
-                {
-                  id: question.id,
-                  question: question.question
+          return new Promise((resolve, reject) => {
+            posthog.getSurveys((surveys) => {
+              void (async () => {
+                try {
+                  const survey = surveys.find((survey2) => survey2.id === feedbackSurveyId);
+                  if (!survey || survey.questions.length === 0) {
+                    log3.error("Missing feedback survey or survey has no questions", {
+                      feedbackSurveyId
+                    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 127, S: this });
+                    resolve(void 0);
+                    return;
+                  }
+                  let debugLogDumpKey = null;
+                  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];
+                  const result = posthog.capture("survey sent", {
+                    $survey_id: survey.id,
+                    $survey_questions: [
+                      {
+                        id: question.id,
+                        question: question.question
+                      }
+                    ],
+                    [`$survey_response_${question.id}`]: form.message,
+                    debug_log_dump_key: debugLogDumpKey
+                  });
+                  resolve(result?.uuid);
+                } catch (err) {
+                  log3.error("Failed to capture user feedback", {
+                    err
+                  }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 157, S: this });
+                  reject(err);
                 }
-              ],
-              [`$survey_response_${question.id}`]: form.message,
-              ...debugLogDumpKey ? {
-                debug_log_dump_key: debugLogDumpKey
-              } : {}
+              })();
             });
           });
         },
@@ -737,19 +749,11 @@ var identityProvider = (clientServices) => Effect5.fn(function* (observability)
   });
 });
 var networkMetricsProvider = (clientServices) => Effect5.fn(function* (observability) {
-  const ctx = new Context(void 0, {
-    F: __dxlog_file4,
-    L: 61
-  });
+  const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 50 });
   let lastNetworkStatus;
   const updateSignalMetrics = new Event().debounce(NETWORK_METRICS_MIN_INTERVAL);
   updateSignalMetrics.on(ctx, async () => {
-    log4("send signal metrics", void 0, {
-      F: __dxlog_file4,
-      L: 67,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4("send signal metrics", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 55, S: this });
     lastNetworkStatus?.signaling?.forEach(({ server, state }) => {
       observability.metrics.gauge("dxos.client.network.signal.connectionState", state, {
         server
@@ -794,20 +798,11 @@ var networkMetricsProvider = (clientServices) => Effect5.fn(function* (observabi
   };
 });
 var runtimeMetricsProvider = (clientServices) => Effect5.fn(function* (observability) {
-  const ctx = new Context(void 0, {
-    F: __dxlog_file4,
-    L: 121
-  });
+  const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 100 });
+  log4("runtimeMetricsProvider: requesting platform from SystemService", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 101, S: this });
   const platform = yield* Effect5.promise(() => clientServices.SystemService.getPlatform());
-  invariant2(platform, "platform is required", {
-    F: __dxlog_file4,
-    L: 123,
-    S: this,
-    A: [
-      "platform",
-      "'platform is required'"
-    ]
-  });
+  log4("runtimeMetricsProvider: platform received", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 103, S: this });
+  invariant2(platform, "platform is required", { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 104, S: this, A: ["platform", "'platform is required'"] });
   observability.setTags({
     platformType: Platform.PLATFORM_TYPE[platform.type].toLowerCase(),
     platform: platform.platform,
@@ -831,33 +826,20 @@ var runtimeMetricsProvider = (clientServices) => Effect5.fn(function* (observabi
       }
     }).catch((error) => log4("platform error", {
       error
-    }, {
-      F: __dxlog_file4,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    }));
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, 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_file4,
-    L: 165
-  });
+  const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, 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 () => {
-    log4("send space metrics", void 0, {
-      F: __dxlog_file4,
-      L: 173,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log4("send space metrics", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 142, S: this });
     for (const data of mapSpaces(spaces, {
       truncateKeys: true
     })) {
@@ -978,12 +960,7 @@ var provider = (config) => (observability) => Effect6.gen(function* () {
 }).pipe(Effect6.provide(FetchHttpClient.layer), Effect6.catchAll((err) => Effect6.sync(() => {
   log5.verbose("ipdata fetch failed", {
     err
-  }, {
-    F: __dxlog_file5,
-    L: 88,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 54, S: void 0 });
 })));
 
 // src/providers/storage.ts