braintrust 3.2.0 → 3.3.0-rc.45

package/dist/instrumentation/index.mjs

@@ -5460,6 +5460,7 @@ function utf8ByteLength(value) {
 function now() {
   return (/* @__PURE__ */ new Date()).getTime();
 }
+var DEFAULT_FLUSH_BACKPRESSURE_BYTES = 10 * 1024 * 1024;
 var BACKGROUND_LOGGER_BASE_SLEEP_TIME_S = 1;
 var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   apiConn;
@@ -5478,7 +5479,8 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   queueDropLoggingPeriod = 60;
   failedPublishPayloadsDir = void 0;
   allPublishPayloadsDir = void 0;
-  flushChunkSize = 25;
+  _flushBackpressureBytes = DEFAULT_FLUSH_BACKPRESSURE_BYTES;
+  _pendingBytes = 0;
   _disabled = false;
   queueDropLoggingState = {
     numDropped: 0,
@@ -5518,11 +5520,16 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (!isNaN(queueDropLoggingPeriodEnv)) {
       this.queueDropLoggingPeriod = queueDropLoggingPeriodEnv;
     }
-    const flushChunkSizeEnv = Number(
-      isomorph_default.getEnv("BRAINTRUST_LOG_FLUSH_CHUNK_SIZE")
+    if (isomorph_default.getEnv("BRAINTRUST_LOG_FLUSH_CHUNK_SIZE")) {
+      console.warn(
+        "BRAINTRUST_LOG_FLUSH_CHUNK_SIZE is deprecated and no longer has any effect. Log flushing now sends all items at once and batches them automatically. This environment variable will be removed in a future major release."
+      );
+    }
+    const flushBackpressureBytesEnv = Number(
+      isomorph_default.getEnv("BRAINTRUST_FLUSH_BACKPRESSURE_BYTES")
     );
-    if (!isNaN(flushChunkSizeEnv) && flushChunkSizeEnv > 0) {
-      this.flushChunkSize = flushChunkSizeEnv;
+    if (!isNaN(flushBackpressureBytesEnv) && flushBackpressureBytesEnv > 0) {
+      this._flushBackpressureBytes = flushBackpressureBytesEnv;
     }
     const failedPublishPayloadsDirEnv = isomorph_default.getEnv(
       "BRAINTRUST_FAILED_PUBLISH_PAYLOADS_DIR"
@@ -5546,6 +5553,12 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   setMaskingFunction(maskingFunction) {
     this.maskingFunction = maskingFunction;
   }
+  pendingFlushBytes() {
+    return this._pendingBytes;
+  }
+  flushBackpressureBytes() {
+    return this._flushBackpressureBytes;
+  }
   log(items) {
     if (this._disabled) {
       return;
@@ -5608,14 +5621,7 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (wrappedItems.length === 0) {
       return;
     }
-    const chunkSize = Math.max(1, Math.min(batchSize, this.flushChunkSize));
-    let index = 0;
-    while (index < wrappedItems.length) {
-      const chunk = wrappedItems.slice(index, index + chunkSize);
-      await this.flushWrappedItemsChunk(chunk, batchSize);
-      index += chunk.length;
-    }
-    wrappedItems.length = 0;
+    await this.flushWrappedItemsChunk(wrappedItems, batchSize);
     if (this.queue.length() > 0) {
       await this.flushOnce(args);
     }
@@ -5628,9 +5634,13 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (allItems.length === 0) {
       return;
     }
-    const allItemsWithMeta = allItems.map(
-      (item) => stringifyWithOverflowMeta(item)
-    );
+    let chunkBytes = 0;
+    const allItemsWithMeta = allItems.map((item) => {
+      const withMeta = stringifyWithOverflowMeta(item);
+      chunkBytes += withMeta.str.length;
+      return withMeta;
+    });
+    this._pendingBytes += chunkBytes;
     const maxRequestSizeResult = await this.getMaxRequestSize();
     const batches = batchItems({
       items: allItemsWithMeta,
@@ -5649,6 +5659,7 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
       })()
     );
     const results = await Promise.all(postPromises);
+    this._pendingBytes = Math.max(0, this._pendingBytes - chunkBytes);
     const failingResultErrors = results.map((r) => r.type === "success" ? void 0 : r.value).filter((r) => r !== void 0);
     if (failingResultErrors.length) {
       throw new AggregateError(

package/dist/workerd.js

@@ -5855,6 +5855,7 @@ function utf8ByteLength(value) {
 function now() {
   return (/* @__PURE__ */ new Date()).getTime();
 }
+var DEFAULT_FLUSH_BACKPRESSURE_BYTES = 10 * 1024 * 1024;
 var TestBackgroundLogger = class {
   items = [];
   maskingFunction = null;
@@ -5867,6 +5868,12 @@ var TestBackgroundLogger = class {
   async flush() {
     return Promise.resolve();
   }
+  pendingFlushBytes() {
+    return 0;
+  }
+  flushBackpressureBytes() {
+    return DEFAULT_FLUSH_BACKPRESSURE_BYTES;
+  }
   async drain() {
     const items = this.items;
     this.items = [];
@@ -5924,7 +5931,8 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   queueDropLoggingPeriod = 60;
   failedPublishPayloadsDir = void 0;
   allPublishPayloadsDir = void 0;
-  flushChunkSize = 25;
+  _flushBackpressureBytes = DEFAULT_FLUSH_BACKPRESSURE_BYTES;
+  _pendingBytes = 0;
   _disabled = false;
   queueDropLoggingState = {
     numDropped: 0,
@@ -5964,11 +5972,16 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (!isNaN(queueDropLoggingPeriodEnv)) {
       this.queueDropLoggingPeriod = queueDropLoggingPeriodEnv;
     }
-    const flushChunkSizeEnv = Number(
-      isomorph_default.getEnv("BRAINTRUST_LOG_FLUSH_CHUNK_SIZE")
+    if (isomorph_default.getEnv("BRAINTRUST_LOG_FLUSH_CHUNK_SIZE")) {
+      console.warn(
+        "BRAINTRUST_LOG_FLUSH_CHUNK_SIZE is deprecated and no longer has any effect. Log flushing now sends all items at once and batches them automatically. This environment variable will be removed in a future major release."
+      );
+    }
+    const flushBackpressureBytesEnv = Number(
+      isomorph_default.getEnv("BRAINTRUST_FLUSH_BACKPRESSURE_BYTES")
     );
-    if (!isNaN(flushChunkSizeEnv) && flushChunkSizeEnv > 0) {
-      this.flushChunkSize = flushChunkSizeEnv;
+    if (!isNaN(flushBackpressureBytesEnv) && flushBackpressureBytesEnv > 0) {
+      this._flushBackpressureBytes = flushBackpressureBytesEnv;
     }
     const failedPublishPayloadsDirEnv = isomorph_default.getEnv(
       "BRAINTRUST_FAILED_PUBLISH_PAYLOADS_DIR"
@@ -5992,6 +6005,12 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   setMaskingFunction(maskingFunction) {
     this.maskingFunction = maskingFunction;
   }
+  pendingFlushBytes() {
+    return this._pendingBytes;
+  }
+  flushBackpressureBytes() {
+    return this._flushBackpressureBytes;
+  }
   log(items) {
     if (this._disabled) {
       return;
@@ -6054,14 +6073,7 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (wrappedItems.length === 0) {
       return;
     }
-    const chunkSize = Math.max(1, Math.min(batchSize, this.flushChunkSize));
-    let index = 0;
-    while (index < wrappedItems.length) {
-      const chunk = wrappedItems.slice(index, index + chunkSize);
-      await this.flushWrappedItemsChunk(chunk, batchSize);
-      index += chunk.length;
-    }
-    wrappedItems.length = 0;
+    await this.flushWrappedItemsChunk(wrappedItems, batchSize);
     if (this.queue.length() > 0) {
       await this.flushOnce(args);
     }
@@ -6074,9 +6086,13 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (allItems.length === 0) {
       return;
     }
-    const allItemsWithMeta = allItems.map(
-      (item) => stringifyWithOverflowMeta(item)
-    );
+    let chunkBytes = 0;
+    const allItemsWithMeta = allItems.map((item) => {
+      const withMeta = stringifyWithOverflowMeta(item);
+      chunkBytes += withMeta.str.length;
+      return withMeta;
+    });
+    this._pendingBytes += chunkBytes;
     const maxRequestSizeResult = await this.getMaxRequestSize();
     const batches = batchItems({
       items: allItemsWithMeta,
@@ -6095,6 +6111,7 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
       })()
     );
     const results = await Promise.all(postPromises);
+    this._pendingBytes = Math.max(0, this._pendingBytes - chunkBytes);
     const failingResultErrors = results.map((r) => r.type === "success" ? void 0 : r.value).filter((r) => r !== void 0);
     if (failingResultErrors.length) {
       throw new AggregateError(
@@ -16679,7 +16696,8 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
           });
         } else {
           const result = await experiment.traced(callback, baseEvent);
-          if (evaluator.maxConcurrency !== void 0) {
+          const bgLogger = experiment.loggingState.bgLogger();
+          if (evaluator.maxConcurrency !== void 0 && bgLogger.pendingFlushBytes() >= bgLogger.flushBackpressureBytes()) {
             await experiment.flush();
           }
           return result;

package/dist/workerd.mjs

@@ -5697,6 +5697,7 @@ function utf8ByteLength(value) {
 function now() {
   return (/* @__PURE__ */ new Date()).getTime();
 }
+var DEFAULT_FLUSH_BACKPRESSURE_BYTES = 10 * 1024 * 1024;
 var TestBackgroundLogger = class {
   items = [];
   maskingFunction = null;
@@ -5709,6 +5710,12 @@ var TestBackgroundLogger = class {
   async flush() {
     return Promise.resolve();
   }
+  pendingFlushBytes() {
+    return 0;
+  }
+  flushBackpressureBytes() {
+    return DEFAULT_FLUSH_BACKPRESSURE_BYTES;
+  }
   async drain() {
     const items = this.items;
     this.items = [];
@@ -5766,7 +5773,8 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   queueDropLoggingPeriod = 60;
   failedPublishPayloadsDir = void 0;
   allPublishPayloadsDir = void 0;
-  flushChunkSize = 25;
+  _flushBackpressureBytes = DEFAULT_FLUSH_BACKPRESSURE_BYTES;
+  _pendingBytes = 0;
   _disabled = false;
   queueDropLoggingState = {
     numDropped: 0,
@@ -5806,11 +5814,16 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (!isNaN(queueDropLoggingPeriodEnv)) {
       this.queueDropLoggingPeriod = queueDropLoggingPeriodEnv;
     }
-    const flushChunkSizeEnv = Number(
-      isomorph_default.getEnv("BRAINTRUST_LOG_FLUSH_CHUNK_SIZE")
+    if (isomorph_default.getEnv("BRAINTRUST_LOG_FLUSH_CHUNK_SIZE")) {
+      console.warn(
+        "BRAINTRUST_LOG_FLUSH_CHUNK_SIZE is deprecated and no longer has any effect. Log flushing now sends all items at once and batches them automatically. This environment variable will be removed in a future major release."
+      );
+    }
+    const flushBackpressureBytesEnv = Number(
+      isomorph_default.getEnv("BRAINTRUST_FLUSH_BACKPRESSURE_BYTES")
     );
-    if (!isNaN(flushChunkSizeEnv) && flushChunkSizeEnv > 0) {
-      this.flushChunkSize = flushChunkSizeEnv;
+    if (!isNaN(flushBackpressureBytesEnv) && flushBackpressureBytesEnv > 0) {
+      this._flushBackpressureBytes = flushBackpressureBytesEnv;
     }
     const failedPublishPayloadsDirEnv = isomorph_default.getEnv(
       "BRAINTRUST_FAILED_PUBLISH_PAYLOADS_DIR"
@@ -5834,6 +5847,12 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
   setMaskingFunction(maskingFunction) {
     this.maskingFunction = maskingFunction;
   }
+  pendingFlushBytes() {
+    return this._pendingBytes;
+  }
+  flushBackpressureBytes() {
+    return this._flushBackpressureBytes;
+  }
   log(items) {
     if (this._disabled) {
       return;
@@ -5896,14 +5915,7 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (wrappedItems.length === 0) {
       return;
     }
-    const chunkSize = Math.max(1, Math.min(batchSize, this.flushChunkSize));
-    let index = 0;
-    while (index < wrappedItems.length) {
-      const chunk = wrappedItems.slice(index, index + chunkSize);
-      await this.flushWrappedItemsChunk(chunk, batchSize);
-      index += chunk.length;
-    }
-    wrappedItems.length = 0;
+    await this.flushWrappedItemsChunk(wrappedItems, batchSize);
     if (this.queue.length() > 0) {
       await this.flushOnce(args);
     }
@@ -5916,9 +5928,13 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
     if (allItems.length === 0) {
       return;
     }
-    const allItemsWithMeta = allItems.map(
-      (item) => stringifyWithOverflowMeta(item)
-    );
+    let chunkBytes = 0;
+    const allItemsWithMeta = allItems.map((item) => {
+      const withMeta = stringifyWithOverflowMeta(item);
+      chunkBytes += withMeta.str.length;
+      return withMeta;
+    });
+    this._pendingBytes += chunkBytes;
     const maxRequestSizeResult = await this.getMaxRequestSize();
     const batches = batchItems({
       items: allItemsWithMeta,
@@ -5937,6 +5953,7 @@ var HTTPBackgroundLogger = class _HTTPBackgroundLogger {
       })()
     );
     const results = await Promise.all(postPromises);
+    this._pendingBytes = Math.max(0, this._pendingBytes - chunkBytes);
     const failingResultErrors = results.map((r) => r.type === "success" ? void 0 : r.value).filter((r) => r !== void 0);
     if (failingResultErrors.length) {
       throw new AggregateError(
@@ -16521,7 +16538,8 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
           });
         } else {
           const result = await experiment.traced(callback, baseEvent);
-          if (evaluator.maxConcurrency !== void 0) {
+          const bgLogger = experiment.loggingState.bgLogger();
+          if (evaluator.maxConcurrency !== void 0 && bgLogger.pendingFlushBytes() >= bgLogger.flushBackpressureBytes()) {
             await experiment.flush();
           }
           return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braintrust",
-  "version": "3.2.0",
+  "version": "3.3.0-rc.45",
   "description": "SDK for integrating Braintrust",
   "repository": {
     "type": "git",