bitfab 0.36.11 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d23fea40d370a085bd028fbf7b605a6b66bc0732a1580683b3f027b5b2082e9
-  data.tar.gz: a477ee5856fc6fb25a39a6088f820337cd2bcb327c3b028c9051d0b0f84edd5d
+  metadata.gz: e4bb59de5ab0ec989d85e8be14ee08ad935ada5145e01826b34657fc8c9e6623
+  data.tar.gz: 78b0255c5a3062470f4149baf632c94a5b18b430567485a1ba58f5b9cf9b9534
 SHA512:
-  metadata.gz: bb155e9ec03187b1f9f80a918b8df651bab41e181afcdd5c068c9645ab6b9c94884d7f8c41cab43bd50e878226e3d075962c02ac27e2b33ed2729e979b4e4464
-  data.tar.gz: 1da28622e46e44b40f5296ed699ee13e897e7bd0a54177e32f3c629fb8004ea5f87a86546a37d608541ff771ba648fffb128bd613d7aefea300c8898038c7e47
+  metadata.gz: e127f198a39372bebaff5a0cf395b4b6b00f2ede4bf9768b8e3a4556ee00271ddf44fe4a40f16fcffac72d3def4d3c83c3f756801ba156edbe58ecbfd189f2e5
+  data.tar.gz: ca803b3df3783f6bb01d5eb5a518300334d0ccd4f31d43f3870c981779cd69710d076a1ded3f058c3b9e8aa65f643b3872dd60f99ac8e4394cd5f97855ec1970

data/lib/bitfab/client.rb

@@ -424,7 +424,12 @@ module Bitfab
                 # Deprecated wire alias, kept so this SDK still reports usage
                 # against servers that predate the rename.
                 source_trace_id: replay_ctx[:source_bitfab_trace_id],
-                accessed: replay_ctx[:db_snapshot_accessed] == true
+                accessed: replay_ctx[:db_snapshot_accessed] == true,
+                # Echoed verbatim (camelCase inside) rather than re-cased into
+                # this record's snake_case: it is the server's own object
+                # coming back, and a translation layer here is one more thing
+                # to drift.
+                timings: replay_ctx[:db_branch_timings]
               }
             end
 
@@ -617,6 +622,9 @@ module Bitfab
           usage["source_trace_id"] = db_snapshot_usage[:original_trace_id]
         end
         usage["accessed"] = db_snapshot_usage[:accessed]
+        if db_snapshot_usage[:timings]
+          usage["timings"] = db_snapshot_usage[:timings]
+        end
         raw_trace["db_snapshot_usage"] = usage
       end
 

data/lib/bitfab/replay.rb

@@ -74,7 +74,7 @@ module Bitfab
     # thread. Child threads and processes intentionally do not inherit it.
     def with_context(test_run_id:, input_source_span_id: nil, input_source_trace_id: nil, trace_id: nil,
       mock_tree: nil, mock_strategy: nil, mock_overrides: nil, fetch_span_output: nil,
-      db_branch_lease: nil, source_bitfab_trace_id: nil)
+      db_branch_lease: nil, db_branch_timings: nil, source_bitfab_trace_id: nil)
       previous = Thread.current.thread_variable_get(REPLAY_CONTEXT_KEY)
       ctx = {
         test_run_id:,
@@ -113,6 +113,10 @@ module Bitfab
       # accessed for free, and the flag would stop separating "branch was
       # used" from "branch was offered".
       ctx[:db_branch_lease] = db_branch_lease if db_branch_lease
+      # Kept off ReplayBranch: customer code reads that mid-replay to reach the
+      # branch, and provisioning latency is a property of the run, not of the
+      # connection. It rides the context only to be echoed on the completion.
+      ctx[:db_branch_timings] = db_branch_timings if db_branch_timings
       ctx[:source_bitfab_trace_id] = source_bitfab_trace_id if source_bitfab_trace_id
       Thread.current.thread_variable_set(REPLAY_CONTEXT_KEY, ctx)
       yield
@@ -765,9 +769,13 @@ module Bitfab
                 trace_error: result[:trace_error],
                 replay_error: result[:replay_error],
                 duration_ms: result[:duration_ms],
+                original_duration_ms: result[:original_duration_ms],
+                original_tokens: result[:original_tokens],
+                original_model: result[:original_model],
                 tokens: result[:tokens],
                 model: result[:model],
-                db_snapshot_ref: result[:db_snapshot_ref]
+                db_snapshot_ref: result[:db_snapshot_ref],
+                db_branch_timings: result[:db_branch_timings]
               }
             })
           rescue => e
@@ -836,6 +844,9 @@ module Bitfab
       # result that looks valid and is not. Fail the item instead, loudly.
       lease_error = include_db_branch_lease ? server_item["dbBranchLeaseError"] : nil
       db_snapshot_ref = server_item["dbSnapshotRef"]
+      # Reported whichever way the resolve went, so it is tracked separately
+      # from both the lease and the error rather than hanging off either.
+      db_branch_timings = include_db_branch_lease ? server_item["dbBranchTimings"] : nil
       if include_db_branch_lease && lease.nil? && lease_error.nil?
         begin
           resolved = http_client.resolve_db_branch_lease(test_run_id, original_trace_id, db_branch_settings)
@@ -850,6 +861,7 @@ module Bitfab
         lease = resolved["lease"]
         lease_error = resolved["leaseError"]
         db_snapshot_ref = resolved["dbSnapshotRef"] || db_snapshot_ref
+        db_branch_timings = resolved["timings"] || db_branch_timings
       end
       if lease_error
         raise DbBranchReplayError.new(
@@ -923,6 +935,7 @@ module Bitfab
         adapt_inputs:,
         adapt_ctx:,
         db_branch_lease: lease,
+        db_branch_timings:,
         source_bitfab_trace_id: original_trace_id,
         db_snapshot_ref:,
         http_client:
@@ -936,16 +949,20 @@ module Bitfab
         error: replay_item_error_message(e),
         trace_error: nil,
         replay_error: e,
-        duration_ms: metrics&.dig(:duration_ms),
+        duration_ms: nil,
+        original_duration_ms: metrics&.dig(:original_duration_ms),
+        original_tokens: metrics&.dig(:original_tokens),
+        original_model: metrics&.dig(:original_model),
         tokens: metrics&.dig(:tokens),
-        model: metrics&.dig(:model),
+        model: metrics&.dig(:original_model),
         trace_id: nil,
         original_trace_id:,
         original_span_id:,
         # Deprecated aliases for original_trace_id/original_span_id.
         source_trace_id: original_trace_id,
         source_span_id: original_span_id,
-        db_snapshot_ref:
+        db_snapshot_ref:,
+        db_branch_timings:
       }
     ensure
       release_db_branch_lease(http_client, lease) if lease
@@ -1059,11 +1076,15 @@ module Bitfab
     # 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.
+    # The original trace's measurements, falling back to the unprefixed keys a
+    # server that predates the rename sends. :tokens stays nil here: it is the
+    # REPLAYED run's, filled in from the complete-replay response.
     def extract_server_item_metrics(server_item)
       {
-        duration_ms: server_item["durationMs"],
-        tokens: nil,
-        model: server_item["model"]
+        original_duration_ms: server_item["originalDurationMs"] || server_item["durationMs"],
+        original_tokens: server_item["originalTokens"] || server_item["tokens"],
+        original_model: server_item["originalModel"] || server_item["model"],
+        tokens: nil
       }
     end
 
@@ -1144,13 +1165,15 @@ module Bitfab
     # 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: "marked", mock_tree: nil, mock_overrides: nil,
-      fetch_span_output: nil, adapt_inputs: nil, adapt_ctx: nil, db_branch_lease: nil, source_bitfab_trace_id: nil,
-      db_snapshot_ref: nil, http_client: nil)
+      fetch_span_output: nil, adapt_inputs: nil, adapt_ctx: nil, db_branch_lease: nil, db_branch_timings: nil,
+      source_bitfab_trace_id: nil, db_snapshot_ref: nil, http_client: nil)
       args, kwargs = Serialize.deserialize_inputs(item)
 
       fn_result = nil
       fn_error = nil
       replay_error = nil
+      replay_duration_ms = nil
+      replay_started = nil
       # Client-side correlation id that tags this item's replay spans so the
       # server can echo back the row id it minted (resolved in run()'s
       # complete-replay loop). Carried on the item under :_sdk_trace_id, never
@@ -1172,6 +1195,7 @@ module Bitfab
           mock_overrides:,
           fetch_span_output:,
           db_branch_lease:,
+          db_branch_timings:,
           source_bitfab_trace_id:
         ) do
           begin
@@ -1190,17 +1214,26 @@ module Bitfab
           end
           if replay_error.nil?
             begin
+              replay_started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
               fn_result = if kwargs.empty?
                 receiver.send(method_name, *args)
               else
                 receiver.send(method_name, *args, **kwargs)
               end
+              replay_duration_ms = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - replay_started) * 1000).round
             rescue => e
+              # The method ran and raised, so it still has a duration.
+              if replay_started
+                replay_duration_ms = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - replay_started) * 1000).round
+              end
               fn_error = e
             end
           end
         end
       rescue => e
+        if replay_started
+          replay_duration_ms = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - replay_started) * 1000).round
+        end
         replay_error = e
       end
 
@@ -1212,9 +1245,12 @@ module Bitfab
         error: item_error&.message,
         trace_error: fn_error,
         replay_error:,
-        duration_ms: metrics[:duration_ms],
+        duration_ms: replay_duration_ms,
+        original_duration_ms: metrics[:original_duration_ms],
+        original_tokens: metrics[:original_tokens],
+        original_model: metrics[:original_model],
         tokens: metrics[:tokens],
-        model: metrics[:model],
+        model: metrics[:original_model],
         # Written in by run() from the complete-replay response once the server
         # has minted this replay trace's row. Nil until then: the client-side
         # correlation id (below) is never surfaced as the public :trace_id.
@@ -1225,7 +1261,8 @@ module Bitfab
         # Deprecated aliases for original_trace_id/original_span_id.
         source_trace_id: source_bitfab_trace_id,
         source_span_id: input_source_span_id,
-        db_snapshot_ref:
+        db_snapshot_ref:,
+        db_branch_timings:
       }
     end
   end

data/lib/bitfab/version.rb

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

metadata

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