bitfab 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd571926bd40dc39f337e87f9977bfb0fe3219c21532dc1cf7be382c175a4559
-  data.tar.gz: 17ff724ae1a42f97fa6eae82c97404de8dc9cef738a18674d76da48ba9ea762d
+  metadata.gz: d2428cc39dcd97d154e36ba9792628478e86a4b4dde5101c79d37ebb1635378f
+  data.tar.gz: effa0dba40674696ad3d9155615d9d9e2e40a3fe7f9aed9c8ee97516985e13c6
 SHA512:
-  metadata.gz: 012d3433d2d59200c812557a95b4f2b7cb8d93d7885d9495f59b7e21d89a892ffcc3c0bb83200f4c9f324320d5a1153f4c59bd2facac2dc1924174a7f184d81f
-  data.tar.gz: 69aaffc897238560ebecf6fedbd81509eda58fd082126107585a913cc74a025456a32111356902251a0c5b3439ff2b84ef7ea5aac4325a10e531c93a5d460334
+  metadata.gz: 5f172f0178829a08315ae1caf3de6ff4a22389b2f83dbf449721ca53ca3a466580af00c15bd5279dffc2c9d074aee2afd0e157733f9257987460ef8d101350c9
+  data.tar.gz: 9c6af19d4ebac35d13280aeaa89ac6104cbff3020e24813e292e4170c6524016a0df943025f3ced5510345c863e4b86f9f027fe281912e99a6438f863dde9d28

data/lib/bitfab/replay.rb

@@ -170,6 +170,10 @@ module Bitfab
       # loudly.
       complete_response = http_client.complete_replay(test_run_id)
       trace_id_map = complete_response&.dig("traceIds")
+      # Per-replay-trace token usage keyed by server trace id: the REPLAYED
+      # run's tokens (span-aggregated server-side), used below to fill each
+      # item's :tokens.
+      replay_tokens = complete_response&.dig("tokens") || {}
 
       if trace_id_map.nil?
         # Older servers don't return the mapping. Preserve the legacy
@@ -202,6 +206,9 @@ module Bitfab
             completed_count += 1
             missing << item[:trace_id] if mapped.nil?
           end
+          # Pull this item's replayed-run tokens by its server trace id, before
+          # :trace_id is overwritten with that id below.
+          item[:tokens] = normalize_tokens(replay_tokens[mapped]) if mapped
           item[:trace_id] = mapped
         end
         if missing.any?
@@ -386,27 +393,34 @@ module Bitfab
       }
     end
 
-    # Pull durationMs / tokens / model from the start-replay server item.
-    # Normalizes to symbol-keyed tokens hash and nil-safe defaults so older
-    # servers without these fields still produce a consistent shape.
+    # Pull durationMs / model from the start-replay server item. Nil-safe
+    # defaults so older servers without these fields still produce a consistent
+    # shape. Tokens are intentionally NOT read from the start item (it carries
+    # the ORIGINAL trace's tokens); the replayed run's tokens are filled in by
+    # run() from the complete-replay response once spans are aggregated
+    # server-side, and stay nil here and on older servers.
     def extract_server_item_metrics(server_item)
-      raw_tokens = server_item["tokens"]
-      tokens = if raw_tokens.is_a?(Hash)
-        {
-          input: raw_tokens["input"],
-          output: raw_tokens["output"],
-          cached: raw_tokens["cached"],
-          total: raw_tokens["total"]
-        }
-      end
-
       {
         duration_ms: server_item["durationMs"],
-        tokens:,
+        tokens: nil,
         model: server_item["model"]
       }
     end
 
+    # Normalize a complete-replay tokens hash (string-keyed JSON) into the
+    # symbol-keyed shape the replay item exposes. Nil when the server reported
+    # no token data for this trace.
+    def normalize_tokens(raw_tokens)
+      return nil unless raw_tokens.is_a?(Hash)
+
+      {
+        input: raw_tokens["input"],
+        output: raw_tokens["output"],
+        cached: raw_tokens["cached"],
+        total: raw_tokens["total"]
+      }
+    end
+
     # Execute a single replay item: deserialize inputs, call method with replay context.
     def execute_item(item, receiver, method_name, test_run_id, input_source_span_id = nil, metrics = {},
       input_source_trace_id: nil, mock_strategy: "none", mock_tree: nil, adapt_inputs: nil, adapt_ctx: nil,

data/lib/bitfab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitfab
-  VERSION = "0.20.1"
+  VERSION = "0.20.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Harvest Team