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

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License
-Copyright (c) 2023 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/dist/lib/browser/{chunk-3534PNWM.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-3534PNWM.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

@@ -204,10 +204,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;
       }
     };
   }
@@ -253,13 +255,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, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 194, 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: 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, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 200, 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: 202, S: this, A: ["'_addDataProvider' in observability && typeof observability._addDataProvider === 'function'", ""] });
   observability._addDataProvider(dataProvider);
   return observability;
 });
@@ -333,19 +335,22 @@ var extensions = Effect3.fn(function* ({
   metrics: metricsEnabled = false,
   traces: tracesEnabled = false
 }) {
-  const { OtelLogs } = yield* Effect3.promise(() => import("./logs-A2VDAHHD.mjs"));
-  const { OtelMetrics } = yield* Effect3.promise(() => import("./metrics-6OSN54ZV.mjs"));
-  const { OtelTraces } = yield* Effect3.promise(() => import("./traces-browser-6MRGAKFC.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 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) {
-    log3.info("Missing OTEL_ENDPOINT or OTEL_HEADERS", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 31, S: this });
+  if (!endpoint) {
+    log3.info("Missing OTEL_ENDPOINT", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, 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);
@@ -361,21 +366,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;
@@ -406,7 +411,7 @@ var extensions = Effect3.fn(function* ({
       ]);
       for (const result of results) {
         if (result.status === "rejected") {
-          log3.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 111, S: this });
+          log3.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 120, S: this });
         }
       }
       await traces?.close();
@@ -418,7 +423,7 @@ var extensions = Effect3.fn(function* ({
       ]);
       for (const result of results) {
         if (result.status === "rejected") {
-          log3.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 126, S: this });
+          log3.catch(result.reason, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 135, S: this });
         }
       }
       await traces?.flush();
@@ -478,6 +483,10 @@ var detectProcessType = () => {
   }
   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(":");
@@ -522,7 +531,7 @@ var uploadLogs = async (body) => {
     return void 0;
   }
 };
-var extensions2 = Effect4.fn(function* ({ config, release, environment, posthog: posthogConfig, logStore }) {
+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, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 33, S: this });
     return stubExtension;
@@ -611,32 +620,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) {
-              log4.error("Missing feedback survey or survey has no questions", {
-                feedbackSurveyId
-              }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 124, S: this });
-              return;
-            }
-            let debugLogDumpKey = null;
-            if (form.includeLogs !== false && logStore !== void 0) {
-              const ndjson = await logStore.export();
-              if (ndjson.length > 0) {
-                debugLogDumpKey = await uploadLogs(ndjson) ?? "failed";
-              }
-            }
-            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) {
+                    log4.error("Missing feedback survey or survey has no questions", {
+                      feedbackSurveyId
+                    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, 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) {
+                  log4.error("Failed to capture user feedback", {
+                    err
+                  }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 157, S: this });
+                  reject(err);
                 }
-              ],
-              [`$survey_response_${question.id}`]: form.message,
-              debug_log_dump_key: debugLogDumpKey
+              })();
             });
           });
         },