@zuplo/cli 7.7.8 → 7.7.9

package/node_modules/@posthog/core/dist/logs/index.js

@@ -33,7 +33,9 @@ __webpack_require__.d(__webpack_exports__, {
 const external_logs_utils_js_namespaceObject = require("./logs-utils.js");
 const external_types_js_namespaceObject = require("../types.js");
 const index_js_namespaceObject = require("../utils/index.js");
-const MAX_FLUSH_BACKOFF_EXPONENT = 6;
+const flush_timer_js_namespaceObject = require("../utils/flush-timer.js");
+const retry_after_js_namespaceObject = require("../utils/retry-after.js");
+const backoff_js_namespaceObject = require("../utils/backoff.js");
 class PostHogLogs {
     constructor(_instance, _config, _logger, _getContext, _onReady, _waitForStoragePersist = ()=>Promise.resolve(), _scopeName){
         this._instance = _instance;
@@ -43,10 +45,13 @@ class PostHogLogs {
         this._onReady = _onReady;
         this._waitForStoragePersist = _waitForStoragePersist;
         this._scopeName = _scopeName;
+        this._flushTimer = new flush_timer_js_namespaceObject.FlushTimer(()=>this._flushInBackground());
         this._flushPromise = null;
         this._evictedSinceAdvance = 0;
         this._queueGeneration = 0;
+        this._retryAfter = new retry_after_js_namespaceObject.RetryAfterWindow();
         this._consecutiveFlushFailures = 0;
+        this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
         this._intervalWindowStart = 0;
         this._intervalLogCount = 0;
         this._droppedWarned = false;
@@ -62,15 +67,22 @@ class PostHogLogs {
         this._instance.setPersistedProperty(external_types_js_namespaceObject.PostHogPersistedProperty.LogsQueue, []);
     }
     reset() {
-        this._clearFlushTimer();
+        this._flushTimer.clear();
         this._intervalWindowStart = 0;
         this._intervalLogCount = 0;
         this._droppedWarned = false;
         this._consecutiveFlushFailures = 0;
+        this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
+        this._retryAfter.reset();
         this._maxBatchRecordsPerPost = this._config.maxBatchRecordsPerPost;
     }
     onReconnect() {
         this._consecutiveFlushFailures = 0;
+        this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
+        if (this._retryAfter.isOpen()) {
+            if (this._hasQueuedRecords()) this._armFlushTimer();
+            return;
+        }
         this._flushInBackground();
     }
     captureLog(options, capturedAt) {
@@ -135,7 +147,7 @@ class PostHogLogs {
         return this._flushPromise;
     }
     async _flushInner() {
-        this._clearFlushTimer();
+        this._flushTimer.clear();
         let queue = this._instance.getPersistedProperty(external_types_js_namespaceObject.PostHogPersistedProperty.LogsQueue) ?? [];
         if (0 === queue.length) return;
         const originalQueueLength = queue.length;
@@ -151,11 +163,13 @@ class PostHogLogs {
             if (this._queueGeneration !== generation) return;
             if ('too-large' === outcome.kind && batch.length > 1) {
                 this._maxBatchRecordsPerPost = Math.max(1, Math.floor(batch.length / 2));
-                this._logger.warn(`Received 413 when sending logs batch of size ${batch.length}, reducing batch size to ${this._maxBatchRecordsPerPost}`);
+                this._logger.warn(`Logs batch of size ${batch.length} was too large for the ingestion endpoint, reducing batch size to ${this._maxBatchRecordsPerPost}`);
                 continue;
             }
+            this._retryAfter.record(outcome);
+            if (this._flushTimer.pending) this._flushTimer.arm(Math.max(this._flushIntervalMs, this._retryAfter.remainingMs()));
             if ('retry-later' === outcome.kind) throw outcome.error;
-            if ('too-large' === outcome.kind) this._logger.warn('Dropping a single log record after 413 with batch size 1 — the record is larger than the server cap and cannot be split further.');
+            if ('too-large' === outcome.kind) this._logger.warn('Dropping a single log record with batch size 1 — the record is larger than the server cap and cannot be split further.');
             else if ('ok' === outcome.kind && this._maxBatchRecordsPerPost < this._config.maxBatchRecordsPerPost) this._maxBatchRecordsPerPost = Math.min(this._config.maxBatchRecordsPerPost, this._maxBatchRecordsPerPost + 1);
             await this._persistQueueAdvance(batch.length);
             queue = this._instance.getPersistedProperty(external_types_js_namespaceObject.PostHogPersistedProperty.LogsQueue) ?? [];
@@ -183,26 +197,22 @@ class PostHogLogs {
         }
         queue.push(entry);
         this._instance.setPersistedProperty(external_types_js_namespaceObject.PostHogPersistedProperty.LogsQueue, queue);
-        if (queue.length >= this._maxBufferSize) return void this._flushInBackground();
+        if (queue.length >= this._maxBufferSize && !this._retryAfter.isOpen()) return void this._flushInBackground();
         this._armFlushTimer();
     }
-    _armFlushTimer(delayMs = this._flushIntervalMs) {
-        if (this._flushTimer) return;
-        this._flushTimer = (0, index_js_namespaceObject.safeSetTimeout)(()=>{
-            this._flushTimer = void 0;
-            this._flushInBackground();
-        }, delayMs);
+    _armFlushTimer() {
+        if (this._flushTimer.pending) return;
+        this._flushTimer.arm(Math.max(this._flushIntervalMs, this._retryAfter.remainingMs()));
     }
     _nextFlushDelay() {
-        const exponent = Math.min(Math.max(0, this._consecutiveFlushFailures - 1), MAX_FLUSH_BACKOFF_EXPONENT);
-        return this._flushIntervalMs * 2 ** exponent;
+        return Math.max((0, backoff_js_namespaceObject.backoffDelayMs)(this._flushIntervalMs, this._consecutiveFlushFailures, this._flushJitter, backoff_js_namespaceObject.MAX_FLUSH_BACKOFF_MS), this._retryAfter.remainingMs());
     }
     _hasQueuedRecords() {
         const queue = this._instance.getPersistedProperty(external_types_js_namespaceObject.PostHogPersistedProperty.LogsQueue);
         return !!queue && queue.length > 0;
     }
     async shutdown(timeoutMs) {
-        this._clearFlushTimer();
+        this._flushTimer.clear();
         const flushPromise = this.flush().catch(()=>{});
         if (void 0 === timeoutMs) return void await flushPromise;
         await (0, index_js_namespaceObject.raceWithTimeout)(flushPromise, timeoutMs);
@@ -216,19 +226,15 @@ class PostHogLogs {
     _flushInBackground() {
         this.flush().then(()=>{
             this._consecutiveFlushFailures = 0;
+            this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
         }, (err)=>{
             this._consecutiveFlushFailures++;
+            this._flushJitter = (0, backoff_js_namespaceObject.drawJitter)();
             this._logger.error('PostHog logs flush failed:', err);
         }).finally(()=>{
-            if (!this._instance.isDisabled && this._hasQueuedRecords()) this._armFlushTimer(this._nextFlushDelay());
+            if (!this._instance.isDisabled && this._hasQueuedRecords()) this._flushTimer.armNoEarlierThan(this._nextFlushDelay());
         });
     }
-    _clearFlushTimer() {
-        if (this._flushTimer) {
-            clearTimeout(this._flushTimer);
-            this._flushTimer = void 0;
-        }
-    }
 }
 exports.PostHogLogs = __webpack_exports__.PostHogLogs;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/node_modules/@posthog/core/dist/logs/index.mjs

@@ -1,7 +1,9 @@
 import { buildOtlpLogRecord, buildOtlpLogsPayload, buildResourceAttributes } from "./logs-utils.mjs";
 import { PostHogPersistedProperty } from "../types.mjs";
-import { isArray, raceWithTimeout, safeSetTimeout } from "../utils/index.mjs";
-const MAX_FLUSH_BACKOFF_EXPONENT = 6;
+import { isArray, raceWithTimeout } from "../utils/index.mjs";
+import { FlushTimer } from "../utils/flush-timer.mjs";
+import { RetryAfterWindow } from "../utils/retry-after.mjs";
+import { MAX_FLUSH_BACKOFF_MS, NO_JITTER, backoffDelayMs, drawJitter } from "../utils/backoff.mjs";
 class PostHogLogs {
     constructor(_instance, _config, _logger, _getContext, _onReady, _waitForStoragePersist = ()=>Promise.resolve(), _scopeName){
         this._instance = _instance;
@@ -11,10 +13,13 @@ class PostHogLogs {
         this._onReady = _onReady;
         this._waitForStoragePersist = _waitForStoragePersist;
         this._scopeName = _scopeName;
+        this._flushTimer = new FlushTimer(()=>this._flushInBackground());
         this._flushPromise = null;
         this._evictedSinceAdvance = 0;
         this._queueGeneration = 0;
+        this._retryAfter = new RetryAfterWindow();
         this._consecutiveFlushFailures = 0;
+        this._flushJitter = NO_JITTER;
         this._intervalWindowStart = 0;
         this._intervalLogCount = 0;
         this._droppedWarned = false;
@@ -30,15 +35,22 @@ class PostHogLogs {
         this._instance.setPersistedProperty(PostHogPersistedProperty.LogsQueue, []);
     }
     reset() {
-        this._clearFlushTimer();
+        this._flushTimer.clear();
         this._intervalWindowStart = 0;
         this._intervalLogCount = 0;
         this._droppedWarned = false;
         this._consecutiveFlushFailures = 0;
+        this._flushJitter = NO_JITTER;
+        this._retryAfter.reset();
         this._maxBatchRecordsPerPost = this._config.maxBatchRecordsPerPost;
     }
     onReconnect() {
         this._consecutiveFlushFailures = 0;
+        this._flushJitter = NO_JITTER;
+        if (this._retryAfter.isOpen()) {
+            if (this._hasQueuedRecords()) this._armFlushTimer();
+            return;
+        }
         this._flushInBackground();
     }
     captureLog(options, capturedAt) {
@@ -103,7 +115,7 @@ class PostHogLogs {
         return this._flushPromise;
     }
     async _flushInner() {
-        this._clearFlushTimer();
+        this._flushTimer.clear();
         let queue = this._instance.getPersistedProperty(PostHogPersistedProperty.LogsQueue) ?? [];
         if (0 === queue.length) return;
         const originalQueueLength = queue.length;
@@ -119,11 +131,13 @@ class PostHogLogs {
             if (this._queueGeneration !== generation) return;
             if ('too-large' === outcome.kind && batch.length > 1) {
                 this._maxBatchRecordsPerPost = Math.max(1, Math.floor(batch.length / 2));
-                this._logger.warn(`Received 413 when sending logs batch of size ${batch.length}, reducing batch size to ${this._maxBatchRecordsPerPost}`);
+                this._logger.warn(`Logs batch of size ${batch.length} was too large for the ingestion endpoint, reducing batch size to ${this._maxBatchRecordsPerPost}`);
                 continue;
             }
+            this._retryAfter.record(outcome);
+            if (this._flushTimer.pending) this._flushTimer.arm(Math.max(this._flushIntervalMs, this._retryAfter.remainingMs()));
             if ('retry-later' === outcome.kind) throw outcome.error;
-            if ('too-large' === outcome.kind) this._logger.warn('Dropping a single log record after 413 with batch size 1 — the record is larger than the server cap and cannot be split further.');
+            if ('too-large' === outcome.kind) this._logger.warn('Dropping a single log record with batch size 1 — the record is larger than the server cap and cannot be split further.');
             else if ('ok' === outcome.kind && this._maxBatchRecordsPerPost < this._config.maxBatchRecordsPerPost) this._maxBatchRecordsPerPost = Math.min(this._config.maxBatchRecordsPerPost, this._maxBatchRecordsPerPost + 1);
             await this._persistQueueAdvance(batch.length);
             queue = this._instance.getPersistedProperty(PostHogPersistedProperty.LogsQueue) ?? [];
@@ -151,26 +165,22 @@ class PostHogLogs {
         }
         queue.push(entry);
         this._instance.setPersistedProperty(PostHogPersistedProperty.LogsQueue, queue);
-        if (queue.length >= this._maxBufferSize) return void this._flushInBackground();
+        if (queue.length >= this._maxBufferSize && !this._retryAfter.isOpen()) return void this._flushInBackground();
         this._armFlushTimer();
     }
-    _armFlushTimer(delayMs = this._flushIntervalMs) {
-        if (this._flushTimer) return;
-        this._flushTimer = safeSetTimeout(()=>{
-            this._flushTimer = void 0;
-            this._flushInBackground();
-        }, delayMs);
+    _armFlushTimer() {
+        if (this._flushTimer.pending) return;
+        this._flushTimer.arm(Math.max(this._flushIntervalMs, this._retryAfter.remainingMs()));
     }
     _nextFlushDelay() {
-        const exponent = Math.min(Math.max(0, this._consecutiveFlushFailures - 1), MAX_FLUSH_BACKOFF_EXPONENT);
-        return this._flushIntervalMs * 2 ** exponent;
+        return Math.max(backoffDelayMs(this._flushIntervalMs, this._consecutiveFlushFailures, this._flushJitter, MAX_FLUSH_BACKOFF_MS), this._retryAfter.remainingMs());
     }
     _hasQueuedRecords() {
         const queue = this._instance.getPersistedProperty(PostHogPersistedProperty.LogsQueue);
         return !!queue && queue.length > 0;
     }
     async shutdown(timeoutMs) {
-        this._clearFlushTimer();
+        this._flushTimer.clear();
         const flushPromise = this.flush().catch(()=>{});
         if (void 0 === timeoutMs) return void await flushPromise;
         await raceWithTimeout(flushPromise, timeoutMs);
@@ -184,18 +194,14 @@ class PostHogLogs {
     _flushInBackground() {
         this.flush().then(()=>{
             this._consecutiveFlushFailures = 0;
+            this._flushJitter = NO_JITTER;
         }, (err)=>{
             this._consecutiveFlushFailures++;
+            this._flushJitter = drawJitter();
             this._logger.error('PostHog logs flush failed:', err);
         }).finally(()=>{
-            if (!this._instance.isDisabled && this._hasQueuedRecords()) this._armFlushTimer(this._nextFlushDelay());
+            if (!this._instance.isDisabled && this._hasQueuedRecords()) this._flushTimer.armNoEarlierThan(this._nextFlushDelay());
         });
     }
-    _clearFlushTimer() {
-        if (this._flushTimer) {
-            clearTimeout(this._flushTimer);
-            this._flushTimer = void 0;
-        }
-    }
 }
 export { PostHogLogs };

package/node_modules/@posthog/core/dist/logs/logs-utils.js

@@ -144,7 +144,7 @@ function buildOtlpLogsPayload(logRecords, resourceAttributes, scopeName, scopeVe
         resourceLogs: [
             {
                 resource: {
-                    attributes: (0, otlp_any_value_js_namespaceObject.toOtlpKeyValueList)(resourceAttributes)
+                    attributes: (0, otlp_resource_js_namespaceObject.toOtlpResourceKeyValueList)(resourceAttributes)
                 },
                 scopeLogs: [
                     {

package/node_modules/@posthog/core/dist/logs/logs-utils.mjs

@@ -1,7 +1,7 @@
 import { isNullish, isNumber, isUndefined } from "../utils/index.mjs";
 import { UNSERIALIZABLE_VALUE, sanitizeString } from "../utils/json-utils.mjs";
 import { toOtlpKeyValueList } from "../utils/otlp-any-value.mjs";
-import { buildOtlpResourceAttributes } from "../utils/otlp-resource.mjs";
+import { buildOtlpResourceAttributes, toOtlpResourceKeyValueList } from "../utils/otlp-resource.mjs";
 const OTLP_SEVERITY_MAP = {
     trace: {
         text: 'TRACE',
@@ -108,7 +108,7 @@ function buildOtlpLogsPayload(logRecords, resourceAttributes, scopeName, scopeVe
         resourceLogs: [
             {
                 resource: {
-                    attributes: toOtlpKeyValueList(resourceAttributes)
+                    attributes: toOtlpResourceKeyValueList(resourceAttributes)
                 },
                 scopeLogs: [
                     {

package/node_modules/@posthog/core/dist/logs/types.d.ts

@@ -93,8 +93,8 @@ export interface PostHogLogsConfig {
     maxBufferSize?: number;
     /**
      * Max records per outbound POST. Keeps each request under the server's
-     * 2 MB cap. On a 413 response, the SDK halves this value, retries the
-     * same records, then ramps back up by 1 per healthy send. A 413 on a
+     * request body cap. On a 413 response, the SDK halves this value, retries
+     * the same records, then ramps back up by 1 per healthy send. A 413 on a
      * single-record batch drops the record (it's larger than the server can
      * accept regardless of batch size). Default: 50 (RN) / 100 (browser).
      */

package/node_modules/@posthog/core/dist/metrics/index.d.ts

@@ -20,11 +20,14 @@ export declare class PostHogMetrics {
     private readonly _config;
     private readonly _logger;
     private _series;
-    private _flushTimer?;
+    private readonly _flushTimer;
     private _flushPromise;
     private _seriesCapWarned;
     private _typeByName;
     private _typeCollisionWarned;
+    private _retryAfter;
+    private _consecutiveFlushFailures;
+    private _flushJitter;
     private _generation;
     constructor(_instance: MetricsHost, _config: ResolvedPostHogMetricsConfig, _logger: Logger);
     count(name: string, value?: number, options?: CaptureMetricOptions): void;
@@ -51,7 +54,7 @@ export declare class PostHogMetrics {
     private _fold;
     private _runBeforeSend;
     private _armFlushTimer;
-    private _clearFlushTimer;
+    private _nextFlushDelay;
     private _doFlush;
     private _buildPayload;
     /**

package/node_modules/@posthog/core/dist/metrics/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/metrics/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAMpB,kBAAkB,EAEnB,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAWtC,OAAO,KAAK,EAAE,WAAW,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAA;AA2BxE;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc;IAmBvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IApB1B,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,WAAW,CAAC,CAAmC;IAGvD,OAAO,CAAC,aAAa,CAA6B;IAElD,OAAO,CAAC,gBAAgB,CAAQ;IAIhC,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,oBAAoB,CAAoB;IAIhD,OAAO,CAAC,WAAW,CAAI;gBAGJ,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,4BAA4B,EACrC,OAAO,EAAE,MAAM;IAGlC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI;IAI5E,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI;IAIxE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI;IAI5E,iFAAiF;IACjF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBtB;;;;;;OAMG;IACH,WAAW,IAAI,kBAAkB,GAAG,IAAI;IAYxC,2FAA2F;IAC3F,KAAK,IAAI,IAAI;IAUb,OAAO,CAAC,QAAQ;IAsEhB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,KAAK;IA6Bb,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,gBAAgB;YAOV,QAAQ;IAuCtB,OAAO,CAAC,aAAa;IASrB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAwDrB,oFAAoF;IACpF,OAAO,CAAC,gBAAgB;CAqCzB;AAED,OAAO,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AACnH,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/metrics/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAMpB,kBAAkB,EAEnB,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AActC,OAAO,KAAK,EAAE,WAAW,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAA;AA2BxE;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc;IA0BvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IA3B1B,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAI3B;IAGD,OAAO,CAAC,aAAa,CAA6B;IAElD,OAAO,CAAC,gBAAgB,CAAQ;IAIhC,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,oBAAoB,CAAoB;IAChD,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,yBAAyB,CAAI;IACrC,OAAO,CAAC,YAAY,CAAY;IAIhC,OAAO,CAAC,WAAW,CAAI;gBAGJ,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,4BAA4B,EACrC,OAAO,EAAE,MAAM;IAGlC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAU,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI;IAI5E,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI;IAIxE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI;IAI5E,iFAAiF;IACjF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBtB;;;;;;OAMG;IACH,WAAW,IAAI,kBAAkB,GAAG,IAAI;IAYxC,2FAA2F;IAC3F,KAAK,IAAI,IAAI;IAab,OAAO,CAAC,QAAQ;IAsEhB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,KAAK;IA6Bb,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,eAAe;YAYT,QAAQ;IAyDtB,OAAO,CAAC,aAAa;IASrB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAwDrB,oFAAoF;IACpF,OAAO,CAAC,gBAAgB;CAqCzB;AAED,OAAO,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AACnH,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA"}

package/node_modules/@posthog/core/dist/metrics/index.js

@@ -35,6 +35,9 @@ __webpack_require__.d(__webpack_exports__, {
     resolveMetricsConfig: ()=>external_config_js_namespaceObject.resolveMetricsConfig
 });
 const index_js_namespaceObject = require("../utils/index.js");
+const flush_timer_js_namespaceObject = require("../utils/flush-timer.js");
+const retry_after_js_namespaceObject = require("../utils/retry-after.js");
+const backoff_js_namespaceObject = require("../utils/backoff.js");
 const otlp_any_value_js_namespaceObject = require("../utils/otlp-any-value.js");
 const external_metrics_utils_js_namespaceObject = require("./metrics-utils.js");
 const external_config_js_namespaceObject = require("./config.js");
@@ -45,10 +48,16 @@ class PostHogMetrics {
         this._config = _config;
         this._logger = _logger;
         this._series = new Map();
+        this._flushTimer = new flush_timer_js_namespaceObject.FlushTimer(()=>this.flush().catch((e)=>{
+                this._logger.error('Metrics flush failed:', e);
+            }));
         this._flushPromise = null;
         this._seriesCapWarned = false;
         this._typeByName = new Map();
         this._typeCollisionWarned = new Set();
+        this._retryAfter = new retry_after_js_namespaceObject.RetryAfterWindow();
+        this._consecutiveFlushFailures = 0;
+        this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
         this._generation = 0;
     }
     count(name, value = 1, options) {
@@ -101,7 +110,10 @@ class PostHogMetrics {
     }
     reset() {
         this._generation++;
-        this._clearFlushTimer();
+        this._retryAfter.reset();
+        this._consecutiveFlushFailures = 0;
+        this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
+        this._flushTimer.clear();
         this._series = new Map();
         this._flushPromise = null;
         this._seriesCapWarned = false;
@@ -203,21 +215,14 @@ class PostHogMetrics {
         return result;
     }
     _armFlushTimer() {
-        if (this._flushTimer) return;
-        this._flushTimer = (0, index_js_namespaceObject.safeSetTimeout)(()=>{
-            this._flushTimer = void 0;
-            this.flush().catch((e)=>{
-                this._logger.error('Metrics flush failed:', e);
-            });
-        }, this._config.flushIntervalMs);
+        if (this._flushTimer.pending) return;
+        this._flushTimer.arm(this._nextFlushDelay());
     }
-    _clearFlushTimer() {
-        if (this._flushTimer) {
-            clearTimeout(this._flushTimer);
-            this._flushTimer = void 0;
-        }
+    _nextFlushDelay() {
+        return Math.max((0, backoff_js_namespaceObject.backoffDelayMs)(this._config.flushIntervalMs, this._consecutiveFlushFailures, this._flushJitter, backoff_js_namespaceObject.MAX_FLUSH_BACKOFF_MS), this._retryAfter.remainingMs());
     }
     async _doFlush() {
+        this._flushTimer.clear();
         if (0 === this._series.size) return;
         const window = this._series;
         this._series = new Map();
@@ -227,12 +232,21 @@ class PostHogMetrics {
         const generation = this._generation;
         const outcome = await this._instance._sendMetricsBatch(this._buildPayload(window));
         if (generation !== this._generation) return;
+        this._retryAfter.record(outcome);
+        if ('retry-later' === outcome.kind) {
+            this._consecutiveFlushFailures++;
+            this._flushJitter = (0, backoff_js_namespaceObject.drawJitter)();
+        } else {
+            this._consecutiveFlushFailures = 0;
+            this._flushJitter = backoff_js_namespaceObject.NO_JITTER;
+        }
+        if (this._flushTimer.pending) this._flushTimer.arm(this._nextFlushDelay());
         switch(outcome.kind){
             case 'ok':
                 return;
             case 'retry-later':
                 this._mergeWindowBack(window);
-                this._armFlushTimer();
+                this._flushTimer.armNoEarlierThan(this._nextFlushDelay());
                 return;
             case 'too-large':
                 this._logger.warn('Metrics batch exceeded the server size limit and was dropped');

package/node_modules/@posthog/core/dist/metrics/index.mjs

@@ -1,4 +1,7 @@
-import { isArray, safeSetTimeout } from "../utils/index.mjs";
+import { isArray } from "../utils/index.mjs";
+import { FlushTimer } from "../utils/flush-timer.mjs";
+import { RetryAfterWindow } from "../utils/retry-after.mjs";
+import { MAX_FLUSH_BACKOFF_MS, NO_JITTER, backoffDelayMs, drawJitter } from "../utils/backoff.mjs";
 import { toOtlpKeyValueList } from "../utils/otlp-any-value.mjs";
 import { DEFAULT_HISTOGRAM_BOUNDS, bucketIndexFor, buildMetricsResourceAttributes, buildOtlpMetricsPayload, msToUnixNano, seriesKey } from "./metrics-utils.mjs";
 const OTLP_TEMPORALITY_DELTA = 1;
@@ -8,10 +11,16 @@ class PostHogMetrics {
         this._config = _config;
         this._logger = _logger;
         this._series = new Map();
+        this._flushTimer = new FlushTimer(()=>this.flush().catch((e)=>{
+                this._logger.error('Metrics flush failed:', e);
+            }));
         this._flushPromise = null;
         this._seriesCapWarned = false;
         this._typeByName = new Map();
         this._typeCollisionWarned = new Set();
+        this._retryAfter = new RetryAfterWindow();
+        this._consecutiveFlushFailures = 0;
+        this._flushJitter = NO_JITTER;
         this._generation = 0;
     }
     count(name, value = 1, options) {
@@ -64,7 +73,10 @@ class PostHogMetrics {
     }
     reset() {
         this._generation++;
-        this._clearFlushTimer();
+        this._retryAfter.reset();
+        this._consecutiveFlushFailures = 0;
+        this._flushJitter = NO_JITTER;
+        this._flushTimer.clear();
         this._series = new Map();
         this._flushPromise = null;
         this._seriesCapWarned = false;
@@ -166,21 +178,14 @@ class PostHogMetrics {
         return result;
     }
     _armFlushTimer() {
-        if (this._flushTimer) return;
-        this._flushTimer = safeSetTimeout(()=>{
-            this._flushTimer = void 0;
-            this.flush().catch((e)=>{
-                this._logger.error('Metrics flush failed:', e);
-            });
-        }, this._config.flushIntervalMs);
+        if (this._flushTimer.pending) return;
+        this._flushTimer.arm(this._nextFlushDelay());
     }
-    _clearFlushTimer() {
-        if (this._flushTimer) {
-            clearTimeout(this._flushTimer);
-            this._flushTimer = void 0;
-        }
+    _nextFlushDelay() {
+        return Math.max(backoffDelayMs(this._config.flushIntervalMs, this._consecutiveFlushFailures, this._flushJitter, MAX_FLUSH_BACKOFF_MS), this._retryAfter.remainingMs());
     }
     async _doFlush() {
+        this._flushTimer.clear();
         if (0 === this._series.size) return;
         const window = this._series;
         this._series = new Map();
@@ -190,12 +195,21 @@ class PostHogMetrics {
         const generation = this._generation;
         const outcome = await this._instance._sendMetricsBatch(this._buildPayload(window));
         if (generation !== this._generation) return;
+        this._retryAfter.record(outcome);
+        if ('retry-later' === outcome.kind) {
+            this._consecutiveFlushFailures++;
+            this._flushJitter = drawJitter();
+        } else {
+            this._consecutiveFlushFailures = 0;
+            this._flushJitter = NO_JITTER;
+        }
+        if (this._flushTimer.pending) this._flushTimer.arm(this._nextFlushDelay());
         switch(outcome.kind){
             case 'ok':
                 return;
             case 'retry-later':
                 this._mergeWindowBack(window);
-                this._armFlushTimer();
+                this._flushTimer.armNoEarlierThan(this._nextFlushDelay());
                 return;
             case 'too-large':
                 this._logger.warn('Metrics batch exceeded the server size limit and was dropped');

package/node_modules/@posthog/core/dist/metrics/metrics-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics-utils.d.ts","sourceRoot":"","sources":["../../src/metrics/metrics-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAG1F,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAA;AAE3D;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,UAA4E,CAAA;AAEjH;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,SAAS,GAC3D,MAAM,CAOR;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAOtE;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,4BAA4B,EACpC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAEtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,UAAU,EAAE,EACrB,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACxD,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,kBAAkB,CAcpB"}
+{"version":3,"file":"metrics-utils.d.ts","sourceRoot":"","sources":["../../src/metrics/metrics-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAE1F,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAA;AAE3D;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,UAA4E,CAAA;AAEjH;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,SAAS,GAC3D,MAAM,CAOR;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAOtE;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,4BAA4B,EACpC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAEtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,UAAU,EAAE,EACrB,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACxD,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,kBAAkB,CAcpB"}

package/node_modules/@posthog/core/dist/metrics/metrics-utils.js

@@ -35,7 +35,6 @@ __webpack_require__.d(__webpack_exports__, {
     msToUnixNano: ()=>msToUnixNano,
     seriesKey: ()=>seriesKey
 });
-const otlp_any_value_js_namespaceObject = require("../utils/otlp-any-value.js");
 const otlp_resource_js_namespaceObject = require("../utils/otlp-resource.js");
 const DEFAULT_HISTOGRAM_BOUNDS = [
     0,
@@ -77,7 +76,7 @@ function buildOtlpMetricsPayload(metrics, resourceAttributes, scopeName, scopeVe
         resourceMetrics: [
             {
                 resource: {
-                    attributes: (0, otlp_any_value_js_namespaceObject.toOtlpKeyValueList)(resourceAttributes)
+                    attributes: (0, otlp_resource_js_namespaceObject.toOtlpResourceKeyValueList)(resourceAttributes)
                 },
                 scopeMetrics: [
                     {

package/node_modules/@posthog/core/dist/metrics/metrics-utils.mjs

@@ -1,5 +1,4 @@
-import { toOtlpKeyValueList } from "../utils/otlp-any-value.mjs";
-import { buildOtlpResourceAttributes } from "../utils/otlp-resource.mjs";
+import { buildOtlpResourceAttributes, toOtlpResourceKeyValueList } from "../utils/otlp-resource.mjs";
 const DEFAULT_HISTOGRAM_BOUNDS = [
     0,
     5,
@@ -40,7 +39,7 @@ function buildOtlpMetricsPayload(metrics, resourceAttributes, scopeName, scopeVe
         resourceMetrics: [
             {
                 resource: {
-                    attributes: toOtlpKeyValueList(resourceAttributes)
+                    attributes: toOtlpResourceKeyValueList(resourceAttributes)
                 },
                 scopeMetrics: [
                     {

package/node_modules/@posthog/core/dist/metrics/types.d.ts

@@ -6,8 +6,15 @@ export type SendMetricsBatchOutcome = {
 } | {
     kind: 'retry-later';
     error: unknown;
+    retryAfterMs?: number;
 } | {
     kind: 'too-large';
+    /**
+     * True when the SDK measured the body itself rather than the endpoint
+     * refusing it, so the caller can split this drain without lowering the
+     * batch size it keeps between them.
+     */
+    measuredLocally?: boolean;
 } | {
     kind: 'fatal';
     error: unknown;

package/node_modules/@posthog/core/dist/metrics/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/metrics/types.ts"],"names":[],"mappings":"AAEA,YAAY,EACV,oBAAoB,EACpB,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,oBAAoB,EACpB,YAAY,EACZ,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,kBAAkB,GACnB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAElG,yFAAyF;AACzF,MAAM,MAAM,uBAAuB,GAC/B;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAA;AAErC;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;IAChF,YAAY,IAAI,MAAM,CAAA;IACtB,iBAAiB,IAAI,MAAM,CAAA;CAC5B;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,0DAA0D;IAC1D,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;IAEzD;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B;;;OAGG;IACH,UAAU,CAAC,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,CAAA;CACvD;AAID,MAAM,WAAW,4BAA6B,SAAQ,oBAAoB;IACxE,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;CAC1B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/metrics/types.ts"],"names":[],"mappings":"AAEA,YAAY,EACV,oBAAoB,EACpB,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,oBAAoB,EACpB,YAAY,EACZ,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,kBAAkB,GACnB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAElG,yFAAyF;AACzF,MAAM,MAAM,uBAAuB,GAC/B;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9D;IACE,IAAI,EAAE,WAAW,CAAA;IACjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAA;AAErC;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;IAChF,YAAY,IAAI,MAAM,CAAA;IACtB,iBAAiB,IAAI,MAAM,CAAA;CAC5B;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,0DAA0D;IAC1D,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;IAEzD;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B;;;OAGG;IACH,UAAU,CAAC,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,CAAA;CACvD;AAID,MAAM,WAAW,4BAA6B,SAAQ,oBAAoB;IACxE,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;CAC1B"}