bitfab 0.58.2 → 0.58.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd72b6b4345f89aee11623373bf55c2237b205e4341c716e188ef2ff65c91536
-  data.tar.gz: 652071941943d4560b301ad7af6b58d5ec9f0da20249111a61627046c0f34d57
+  metadata.gz: 13b552211978874936f8b732245e948396758a5adf6d0485859cf98748bf4933
+  data.tar.gz: 612bbee201e37c8c425c5aa42bbcc6f713ca848e5cf43ad7eae5797beeefd660
 SHA512:
-  metadata.gz: 06a9a8b5136d175c8b715fac96b217054b87ade19342cf675e0defa674a0cb836142d20a5997a9c3c448c76724d5938334731d7fd1b3679cd589b6f833b2f0b1
-  data.tar.gz: caaac21d9b116caeefd91a6139d16b2a974a2f7d3438600917ebf7047d5c6cd750045dce194eec0b3b43646f96818997f6b5452fd76ac86ff1d5c0835a73b524
+  metadata.gz: 7150bd10acde90cfe101845b6b6da248ae4cfb57a3742d8a33ef8d045e93d0ebfa6eaf6672376304f957206801c4f0b6ae60707d881d7621dce2d61b887405d4
+  data.tar.gz: beb42456465d624c22fc12d2294011be076748011bfac9dfad6a6397083bcebf6902a2fd7f7fadbdfa2c8e88c2df6b862c3a1f1bff0afb3f947e45256c68cc28

data/lib/bitfab/client.rb

@@ -185,7 +185,7 @@ module Bitfab
     #   queued work from in-flight work. A raising callback never crashes the run.
     # @return [Hash] with :items, :test_run_id, :test_run_url
     def replay(receiver, method_name = nil, trace_function_key:, limit: nil, trace_ids: nil, concurrency: nil, max_concurrency: ReplayConcurrency::UNSET,
-      name: nil, code_change_description: Replay::CODE_CHANGE_UNSET, code_change_files: Replay::CODE_CHANGE_UNSET, experiment_group_id: nil, dataset_id: nil, dataset_ids: nil, grader_ids: nil, mock: "marked", attempts: ReplayConcurrency::UNSET, only_with_assertions: false, dry_run: false,
+      name: nil, code_change_description: Replay::CODE_CHANGE_UNSET, code_change_files: Replay::CODE_CHANGE_UNSET, experiment_group_id: nil, dataset_id: nil, dataset_ids: nil, grader_ids: nil, mock: "marked", attempts: ReplayConcurrency::UNSET, only_with_assertions: false, judge_assertions: false, dry_run: false,
       adapt_inputs: nil, mock_override: nil, db_branch: nil, on_item_start: nil, on_item_finish: nil, on_progress: nil)
       Replay.run(
         self,
@@ -199,6 +199,7 @@ module Bitfab
         max_concurrency:,
         attempts:,
         only_with_assertions:,
+        judge_assertions:,
         dry_run:,
         code_change_description:,
         code_change_files:,
@@ -424,6 +425,13 @@ module Bitfab
         span_id = SecureRandom.uuid
         parent_span_id = parent&.dig(:span_id)
         is_root_span = parent_span_id.nil?
+        ancestor_span_id = nearest_captured_ancestor_span_id
+        open_instrumentation = (surface == :trace) ? "trace" : "span"
+        sends_on_completion = lambda do
+          is_root_span || declared_node || !content_off_by_simulation_plan?(
+            trace_id:, trace_function_key:, span_name:, instrumentation: open_instrumentation
+          )
+        end
         started_at = Bitfab.now_iso_timestamp
         resolved_test_run_id = replay_ctx ? replay_ctx[:test_run_id] : test_run_id
         resolved_input_source_span_id = replay_ctx&.dig(:input_source_span_id)
@@ -549,6 +557,7 @@ module Bitfab
             span_data: content_off ? span_data.merge("content_off_by_simulation_plan" => true) : span_data,
             instrumentation: recorded_instrumentation,
             declared_node:,
+            nearest_captured_ancestor_span_id: ancestor_span_id,
             trace_function_key:,
             trace_id:,
             span_id:,
@@ -617,7 +626,8 @@ module Bitfab
             span_id:,
             explicit_span_receiver:,
             explicit_span_method_name: explicit_span_method_name&.to_sym,
-            surface:, recording_override:, content_withheld:
+            surface:, recording_override:, content_withheld:,
+            sends_on_completion: sends_on_completion
           ) do
             invoke = -> { around_body ? around_body.call { yield } : yield }
             result = if explicit_span_receiver
@@ -682,6 +692,14 @@ module Bitfab
       raise ArgumentError, "id must be a valid Bitfab span ID" unless id.is_a?(String) && UUID_PATTERN.match?(id)
     end
 
+    def nearest_captured_ancestor_span_id
+      SpanContext.stack.reverse_each do |entry|
+        sends = entry[:sends_on_completion]
+        return entry[:span_id] if sends.nil? || sends.call
+      end
+      nil
+    end
+
     def content_off_by_simulation_plan?(trace_id:, trace_function_key:, span_name:, instrumentation: "span")
       return false if SimulationPlan::FRAMEWORKS.include?(instrumentation)
 
@@ -926,7 +944,8 @@ module Bitfab
     def send_span(trace_function_key:, trace_id:, span_id:, parent_span_id:,
       span_name:, span_type:, function_name:, contexts:, prompt:, args:, kwargs:, result:, error:,
       started_at:, ended_at:, test_run_id: nil, input_source_span_id: nil, mocked: false,
-      mock_target: nil, mock_source: nil, span_data: {}, instrumentation: "span", declared_node: false)
+      mock_target: nil, mock_source: nil, span_data: {}, instrumentation: "span", declared_node: false,
+      nearest_captured_ancestor_span_id: nil)
       extra_span_data = span_data
       # If drop() was called on this trace, suppress the span PAYLOAD upload for
       # every span that completes after the flag was set. The trace completion
@@ -982,6 +1001,9 @@ module Bitfab
         "span_origin" => Bitfab.make_span_origin(instrumentation)
       }
       raw_span["parent_id"] = parent_span_id if parent_span_id
+      if nearest_captured_ancestor_span_id && nearest_captured_ancestor_span_id != parent_span_id
+        raw_span["nearest_captured_ancestor_id"] = nearest_captured_ancestor_span_id
+      end
       raw_span["input_source_span_id"] = input_source_span_id if input_source_span_id
 
       payload = {

data/lib/bitfab/http_client.rb

@@ -262,7 +262,7 @@ module Bitfab
     #   same org and trace function or the server rejects the replay
     def start_replay(trace_function_key, limit, trace_ids: nil, code_change_description: nil,
       code_change_files: nil, experiment_group_id: nil, name: nil, include_db_branch_lease: false, dataset_ids: nil,
-      grader_ids: nil, db_branch_settings: nil, attempts: 1, only_with_assertions: false, include_original_metadata: false)
+      grader_ids: nil, db_branch_settings: nil, attempts: 1, only_with_assertions: false, judge_assertions: false, include_original_metadata: false)
       payload = {
         "traceFunctionKey" => trace_function_key
       }
@@ -286,6 +286,7 @@ module Bitfab
       payload["graderIds"] = grader_ids unless grader_ids.nil?
       payload["attempts"] = attempts if attempts > 1
       payload["onlyWithAssertions"] = true if only_with_assertions
+      payload["judgeAssertions"] = true if judge_assertions
       payload["includeOriginalMetadata"] = true if include_original_metadata
       payload["dbBranchSettings"] = db_branch_settings unless db_branch_settings.nil?
       git_state = GitState.resolved

data/lib/bitfab/replay.rb

@@ -258,7 +258,7 @@ module Bitfab
     # @return [Hash] with :items, :test_run_id, :test_run_url
     def run(client, receiver, method_name, trace_function_key:, limit: nil, trace_ids: nil, name: nil,
       concurrency: nil, max_concurrency: ReplayConcurrency::UNSET, code_change_description: CODE_CHANGE_UNSET, code_change_files: CODE_CHANGE_UNSET, experiment_group_id: nil,
-      dataset_id: nil, dataset_ids: nil, grader_ids: nil, mock: "marked", attempts: ReplayConcurrency::UNSET, only_with_assertions: false, dry_run: false,
+      dataset_id: nil, dataset_ids: nil, grader_ids: nil, mock: "marked", attempts: ReplayConcurrency::UNSET, only_with_assertions: false, judge_assertions: false, dry_run: false,
       adapt_inputs: nil, mock_override: nil, db_branch: nil, on_item_start: nil, on_item_finish: nil, on_progress: nil)
       concurrency_options = ReplayConcurrency.resolve(concurrency, attempts, max_concurrency)
       attempts = concurrency_options.attempts
@@ -354,6 +354,7 @@ module Bitfab
         grader_ids:,
         attempts:,
         only_with_assertions:,
+        judge_assertions:,
         include_original_metadata: !adapt_inputs.nil?,
         db_branch_settings: resolved_db_branch_settings
       )

data/lib/bitfab/replay_registry.rb

@@ -21,7 +21,7 @@ module Bitfab
     OPTION_NAMES = %i[
       limit trace_ids name concurrency max_concurrency code_change_description
       code_change_files experiment_group_id dataset_id dataset_ids grader_ids mock
-      mock_override adapt_inputs db_branch attempts only_with_assertions dry_run on_item_finish
+      mock_override adapt_inputs db_branch attempts only_with_assertions judge_assertions dry_run on_item_finish
     ].freeze
 
     def initialize

data/lib/bitfab/span_context.rb

@@ -150,8 +150,9 @@ module Bitfab
 
     # Execute a block with a new span pushed onto the stack.
     # The span is automatically popped when the block completes.
-    def with_span(trace_id:, span_id:, explicit_span_receiver: nil, explicit_span_method_name: nil, surface: nil, recording_override: nil, content_withheld: nil)
+    def with_span(trace_id:, span_id:, explicit_span_receiver: nil, explicit_span_method_name: nil, surface: nil, recording_override: nil, content_withheld: nil, sends_on_completion: nil)
       entry = {trace_id:, span_id:}
+      entry[:sends_on_completion] = sends_on_completion if sends_on_completion
       entry[:surface] = surface if surface
       entry[:recording_override] = recording_override if recording_override
       entry[:content_withheld] = content_withheld if content_withheld

data/lib/bitfab/version.rb

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

metadata

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