@morsehq-dev/sdk 0.5.0 → 0.6.0-rc.1

package/dist/index.js

@@ -1,13 +1,13 @@
-import { _setEnsureInitialized } from './chunk-ZZSVPAXM.js';
-export { log } from './chunk-ZZSVPAXM.js';
-import { instrumentAnthropic } from './chunk-J5FEPM7L.js';
-export { MAX_SEGMENT_CONTENT_BYTES, extractAnthropicSegments, instrumentAnthropic, isAnthropicWrapped, uninstallAnthropic, wrapAnthropic } from './chunk-J5FEPM7L.js';
-import './chunk-3ONFIKKC.js';
-import { absorbErrorsSync, absorbErrorsAsync } from './chunk-6FLGLD72.js';
+import { instrumentAnthropic } from './chunk-XS4P7XPV.js';
+export { MAX_SEGMENT_CONTENT_BYTES, extractAnthropicSegments, instrumentAnthropic, isAnthropicWrapped, uninstallAnthropic, wrapAnthropic } from './chunk-XS4P7XPV.js';
+import { _setEnsureInitialized } from './chunk-YVLEDBN7.js';
+export { log } from './chunk-YVLEDBN7.js';
+import './chunk-L7AD4KUD.js';
+import { absorbErrorsSync, absorbErrorsAsync } from './chunk-ERH3TNXZ.js';
 import './chunk-XTKMUJWI.js';
 import './chunk-4JPZV2VZ.js';
-import { init_env, init_otel_provider, init_redaction, init_diagnostics, init_tracing, init_spans, init_propagation, redactValue, generateTraceId, nowIso, SpanType, generateSpanId, buildTraceEntry, sendTrace, isDisabled, buildRedactionConfig, getApiKey, getFlushIntervalSeconds, setTransport, setRedactionConfig, setDiagnosticsClientConfig, isValidInternalSource, getInternalSource, setSource, getEngine, getMaxFieldBytes, getMaxBatchSize, getMaxQueueSize, getSampleRate, report, getEndpoint, DEFAULT_ENDPOINT, isAutoDetectDisabled, isDbCaptureEnabled, recordDrop, REASON_SHUTDOWN_DROP, REASON_QUEUE_FULL, setLevel, REASON_QUOTA_REJECTED, REASON_RETRY_EXHAUSTED, runSync, runAsync, setContext, startSpan, spanSync, spanAsync, flushOnce, _resetForTesting2, _resetForTesting, getLastTrace, getActiveTraceState } from './chunk-ZIMGB7IT.js';
-export { W3C_TRACEPARENT_HEADER, extractTraceparent, formatTraceparent, injectIntoRequestInit, injectTraceparent } from './chunk-ZIMGB7IT.js';
+import { init_env, init_otel_provider, init_redaction, init_diagnostics, init_tracing, init_spans, init_propagation, redactValue, generateTraceId, nowIso, SpanType, generateSpanId, buildTraceEntry, sendTrace, isDisabled, buildRedactionConfig, getApiKey, getFlushIntervalSeconds, setTransport, setRedactionConfig, setDiagnosticsClientConfig, isValidInternalSource, getInternalSource, setSource, getEngine, getMaxFieldBytes, getMaxBatchSize, getMaxQueueSize, getSampleRate, report, getEndpoint, DEFAULT_ENDPOINT, isAutoDetectDisabled, isDbCaptureEnabled, recordDrop, REASON_SHUTDOWN_DROP, REASON_QUEUE_FULL, REASON_ENCODE_FAILED, REASON_RETRY_EXHAUSTED, setLevel, REASON_QUOTA_REJECTED, REASON_AUTH_REJECTED, REASON_ENDPOINT_REJECTED, REASON_SEND_FAILED, runSync, runAsync, setContext, startSpan, spanSync, spanAsync, flushOnce, _resetForTesting2, _resetForTesting, getLastTrace, getActiveTraceState } from './chunk-HJV35HWL.js';
+export { W3C_TRACEPARENT_HEADER, extractTraceparent, formatTraceparent, injectIntoRequestInit, injectTraceparent } from './chunk-HJV35HWL.js';
 import { createRequire, Module } from 'module';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
 import { MySQL2Instrumentation } from '@opentelemetry/instrumentation-mysql2';
@@ -285,8 +285,35 @@ init_redaction();
 
 // src/_internal/transport.ts
 init_diagnostics();
-var SDK_VERSION = "0.5.0" ;
+var SDK_VERSION = "0.6.0-rc.1" ;
 var RETRY_AFTER_CAP_SECONDS = 30;
+var MAX_SEND_ATTEMPTS = 3;
+var BACKOFF_BASE_MS = 500;
+var BACKOFF_MAX_MS = 1e4;
+var DEFAULT_FLUSH_TIMEOUT_MS = 1e4;
+function backoffDelayMs(attempt) {
+  const base = Math.min(BACKOFF_MAX_MS, BACKOFF_BASE_MS * 2 ** (attempt - 1));
+  return base * (0.5 + Math.random());
+}
+function dropReasonFor(attempt, closed, deadline) {
+  if (closed) return REASON_SHUTDOWN_DROP;
+  if (attempt === 1 && Date.now() >= deadline) return REASON_SEND_FAILED;
+  return REASON_RETRY_EXHAUSTED;
+}
+function withDeadline(promise, deadline) {
+  const remaining = Math.max(0, deadline - Date.now());
+  let timer;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error("morse: flush deadline exceeded")), remaining);
+    })
+  ]).finally(() => clearTimeout(timer));
+}
+function sleepUntil(ms, deadline) {
+  const remaining = Math.max(0, Math.min(ms, deadline - Date.now()));
+  return new Promise((resolve) => setTimeout(resolve, remaining));
+}
 function parseRetryAfter(value) {
   if (!value) return null;
   const seconds = Number(value);
@@ -364,6 +391,7 @@ var BatchTransport = class {
   maxBatchSize;
   maxQueueSize;
   fetchTimeoutMs;
+  flushTimeoutMs;
   fetchImpl;
   queue = [];
   timer = null;
@@ -377,6 +405,7 @@ var BatchTransport = class {
     this.maxBatchSize = opts.maxBatchSize ?? 100;
     this.maxQueueSize = opts.maxQueueSize ?? 1e4;
     this.fetchTimeoutMs = opts.fetchTimeoutMs ?? 5e3;
+    this.flushTimeoutMs = opts.flushTimeoutMs ?? DEFAULT_FLUSH_TIMEOUT_MS;
     this.fetchImpl = opts.fetchImpl ?? globalThis.fetch.bind(globalThis);
     const intervalMs = Math.max(50, Math.round(this.flushIntervalSeconds * 1e3));
     this.timer = setInterval(() => {
@@ -467,56 +496,92 @@ var BatchTransport = class {
       await this.post(deriveLogsEndpoint(this.endpoint), { logs: logEntries });
     }
   }
-  async post(url, payload) {
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), this.fetchTimeoutMs);
+  async post(url, payload, deadline = Date.now() + this.flushTimeoutMs) {
+    let body;
     try {
-      const resp = await this.fetchImpl(url, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${this.apiKey}`,
-          "Content-Type": "application/json",
-          "User-Agent": `morse-typescript/${SDK_VERSION}`
-        },
-        body: JSON.stringify(payload),
-        signal: controller.signal
+      body = JSON.stringify(payload);
+    } catch (err) {
+      recordDrop(REASON_ENCODE_FAILED, categoryOf(payload), countPayloadEntries(payload));
+      report(err, {
+        fingerprint: "morse.transport.post.encode",
+        extra: { endpoint_host: hostnameOf(url), sdk_version: SDK_VERSION }
       });
-      setLevel(resp.headers.get("X-Morse-Diagnostics"));
-      const droppedCount = countPayloadEntries(payload);
-      const droppedCategory = categoryOf(payload);
-      if (resp.status === 429) {
-        await recordQuotaState(resp);
-        recordDrop(REASON_QUOTA_REJECTED, droppedCategory, droppedCount);
+      return;
+    }
+    const droppedCount = countPayloadEntries(payload);
+    const droppedCategory = categoryOf(payload);
+    for (let attempt = 1; attempt <= MAX_SEND_ATTEMPTS; attempt++) {
+      const lastAttempt = attempt >= MAX_SEND_ATTEMPTS;
+      const outOfTime = Date.now() >= deadline;
+      if (outOfTime && attempt > 1) {
+        recordDrop(REASON_RETRY_EXHAUSTED, droppedCategory, droppedCount);
+        return;
       }
-      if (!resp.ok) {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), this.fetchTimeoutMs);
+      try {
+        const resp = await withDeadline(
+          this.fetchImpl(url, {
+            method: "POST",
+            headers: {
+              Authorization: `Bearer ${this.apiKey}`,
+              "Content-Type": "application/json",
+              "User-Agent": `morse-typescript/${SDK_VERSION}`
+            },
+            body,
+            signal: controller.signal
+          }),
+          deadline
+        );
+        setLevel(resp.headers.get("X-Morse-Diagnostics"));
+        if (resp.ok) return;
+        if (resp.status === 429) await recordQuotaState(resp);
         let bodySnippet = "";
         try {
-          const text = await resp.text();
-          bodySnippet = text.slice(0, 200);
+          bodySnippet = (await resp.text()).slice(0, 200);
         } catch {
         }
-        if (resp.status !== 429) {
-          recordDrop(REASON_RETRY_EXHAUSTED, droppedCategory, droppedCount);
-        }
         report(new Error(`morse: batch POST returned ${resp.status} ${bodySnippet}`), {
           fingerprint: "morse.transport.post.non_2xx",
-          extra: {
-            endpoint_host: hostnameOf(url),
-            sdk_version: SDK_VERSION
+          extra: { endpoint_host: hostnameOf(url), sdk_version: SDK_VERSION }
+        });
+        if (resp.status === 429) {
+          if (lastAttempt) {
+            recordDrop(REASON_QUOTA_REJECTED, droppedCategory, droppedCount);
+            return;
           }
+          const retryAfter = parseRetryAfter(resp.headers.get("Retry-After"));
+          await sleepUntil((retryAfter ?? 0) * 1e3 + backoffDelayMs(attempt), deadline);
+          continue;
+        }
+        if (resp.status < 500) {
+          recordDrop(
+            resp.status === 401 || resp.status === 403 ? REASON_AUTH_REJECTED : REASON_ENDPOINT_REJECTED,
+            droppedCategory,
+            droppedCount
+          );
+          return;
+        }
+        if (lastAttempt || this.closed || Date.now() >= deadline) {
+          recordDrop(dropReasonFor(attempt, this.closed, deadline), droppedCategory, droppedCount);
+          return;
+        }
+        await sleepUntil(backoffDelayMs(attempt), deadline);
+        continue;
+      } catch (err) {
+        report(err, {
+          fingerprint: "morse.transport.post.network",
+          extra: { endpoint_host: hostnameOf(url), sdk_version: SDK_VERSION }
         });
-      }
-    } catch (err) {
-      recordDrop(REASON_RETRY_EXHAUSTED, categoryOf(payload), countPayloadEntries(payload));
-      report(err, {
-        fingerprint: "morse.transport.post.network",
-        extra: {
-          endpoint_host: hostnameOf(url),
-          sdk_version: SDK_VERSION
+        if (lastAttempt || this.closed || Date.now() >= deadline) {
+          recordDrop(dropReasonFor(attempt, this.closed, deadline), droppedCategory, droppedCount);
+          return;
         }
-      });
-    } finally {
-      clearTimeout(timeoutId);
+        await sleepUntil(backoffDelayMs(attempt), deadline);
+        continue;
+      } finally {
+        clearTimeout(timeoutId);
+      }
     }
   }
 };