@zuplo/cli 6.72.0 → 6.72.1

package/node_modules/@posthog/core/src/metrics/index.ts

@@ -0,0 +1,414 @@
+import type {
+  CaptureMetricOptions,
+  MetricAttributes,
+  MetricSample,
+  MetricType,
+  OtlpHistogramDataPoint,
+  OtlpMetric,
+  OtlpMetricsPayload,
+  OtlpNumberDataPoint,
+} from '@posthog/types'
+import type { Logger } from '../types'
+import { isArray, safeSetTimeout } from '../utils'
+import { toOtlpKeyValueList } from '../logs/logs-utils'
+import {
+  DEFAULT_HISTOGRAM_BOUNDS,
+  bucketIndexFor,
+  buildMetricsResourceAttributes,
+  buildOtlpMetricsPayload,
+  msToUnixNano,
+  seriesKey,
+} from './metrics-utils'
+import type { MetricsHost, ResolvedPostHogMetricsConfig } from './types'
+
+const OTLP_TEMPORALITY_DELTA = 1
+
+interface HistogramState {
+  count: number
+  sum: number
+  min: number
+  max: number
+  bucketCounts: number[]
+}
+
+/**
+ * One aggregated series within the current flush window. Exactly one of
+ * `total` (count), `last` (gauge), or `hist` is populated, matching `type`.
+ */
+interface SeriesState {
+  name: string
+  type: MetricType
+  unit?: string
+  attributes?: MetricAttributes
+  windowStartMs: number
+  total?: number
+  last?: number
+  hist?: HistogramState
+}
+
+/**
+ * Statsd-style pre-aggregating metrics client.
+ *
+ * Samples are folded into per-series aggregates in memory (counts sum,
+ * gauges keep the last value, histograms accumulate buckets) and flushed as
+ * one OTLP data point per series per window — a burst of 10k `count()` calls
+ * costs one data point on the wire. Sums and histograms use delta
+ * temporality, so each data point stands alone and client restarts need no
+ * cross-window state.
+ *
+ * Deliberately unlike logs, no per-user context (distinct ID, session ID) is
+ * attached: every attribute value creates a new series, and per-user series
+ * are the canonical metrics-cardinality explosion.
+ */
+export class PostHogMetrics {
+  private _series = new Map<string, SeriesState>()
+  private _flushTimer?: ReturnType<typeof safeSetTimeout>
+  // Serializes flushes — a manual flush() during an in-flight timer flush
+  // queues behind it instead of racing it for the same window.
+  private _flushPromise: Promise<void> | null = null
+  // One cardinality warning per window, however many series get dropped.
+  private _seriesCapWarned = false
+  // Type seen per metric name this window; reusing a name with a different
+  // type gets a one-time dev hint. The read path queries by name, so mixing
+  // types under one name produces charts that blend both series.
+  private _typeByName = new Map<string, MetricType>()
+  private _typeCollisionWarned = new Set<string>()
+
+  constructor(
+    private readonly _instance: MetricsHost,
+    private readonly _config: ResolvedPostHogMetricsConfig,
+    private readonly _logger: Logger
+  ) {}
+
+  count(name: string, value: number = 1, options?: CaptureMetricOptions): void {
+    this._capture({ name, type: 'count', value, unit: options?.unit, attributes: options?.attributes })
+  }
+
+  gauge(name: string, value: number, options?: CaptureMetricOptions): void {
+    this._capture({ name, type: 'gauge', value, unit: options?.unit, attributes: options?.attributes })
+  }
+
+  histogram(name: string, value: number, options?: CaptureMetricOptions): void {
+    this._capture({ name, type: 'histogram', value, unit: options?.unit, attributes: options?.attributes })
+  }
+
+  /** Sends everything aggregated so far without waiting for the flush interval. */
+  flush(): Promise<void> {
+    const prev = this._flushPromise
+    const run = async (): Promise<void> => {
+      if (prev) {
+        await prev.catch(() => {})
+      }
+      await this._doFlush()
+    }
+    const p = run().finally(() => {
+      if (this._flushPromise === p) {
+        this._flushPromise = null
+      }
+    })
+    this._flushPromise = p
+    return p
+  }
+
+  /**
+   * Synchronously snapshots the current window into an OTLP payload and
+   * resets it, bypassing the flush serializer entirely — for unload-time
+   * drains where the host must hand the payload to a synchronous transport
+   * (sendBeacon) in the same tick. Returns `null` when there is nothing to
+   * send. The caller owns delivery; there is no retry for a drained window.
+   */
+  drainWindow(): OtlpMetricsPayload | null {
+    if (this._series.size === 0) {
+      return null
+    }
+    const window = this._series
+    this._series = new Map()
+    this._seriesCapWarned = false
+    this._typeByName = new Map()
+    this._typeCollisionWarned = new Set()
+    return this._buildPayload(window)
+  }
+
+  /** Clears the flush timer and drops the current window. */
+  reset(): void {
+    this._clearFlushTimer()
+    this._series = new Map()
+    this._flushPromise = null
+    this._seriesCapWarned = false
+    this._typeByName = new Map()
+    this._typeCollisionWarned = new Set()
+  }
+
+  private _capture(sample: MetricSample): void {
+    if (this._instance.isDisabled || this._instance.optedOut) {
+      return
+    }
+
+    const filtered = this._runBeforeSend(sample)
+    if (filtered === null) {
+      return
+    }
+
+    if (!filtered.name || typeof filtered.name !== 'string') {
+      this._logger.warn('Dropping metric with empty name')
+      return
+    }
+    if (typeof filtered.value !== 'number' || !Number.isFinite(filtered.value)) {
+      this._logger.warn(`Dropping metric '${filtered.name}': value must be a finite number`)
+      return
+    }
+    // Checked after beforeSend so a hook can't turn a count negative either.
+    if (filtered.type === 'count' && filtered.value < 0) {
+      this._logger.warn(`Dropping count '${filtered.name}': counters are monotonic, value must be >= 0`)
+      return
+    }
+
+    const seenType = this._typeByName.get(filtered.name)
+    if (seenType === undefined) {
+      this._typeByName.set(filtered.name, filtered.type)
+    } else if (seenType !== filtered.type && !this._typeCollisionWarned.has(filtered.name)) {
+      this._typeCollisionWarned.add(filtered.name)
+      this._logger.warn(
+        `Metric name '${filtered.name}' is already used as a ${seenType}; ` +
+          `recording it as a ${filtered.type} too will blend both series in charts. Use a distinct name.`
+      )
+    }
+
+    const key = seriesKey(filtered.type, filtered.name, filtered.unit, filtered.attributes)
+    let state = this._series.get(key)
+    if (!state) {
+      if (this._series.size >= this._config.maxSeriesPerFlush) {
+        if (!this._seriesCapWarned) {
+          this._seriesCapWarned = true
+          this._logger.warn(
+            `Metric series cap reached (${this._config.maxSeriesPerFlush} per flush window); ` +
+              `dropping new series until the next flush. Reduce attribute cardinality.`
+          )
+        }
+        return
+      }
+      state = {
+        name: filtered.name,
+        type: filtered.type,
+        unit: filtered.unit,
+        // Snapshot: the key was computed from these values, so a caller
+        // mutating the object after capture must not change the stored series.
+        attributes: filtered.attributes ? { ...filtered.attributes } : undefined,
+        windowStartMs: Date.now(),
+      }
+      this._series.set(key, state)
+    }
+
+    this._fold(state, filtered.value)
+    this._armFlushTimer()
+  }
+
+  private _fold(state: SeriesState, value: number): void {
+    switch (state.type) {
+      case 'count':
+        state.total = (state.total ?? 0) + value
+        break
+      case 'gauge':
+        state.last = value
+        break
+      case 'histogram': {
+        if (!state.hist) {
+          state.hist = {
+            count: 0,
+            sum: 0,
+            min: value,
+            max: value,
+            bucketCounts: new Array(DEFAULT_HISTOGRAM_BOUNDS.length + 1).fill(0),
+          }
+        }
+        const hist = state.hist
+        hist.count += 1
+        hist.sum += value
+        hist.min = Math.min(hist.min, value)
+        hist.max = Math.max(hist.max, value)
+        hist.bucketCounts[bucketIndexFor(value, DEFAULT_HISTOGRAM_BOUNDS)] += 1
+        break
+      }
+    }
+  }
+
+  private _runBeforeSend(sample: MetricSample): MetricSample | null {
+    const beforeSend = this._config.beforeSend
+    if (!beforeSend) {
+      return sample
+    }
+    const fns = isArray(beforeSend) ? beforeSend : [beforeSend]
+    let result: MetricSample = sample
+    for (const fn of fns) {
+      try {
+        const next = fn(result)
+        if (!next) {
+          this._logger.info(`Metric was rejected in beforeSend function`)
+          return null
+        }
+        result = next
+      } catch (e) {
+        this._logger.error(`Error in beforeSend function for metric:`, e)
+        return null
+      }
+    }
+    return result
+  }
+
+  private _armFlushTimer(): void {
+    if (this._flushTimer) {
+      return
+    }
+    this._flushTimer = safeSetTimeout(() => {
+      this._flushTimer = undefined
+      this.flush().catch(() => {})
+    }, this._config.flushIntervalMs)
+  }
+
+  private _clearFlushTimer(): void {
+    if (this._flushTimer) {
+      clearTimeout(this._flushTimer)
+      this._flushTimer = undefined
+    }
+  }
+
+  private async _doFlush(): Promise<void> {
+    if (this._series.size === 0) {
+      return
+    }
+
+    // Snapshot and reset the window; samples captured while the send is in
+    // flight fold into a fresh window instead of the one being sent.
+    const window = this._series
+    this._series = new Map()
+    this._seriesCapWarned = false
+    this._typeByName = new Map()
+    this._typeCollisionWarned = new Set()
+
+    const outcome = await this._instance._sendMetricsBatch(this._buildPayload(window))
+    switch (outcome.kind) {
+      case 'ok':
+        return
+      case 'retry-later':
+        // Transient failure: merge the unsent window back so the data rides
+        // the next flush instead of being lost — and re-arm the timer, since
+        // with no new captures nothing else would schedule that flush.
+        this._mergeWindowBack(window)
+        this._armFlushTimer()
+        return
+      case 'too-large':
+        this._logger.warn('Metrics batch exceeded the server size limit and was dropped')
+        return
+      case 'fatal':
+        this._logger.error('Failed to send metrics batch:', outcome.error)
+        return
+    }
+  }
+
+  private _buildPayload(window: Map<string, SeriesState>): OtlpMetricsPayload {
+    return buildOtlpMetricsPayload(
+      this._buildMetrics(window),
+      buildMetricsResourceAttributes(this._config, this._instance.getLibraryId(), this._instance.getLibraryVersion()),
+      this._instance.getLibraryId(),
+      this._instance.getLibraryVersion()
+    )
+  }
+
+  /**
+   * Groups the window's series into OTLP metric entries — one entry per
+   * (type, name, unit), one data point per attribute combination.
+   */
+  private _buildMetrics(window: Map<string, SeriesState>): OtlpMetric[] {
+    const nowNano = msToUnixNano(Date.now())
+    const byMetric = new Map<string, OtlpMetric>()
+
+    for (const state of window.values()) {
+      const metricKey = seriesKey(state.type, state.name, state.unit, undefined)
+      let metric = byMetric.get(metricKey)
+      if (!metric) {
+        metric = { name: state.name, ...(state.unit && { unit: state.unit }) }
+        if (state.type === 'count') {
+          metric.sum = { aggregationTemporality: OTLP_TEMPORALITY_DELTA, isMonotonic: true, dataPoints: [] }
+        } else if (state.type === 'gauge') {
+          metric.gauge = { dataPoints: [] }
+        } else {
+          metric.histogram = { aggregationTemporality: OTLP_TEMPORALITY_DELTA, dataPoints: [] }
+        }
+        byMetric.set(metricKey, metric)
+      }
+
+      const attributes = toOtlpKeyValueList(state.attributes ?? {})
+      const startNano = msToUnixNano(state.windowStartMs)
+
+      if (state.type === 'count') {
+        const dp: OtlpNumberDataPoint = {
+          attributes,
+          startTimeUnixNano: startNano,
+          timeUnixNano: nowNano,
+          asDouble: state.total ?? 0,
+        }
+        metric.sum!.dataPoints.push(dp)
+      } else if (state.type === 'gauge') {
+        const dp: OtlpNumberDataPoint = {
+          attributes,
+          timeUnixNano: nowNano,
+          asDouble: state.last ?? 0,
+        }
+        metric.gauge!.dataPoints.push(dp)
+      } else if (state.hist) {
+        const dp: OtlpHistogramDataPoint = {
+          attributes,
+          startTimeUnixNano: startNano,
+          timeUnixNano: nowNano,
+          count: state.hist.count,
+          sum: state.hist.sum,
+          min: state.hist.min,
+          max: state.hist.max,
+          bucketCounts: state.hist.bucketCounts,
+          explicitBounds: DEFAULT_HISTOGRAM_BOUNDS,
+        }
+        metric.histogram!.dataPoints.push(dp)
+      }
+    }
+
+    return Array.from(byMetric.values())
+  }
+
+  /** Folds an unsent window back into the live one after a transient send failure. */
+  private _mergeWindowBack(window: Map<string, SeriesState>): void {
+    for (const [key, old] of window) {
+      const current = this._series.get(key)
+      if (!current) {
+        this._series.set(key, old)
+        continue
+      }
+      current.windowStartMs = Math.min(current.windowStartMs, old.windowStartMs)
+      switch (current.type) {
+        case 'count':
+          current.total = (current.total ?? 0) + (old.total ?? 0)
+          break
+        case 'gauge':
+          // The live window's value is newer — keep it.
+          break
+        case 'histogram':
+          if (old.hist) {
+            if (!current.hist) {
+              current.hist = old.hist
+            } else {
+              current.hist.count += old.hist.count
+              current.hist.sum += old.hist.sum
+              current.hist.min = Math.min(current.hist.min, old.hist.min)
+              current.hist.max = Math.max(current.hist.max, old.hist.max)
+              for (let i = 0; i < current.hist.bucketCounts.length; i++) {
+                current.hist.bucketCounts[i] += old.hist.bucketCounts[i]
+              }
+            }
+          }
+          break
+      }
+    }
+  }
+}
+
+export { buildOtlpMetricsPayload, buildMetricsResourceAttributes, DEFAULT_HISTOGRAM_BOUNDS } from './metrics-utils'
+export type { MetricsHost, PostHogMetricsConfig, ResolvedPostHogMetricsConfig, SendMetricsBatchOutcome } from './types'

package/node_modules/@posthog/core/src/metrics/metrics-utils.ts

@@ -0,0 +1,100 @@
+import type { MetricAttributeValue, OtlpMetric, OtlpMetricsPayload } from '@posthog/types'
+import { toOtlpKeyValueList } from '../logs/logs-utils'
+import type { ResolvedPostHogMetricsConfig } from './types'
+
+/**
+ * Default histogram bucket boundaries — the OpenTelemetry SDK defaults.
+ * Chosen so the server-side p95/quantile aggregations have usable resolution
+ * for the common latency/size ranges without any per-metric configuration.
+ */
+export const DEFAULT_HISTOGRAM_BOUNDS = [0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000]
+
+/**
+ * Converts epoch millis to the unix-nanos string OTLP requires (uint64
+ * doesn't fit in JS Number, so concatenate instead of multiplying).
+ */
+export function msToUnixNano(ms: number): string {
+  return String(ms) + '000000'
+}
+
+/**
+ * Canonical identity of a series within the aggregation window: type, name,
+ * unit, and the attribute set with keys sorted so insertion order can't split
+ * a series. NUL (`\u0000`) separators can't appear in metric names or JSON output.
+ */
+export function seriesKey(
+  type: string,
+  name: string,
+  unit: string | undefined,
+  attributes: Record<string, MetricAttributeValue> | undefined
+): string {
+  let attrsKey = ''
+  if (attributes) {
+    const keys = Object.keys(attributes).sort()
+    attrsKey = keys.map((k) => `${JSON.stringify(k)}:${JSON.stringify(attributes[k])}`).join(',')
+  }
+  return `${type}\u0000${name}\u0000${unit ?? ''}\u0000${attrsKey}`
+}
+
+/**
+ * Returns the bucket index for a histogram observation: the first boundary
+ * the value is `<=`, or the overflow bucket (`bounds.length`) past the last.
+ */
+export function bucketIndexFor(value: number, bounds: number[]): number {
+  for (let i = 0; i < bounds.length; i++) {
+    if (value <= bounds[i]) {
+      return i
+    }
+  }
+  return bounds.length
+}
+
+/**
+ * OTLP resource attributes for every metrics batch. Same layering policy as
+ * the logs builder: user `resourceAttributes` spread first, SDK-controlled
+ * keys layered on top so a stray user key can't clobber attribution.
+ */
+export function buildMetricsResourceAttributes(
+  config: ResolvedPostHogMetricsConfig,
+  scopeName: string,
+  scopeVersion: string
+): Record<string, MetricAttributeValue> {
+  return {
+    ...config.resourceAttributes,
+    'service.name': config.serviceName || 'unknown_service',
+    ...(config.environment && { 'deployment.environment': config.environment }),
+    ...(config.serviceVersion && { 'service.version': config.serviceVersion }),
+    'telemetry.sdk.name': scopeName,
+    'telemetry.sdk.version': scopeVersion,
+  }
+}
+
+/**
+ * Wraps aggregated metrics in the OTLP `resourceMetrics` envelope
+ * (`ExportMetricsServiceRequest`, JSON encoding).
+ *
+ * Encoding notes pinned by the ingest's JSON deserializer: nano timestamps
+ * are decimal strings, but histogram `count`/`bucketCounts` are plain JSON
+ * numbers — string-encoded u64s in those fields have been silently dropped
+ * by upstream opentelemetry-proto deserializers (opentelemetry-rust#3328).
+ */
+export function buildOtlpMetricsPayload(
+  metrics: OtlpMetric[],
+  resourceAttributes: Record<string, MetricAttributeValue>,
+  scopeName: string,
+  scopeVersion: string
+): OtlpMetricsPayload {
+  return {
+    resourceMetrics: [
+      {
+        resource: { attributes: toOtlpKeyValueList(resourceAttributes) },
+        scopeMetrics: [
+          {
+            scope: { name: scopeName, version: scopeVersion },
+            metrics,
+          },
+        ],
+      },
+    ],
+  }
+}

package/node_modules/@posthog/core/src/metrics/types.ts

@@ -0,0 +1,89 @@
+// Re-export OTLP/metric types from @posthog/types so the rest of the metrics
+// module can pull everything from one place.
+export type {
+  MetricAttributeValue,
+  MetricAttributes,
+  MetricType,
+  CaptureMetricOptions,
+  MetricSample,
+  BeforeSendMetricFn,
+  Metrics,
+  OtlpNumberDataPoint,
+  OtlpHistogramDataPoint,
+  OtlpMetric,
+  OtlpMetricsPayload,
+} from '@posthog/types'
+
+import type { BeforeSendMetricFn, MetricAttributeValue, OtlpMetricsPayload } from '@posthog/types'
+
+/** Same tagged outcome shape as `SendLogsBatchOutcome` — one policy for both signals. */
+export type SendMetricsBatchOutcome =
+  | { kind: 'ok' }
+  | { kind: 'retry-later'; error: unknown }
+  | { kind: 'too-large' }
+  | { kind: 'fatal'; error: unknown }
+
+/**
+ * The minimal host surface `PostHogMetrics` depends on. `PostHogCoreStateless`
+ * satisfies it structurally; the browser supplies an adapter backed by its
+ * own request layer.
+ */
+export interface MetricsHost {
+  readonly isDisabled: boolean
+  readonly optedOut: boolean
+  _sendMetricsBatch(payload: OtlpMetricsPayload): Promise<SendMetricsBatchOutcome>
+  getLibraryId(): string
+  getLibraryVersion(): string
+}
+
+/**
+ * Configuration for the metrics feature on `new PostHog(key, { metrics: ... })`.
+ * All fields are optional; per-SDK defaults apply.
+ */
+export interface PostHogMetricsConfig {
+  /**
+   * Service name attached as the OTLP `service.name` resource attribute.
+   * Part of every series' identity; used by the Metrics UI for filtering.
+   * Defaults to `'unknown_service'` when unset.
+   */
+  serviceName?: string
+
+  /** Service version attached as OTLP `service.version`. */
+  serviceVersion?: string
+
+  /** Deployment environment attached as OTLP `deployment.environment`. */
+  environment?: string
+
+  /**
+   * Extra OTLP resource attributes attached to every batch. Spread first;
+   * SDK-controlled keys are layered on top so users can't clobber them.
+   */
+  resourceAttributes?: Record<string, MetricAttributeValue>
+
+  /**
+   * How often the aggregated window is flushed (ms). Samples are aggregated
+   * in memory between flushes — one data point per series per window, no
+   * matter how many calls. Default: 10000.
+   */
+  flushIntervalMs?: number
+
+  /**
+   * Cardinality guardrail: max distinct series (name + type + unit +
+   * attribute combination) held per flush window. Samples for series beyond
+   * the cap are dropped with one warning per window. Default: 1000.
+   */
+  maxSeriesPerFlush?: number
+
+  /**
+   * Pre-aggregation filter. See {@link BeforeSendMetricFn}. Configure as a
+   * single function or a chain.
+   */
+  beforeSend?: BeforeSendMetricFn | BeforeSendMetricFn[]
+}
+
+// Fields PostHogMetrics needs resolved at runtime. The host SDK fills in its
+// defaults and hands the resolved config to the PostHogMetrics constructor.
+export interface ResolvedPostHogMetricsConfig extends PostHogMetricsConfig {
+  flushIntervalMs: number
+  maxSeriesPerFlush: number
+}

package/node_modules/@posthog/core/src/posthog-core-stateless.ts

@@ -189,7 +189,9 @@ export abstract class PostHogCoreStateless {
   private maxQueueSize: number
   private flushInterval: number
   private flushPromise: Promise<any> | null = null
+  private pendingFlushPromise: Promise<void> | null = null
   private flushPromises: Set<Promise<any>> = new Set()
+  private _dequeuedMessagesCount: number = 0
   private shutdownPromise: Promise<void> | null = null
   private requestTimeout: number
   private featureFlagsRequestTimeoutMs: number
@@ -1191,6 +1193,9 @@ export abstract class PostHogCoreStateless {
    * Avoids unnecessary promise errors
    */
   private flushBackground(): void {
+    if (this.pendingFlushPromise) {
+      return
+    }
     void this.flush().catch(async (err) => {
       await logFlushError(err)
     })
@@ -1259,6 +1264,10 @@ export abstract class PostHogCoreStateless {
       return Promise.resolve()
     }
 
+    if (!waitForPendingPromises && this.pendingFlushPromise) {
+      return this.pendingFlushPromise
+    }
+
     const previousFlushPromise = this.flushPromise
     const maxPromiseId = this.promiseQueue.maxId
 
@@ -1275,15 +1284,22 @@ export abstract class PostHogCoreStateless {
       // Use a custom allSettled implementation to avoid issues with patching Promise on RN
       .then(() => allSettled([previousFlushPromise]))
       .then(() => {
+        if (this.pendingFlushPromise === nextFlushPromise) {
+          this.pendingFlushPromise = null
+        }
         return this._flush()
       })
 
+    this.pendingFlushPromise = nextFlushPromise
     this.flushPromise = nextFlushPromise
     this.flushPromises.add(nextFlushPromise)
     void this.addPendingPromise(nextFlushPromise)
 
     allSettled([nextFlushPromise]).then(() => {
       this.flushPromises.delete(nextFlushPromise)
+      if (this.pendingFlushPromise === nextFlushPromise) {
+        this.pendingFlushPromise = null
+      }
       // If there are no others waiting to flush, clear the promise.
       // We don't strictly need to do this, but it could make debugging easier
       if (this.flushPromise === nextFlushPromise) {
@@ -1331,6 +1347,7 @@ export abstract class PostHogCoreStateless {
         const newQueue = refreshedQueue.slice(batchItems.length)
         this.setPersistedProperty<PostHogQueueItem[]>(PostHogPersistedProperty.Queue, newQueue)
         queue = newQueue
+        this._dequeuedMessagesCount += batchItems.length
         // Wait for storage to complete to prevent duplicate events on app crash
         await this.flushStorage()
       }
@@ -1532,6 +1549,8 @@ export abstract class PostHogCoreStateless {
             break
           }
 
+          const dequeuedBeforeFlush = this._dequeuedMessagesCount
+
           // flush again to make sure we send all events, some of which might've been added
           // while we were waiting for the pending promises to resolve
           // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
@@ -1540,6 +1559,13 @@ export abstract class PostHogCoreStateless {
           if (hasTimedOut) {
             break
           }
+
+          if (this._dequeuedMessagesCount === dequeuedBeforeFlush) {
+            this._logger.warn(
+              'Shutdown flush completed but did not send any queued events. Stopping drain to avoid a loop.'
+            )
+            break
+          }
         }
       } catch (e) {
         if (!isPostHogFetchError(e)) {