bitfab 0.33.0 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa66ab7393ccfdd162cdeaecee49c7b18efa601244afc8d7830568602968efd2
-  data.tar.gz: 29312e2278ad9a39033f82f01a45c20ef12bee1f3ac4b6140c94b22f0ae9dc48
+  metadata.gz: f3dd02ac43d3ed65f11a6dcf52aa0d0d3a331fa428fb568a74147f5007fc9e22
+  data.tar.gz: 94b0cc1645fc42ce929a4fd1363de7ededc908f20dd411d3e7f8fd68d3bed0f8
 SHA512:
-  metadata.gz: dda0002685836ac6e381ecbf37430950df3fa7df9bad695e80803bb1c0da432885027be571feb02ba571adbc4c98a927e1a67eb910f3c8784c0bfde18e4b4f75
-  data.tar.gz: 183c49cc2d9ed286d3ea94e5505e09d6efdfe1cd2e5d73c31e1d504029643745bb796029395c70dc8afc1b2f165b3ecb84d2798933b806d0c00bd8b483d7a94e
+  metadata.gz: b3a07fecf4731278963e8db381a0bfc6b4677d17bd2464f36f1d5ccfd455a8d3f066273502674158c3ac3b99a180f3017b0c5185f8e6ff3795c87b7fd2c612cb
+  data.tar.gz: 38e33c8a2dc6ab7e2e6a4c416bea15828a81724eb8ffe4b0fb440088e3b05fea53abaded2fa46bf2e852f7fd307cd5216d149b296b321a5399861861b08bd8d1

data/lib/bitfab/http_client.rb

@@ -11,6 +11,9 @@ require_relative "warn_once"
 
 module Bitfab
   class HttpClient
+    REPLAY_DB_BRANCH_REQUEST_TIMEOUT_SECONDS = 300
+    private_constant :REPLAY_DB_BRANCH_REQUEST_TIMEOUT_SECONDS
+
     attr_reader :service_url
 
     def initialize(api_key:, service_url: nil, timeout: 120)
@@ -131,15 +134,20 @@ module Bitfab
       payload["codeChangeFiles"] = normalize_code_change_files(code_change_files) unless code_change_files.nil?
       payload["experimentGroupId"] = experiment_group_id unless experiment_group_id.nil?
       payload["includeDbBranchLease"] = true if include_db_branch_lease
+      payload["lazyDbBranchLease"] = true if include_db_branch_lease
       payload["datasetId"] = dataset_id unless dataset_id.nil?
       payload["graderIds"] = grader_ids unless grader_ids.nil?
       payload["dbBranchSettings"] = db_branch_settings unless db_branch_settings.nil?
 
       # When DB branching is on, the server resolves a Neon preview branch per
-      # item (snapshot + restore + poll), which can run several seconds each.
-      # Use a generous timeout so the SDK doesn't give up before a healthy
-      # server finishes.
-      timeout = include_db_branch_lease ? 180 : 30
+      # item (snapshot + restore + poll), which can run several seconds each,
+      # and runs any warm-up SQL against each branch on a 240s budget of its
+      # own. The server gives up at 280s and answers, so this is a backstop for
+      # a reply that never comes rather than the thing that normally fires; it
+      # sits above the server's own ceiling so the server's error is the one
+      # callers see. Net::HTTP would otherwise default to 60s here, which the
+      # branch creation alone can outlast.
+      timeout = include_db_branch_lease ? REPLAY_DB_BRANCH_REQUEST_TIMEOUT_SECONDS : 30
       request("/api/sdk/replay/start", payload, timeout:)
     end
 
@@ -190,6 +198,16 @@ module Bitfab
       request("/api/sdk/replay/releaseDbBranchLease", {"neonBranchId" => neon_branch_id}, timeout: 30)
     end
 
+    def resolve_db_branch_lease(test_run_id, trace_id, db_branch_settings = nil)
+      payload = {"testRunId" => test_run_id, "traceId" => trace_id}
+      payload["dbBranchSettings"] = db_branch_settings unless db_branch_settings.nil?
+      request(
+        "/api/sdk/replay/resolveDbBranchLease",
+        payload,
+        timeout: REPLAY_DB_BRANCH_REQUEST_TIMEOUT_SECONDS
+      )
+    end
+
     # Send an external trace (fire-and-forget in background thread).
     def send_external_trace(payload)
       merged = payload.merge("sdkVersion" => VERSION)

data/lib/bitfab/replay.rb

@@ -200,6 +200,7 @@ module Bitfab
         end
       end
 
+      resolved_db_branch_settings = db_branch_settings(db_branch)
       replay_data = http_client.start_replay(
         trace_function_key,
         effective_limit,
@@ -211,7 +212,7 @@ module Bitfab
         include_db_branch_lease:,
         dataset_id:,
         grader_ids:,
-        db_branch_settings: db_branch_settings(db_branch)
+        db_branch_settings: resolved_db_branch_settings
       )
       test_run_id = replay_data["testRunId"]
       test_run_url = replay_data["testRunUrl"]
@@ -219,7 +220,8 @@ module Bitfab
 
       result_items = if server_items.any?
         process_items(http_client, server_items, receiver, method_name, test_run_id, max_concurrency, mock.to_s,
-          adapt_inputs, include_db_branch_lease, on_progress:, mock_overrides: resolved_overrides)
+          adapt_inputs, include_db_branch_lease, resolved_db_branch_settings, on_progress:,
+          mock_overrides: resolved_overrides)
       else
         []
       end
@@ -528,7 +530,8 @@ module Bitfab
 
     # Process all replay items, optionally in parallel using threads.
     def process_items(http_client, server_items, receiver, method_name, test_run_id, max_concurrency, mock_strategy,
-      adapt_inputs = nil, include_db_branch_lease = false, on_progress: nil, mock_overrides: [])
+      adapt_inputs = nil, include_db_branch_lease = false, db_branch_settings = nil, on_progress: nil,
+      mock_overrides: [])
       concurrency = max_concurrency || server_items.length
 
       # Reports running totals once per item as it settles. In the parallel
@@ -584,7 +587,7 @@ module Bitfab
       if concurrency <= 1
         server_items.map do |item|
           result = process_single_item(http_client, item, receiver, method_name, test_run_id, mock_strategy,
-            adapt_inputs, include_db_branch_lease, mock_overrides:)
+            adapt_inputs, include_db_branch_lease, db_branch_settings, mock_overrides:)
           report.call(result, original_trace_id_of(item), original_span_id_of(item), test_run_id)
           result
         end
@@ -601,7 +604,7 @@ module Bitfab
               break unless item
 
               result = process_single_item(http_client, item, receiver, method_name, test_run_id, mock_strategy,
-                adapt_inputs, include_db_branch_lease, mock_overrides:)
+                adapt_inputs, include_db_branch_lease, db_branch_settings, mock_overrides:)
               results_mutex.synchronize { results[idx] = result }
               report.call(result, original_trace_id_of(item), original_span_id_of(item), test_run_id)
             end
@@ -620,7 +623,7 @@ module Bitfab
     # than propagated, so one bad trace never aborts the whole replay run
     # (mirrors the TypeScript and Python SDKs' per-item rescue).
     def process_single_item(http_client, server_item, receiver, method_name, test_run_id, mock_strategy,
-      adapt_inputs = nil, include_db_branch_lease = false, mock_overrides: [])
+      adapt_inputs = nil, include_db_branch_lease = false, db_branch_settings = nil, mock_overrides: [])
       metrics = extract_server_item_metrics(server_item)
       # The ORIGINAL (historical) trace/span this item replays. Canonical
       # keys are originalTraceId/originalSpanId; older servers send them under
@@ -638,6 +641,13 @@ module Bitfab
       # for a branch, so running their method against live data would produce a
       # 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"]
+      if include_db_branch_lease && lease.nil? && lease_error.nil?
+        resolved = http_client.resolve_db_branch_lease(test_run_id, original_trace_id, db_branch_settings)
+        lease = resolved["lease"]
+        lease_error = resolved["leaseError"]
+        db_snapshot_ref = resolved["dbSnapshotRef"] || db_snapshot_ref
+      end
       if lease_error
         raise "Replay requested a database branch for trace #{original_trace_id} but it " \
           "could not be resolved (#{lease_error["code"]}): #{lease_error["message"]}. " \
@@ -709,7 +719,7 @@ module Bitfab
         adapt_ctx:,
         db_branch_lease: lease,
         source_bitfab_trace_id: original_trace_id,
-        db_snapshot_ref: server_item["dbSnapshotRef"]
+        db_snapshot_ref:
       )
     rescue => e
       warn "Bitfab: replay item for span #{original_span_id} failed before execution: #{e.message}"
@@ -727,7 +737,7 @@ module Bitfab
         # Deprecated aliases for original_trace_id/original_span_id.
         source_trace_id: original_trace_id,
         source_span_id: original_span_id,
-        db_snapshot_ref: server_item["dbSnapshotRef"]
+        db_snapshot_ref:
       }
     ensure
       release_db_branch_lease(http_client, lease) if lease

data/lib/bitfab/version.rb

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

metadata

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