bitfab 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c78bc5383ea19b2bb2cb289ede12e22ede81afaaf13d9500fe7ca49ac6408e'
-  data.tar.gz: 3c193f89a4843aaea5ec3c00d9e5b5410b787d802256b28ff3ca0eaa1c5d8e1c
+  metadata.gz: 90f13972943bdfcdd6c5b72859d9ae03b23549577771f0e7d4f8726e2cff9037
+  data.tar.gz: f7c393d995069261d6ddf554727b02b25e6ec37f1f516a0ad01b114f684b5cb9
 SHA512:
-  metadata.gz: 2c71dd260c5af46a18eeb2d9d8f74e560509293a4053cff0a2055215e07302ddeeeec0c4f8693551545403343e9ea80cd8bd3a2adae99ce9780f98cb427386d2
-  data.tar.gz: 72d63187fcf637f6b65854f13a4f837293531cf55707679057b45e52b498bab2dfa78671e48e64833a5a07035f3e20800438184bd2b99cbd32e376347278d264
+  metadata.gz: 2ddfbc335058f37fc3f024b6596d3029dff1601be1243a8f779bbcd7dc899d78f75769c2db8e70894a316649ece042b56f9089fbe39b573bfe40cf313ec2c984
+  data.tar.gz: 0eca0c359e794699587347552b79d608d4ebf6016abef029795a2ffabc475f7d52bc16bcddf32525c7f9a714e7df6386af3c2f9ab6d40d0f8a13c638baf4bf3c

data/lib/bitfab/client.rb

@@ -84,13 +84,12 @@ module Bitfab
       return yield unless @enabled
 
       parent = SpanContext.current
-      trace_id = parent ? parent[:trace_id] : SecureRandom.uuid
+      replay_ctx = ReplayContext.current
+      trace_id = parent ? parent[:trace_id] : (replay_ctx&.dig(:trace_id) || SecureRandom.uuid)
       span_id = SecureRandom.uuid
       parent_span_id = parent&.dig(:span_id)
       is_root_span = parent_span_id.nil?
       started_at = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.%3NZ")
-
-      replay_ctx = ReplayContext.current
       resolved_test_run_id = replay_ctx&.dig(:test_run_id)
       resolved_input_source_span_id = replay_ctx&.dig(:input_source_span_id)
       resolved_input_source_trace_id = replay_ctx&.dig(:input_source_trace_id)

data/lib/bitfab/replay.rb

@@ -22,19 +22,14 @@ module Bitfab
 
     # Execute a block with replay context set on the current thread.
     # The context is automatically cleared when the block completes.
-    #
-    # @param test_run_id [String]
-    # @param input_source_span_id [String, nil]
-    # @param input_source_trace_id [String, nil]
-    # @param mock_tree [Hash{String => Hash}, nil] keyed by "#{key}:#{index}"
-    # @param mock_strategy [String, nil] one of MOCK_STRATEGIES
-    def with_context(test_run_id:, input_source_span_id: nil, input_source_trace_id: nil,
+    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)
       previous = Thread.current[REPLAY_CONTEXT_KEY]
       ctx = {
         test_run_id:,
         input_source_span_id:,
-        input_source_trace_id:
+        input_source_trace_id:,
+        trace_id:
       }
       if mock_tree
         ctx[:mock_tree] = mock_tree
@@ -100,9 +95,14 @@ module Bitfab
       Bitfab.flush_traces
 
       begin
-        http_client.complete_replay(test_run_id)
+        complete_response = http_client.complete_replay(test_run_id)
+        trace_id_map = complete_response&.dig("traceIds") || {}
+        result_items.each do |item|
+          item[:trace_id] = trace_id_map[item[:trace_id]]
+        end
       rescue => e
         warn "Bitfab: Failed to complete replay: #{e.message}"
+        result_items.each { |item| item[:trace_id] = nil }
       end
 
       {
@@ -248,11 +248,13 @@ module Bitfab
 
       fn_result = nil
       fn_error = nil
+      sdk_trace_id = SecureRandom.uuid
 
       ReplayContext.with_context(
         test_run_id:,
         input_source_span_id:,
         input_source_trace_id:,
+        trace_id: sdk_trace_id,
         mock_tree:,
         mock_strategy:
       ) do
@@ -272,7 +274,8 @@ module Bitfab
         error: fn_error,
         duration_ms: metrics[:duration_ms],
         tokens: metrics[:tokens],
-        model: metrics[:model]
+        model: metrics[:model],
+        trace_id: sdk_trace_id
       }
     end
   end

data/lib/bitfab/version.rb

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

metadata

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