bitfab 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c78bc5383ea19b2bb2cb289ede12e22ede81afaaf13d9500fe7ca49ac6408e'
-  data.tar.gz: 3c193f89a4843aaea5ec3c00d9e5b5410b787d802256b28ff3ca0eaa1c5d8e1c
+  metadata.gz: 0f676920e42d9a98a73b84a843a5592159d9e93d85f72d4248703cef5a2eb47d
+  data.tar.gz: 891ef7140bba23d6f55b14f97668f2561275305b2fa43f7ea795920e4d101c82
 SHA512:
-  metadata.gz: 2c71dd260c5af46a18eeb2d9d8f74e560509293a4053cff0a2055215e07302ddeeeec0c4f8693551545403343e9ea80cd8bd3a2adae99ce9780f98cb427386d2
-  data.tar.gz: 72d63187fcf637f6b65854f13a4f837293531cf55707679057b45e52b498bab2dfa78671e48e64833a5a07035f3e20800438184bd2b99cbd32e376347278d264
+  metadata.gz: 9384af8b49181607bb86e10c204370eb04b4a8fd76552172065e0c44e0cd6f1349a21cb56e7dae3ca2a308e35a0039d5d706129ae9ffe19e0268e4136d18521c
+  data.tar.gz: 1c9a6edb28587660fa88afca67ebf6c2ab2e7d066721c707f907682f2f96d4a8aed62c6d486f42c133b9080729e228d3237b0125d2c33b83c3e98acf275aed16

data/lib/bitfab/client.rb

@@ -46,16 +46,18 @@ module Bitfab
     #   code change being tested in this replay (stored on the experiment)
     # @param code_change_files [Array<Hash>, nil] optional list of edited files,
     #   each as { path:, before:, after: } (use "" for new/deleted files)
+    # @param experiment_group_id [String, nil] optional UUID grouping multiple
+    #   replay runs into a single experiment batch
     # @param mock [String] mock strategy for child spans: "none" (default),
     #   "all", or "marked". "all" mocks every child span; "marked" only mocks
     #   spans declared with mock_on_replay: true.
     # @return [Hash] with :items, :test_run_id, :test_run_url
     def replay(receiver, method_name, trace_function_key:, limit: 5, trace_ids: nil, max_concurrency: 10,
-      code_change_description: nil, code_change_files: nil, mock: "none")
+      code_change_description: nil, code_change_files: nil, experiment_group_id: nil, mock: "none")
       Replay.run(
         self, receiver, method_name,
         trace_function_key:, limit:, trace_ids:, max_concurrency:,
-        code_change_description:, code_change_files:, mock:
+        code_change_description:, code_change_files:, experiment_group_id:, mock:
       )
     end
 
@@ -84,13 +86,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/http_client.rb

@@ -103,7 +103,10 @@ module Bitfab
     #   code change being tested in this replay
     # @param code_change_files [Array<Hash>, nil] optional list of edited files,
     #   each as { path:, before:, after: } (use "" for new/deleted files)
-    def start_replay(trace_function_key, limit, trace_ids: nil, code_change_description: nil, code_change_files: nil)
+    # @param experiment_group_id [String, nil] optional UUID grouping multiple
+    #   replay runs into a single experiment batch
+    def start_replay(trace_function_key, limit, trace_ids: nil, code_change_description: nil,
+      code_change_files: nil, experiment_group_id: nil)
       payload = {
         "traceFunctionKey" => trace_function_key,
         "limit" => limit
@@ -111,6 +114,7 @@ module Bitfab
       payload["traceIds"] = trace_ids if trace_ids
       payload["codeChangeDescription"] = code_change_description unless code_change_description.nil?
       payload["codeChangeFiles"] = normalize_code_change_files(code_change_files) unless code_change_files.nil?
+      payload["experimentGroupId"] = experiment_group_id unless experiment_group_id.nil?
 
       request("/api/sdk/replay/start", payload, timeout: 30)
     end

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
@@ -68,12 +63,14 @@ module Bitfab
     #   code change being tested in this replay (stored on the experiment)
     # @param code_change_files [Array<Hash>, nil] optional list of edited files,
     #   each as { path:, before:, after: } (empty string for new/deleted files)
+    # @param experiment_group_id [String, nil] optional UUID grouping multiple
+    #   replay runs into a single experiment batch
     # @param mock [String] mock strategy for child spans: "none" (default),
     #   "all", or "marked". "all" mocks every child span; "marked" only mocks
     #   spans declared with mock_on_replay: true.
     # @return [Hash] with :items, :test_run_id, :test_run_url
     def run(client, receiver, method_name, trace_function_key:, limit: 5, trace_ids: nil, max_concurrency: 10,
-      code_change_description: nil, code_change_files: nil, mock: "none")
+      code_change_description: nil, code_change_files: nil, experiment_group_id: nil, mock: "none")
       unless MOCK_STRATEGIES.include?(mock.to_s)
         raise ArgumentError, "Invalid mock strategy '#{mock}'. Must be one of: #{MOCK_STRATEGIES.join(", ")}"
       end
@@ -85,7 +82,8 @@ module Bitfab
         limit,
         trace_ids:,
         code_change_description:,
-        code_change_files:
+        code_change_files:,
+        experiment_group_id:
       )
       test_run_id = replay_data["testRunId"]
       test_run_url = replay_data["testRunUrl"]
@@ -100,9 +98,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 +251,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 +277,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.3"
 end

metadata

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