bitfab 0.65.0 → 0.65.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa27d322488c12e530f14a5f85a7f9978208edf332ab91f7bf156f4ccb7b0b25
-  data.tar.gz: f8cadf7e8693aa155c254b7866b41f1781d5de4493dad8b0aad6643d285469a6
+  metadata.gz: 9ed49d0b493c83442f21b1fc0ec1598cc675ce438601c357d9e3b16173c9e06d
+  data.tar.gz: fde85c743c635b053536c67ede3cced56eb560f92e13ed4014851399ef0f9fa1
 SHA512:
-  metadata.gz: b274fec88de7c05f84977a60cc146290e89e2e8778fec9a498967304cc2c46a7cb65efa27f65210ec76ba1a2b58dbd3738e4f969d6ac126a9c3a87b25f80c30c
-  data.tar.gz: 8ddf0c559dc1dd33139497e18acf48a065017a59ea05b81e708ee9d3aa4a8eae1b202fb1b5243e7027131b27bcaedd5a2c3065df2fa964793c388609f199e3ad
+  metadata.gz: ed71773a0f5eb1b56f7245e6b77add9c61119ed38dabb2271f322e07b7cbda014d22f9167d52631ebdb99452f64916c1713ec0808042c43db8c1a37184ad5a34
+  data.tar.gz: 4539a52a91412534ef12b06ac326b14280ed09b241f203783c731c9ab5b8c4879f623b977ab71124ac2d1c90b4e8e29e27dbbdf7e6ba94ef3a14afe0d9599327

data/lib/bitfab/subtree.rb

@@ -796,6 +796,8 @@ module Bitfab
       end
 
       def skip_boundary_call?(event)
+        return false if sdk_frame?(event.path)
+
         boundary = @stacks[Fiber.current.object_id]&.last
         if boundary.is_a?(Boundary) && boundary.skip_next_call &&
             boundary.receiver.equal?(event.self) && boundary.method_name == called_method_id(event)
@@ -819,6 +821,13 @@ module Bitfab
         true
       end
 
+      def sdk_frame?(path)
+        @sdk_frames ||= {}
+        @sdk_frames.fetch(path) do
+          @sdk_frames[path] = Subtree.realpath(path)&.start_with?(SDK_PREFIX) || false
+        end
+      end
+
       def passthrough_wrapper?(parameters)
         kinds = parameters.map(&:first)
         kinds.any? { |kind| kind == :rest || kind == :keyrest } &&

data/lib/bitfab/traceable.rb

@@ -108,7 +108,7 @@ module Bitfab
               client: target_client, trace_function_key:, config: capture_config,
               max_depth:, max_captured_subtree_spans:, include_wrappers:, mock_on_replay_default:,
               root_receiver: self, root_method_name: method_name
-            ) { super(*args, **kwargs, &block) }
+            ) { Traceable.send(:as_root_call, self, method_name) { super(*args, **kwargs, &block) } }
           end
           call = Subtree::ConfiguredCall.new(receiver: self, method_name:, name: span_name,
             type:, args:, kwargs:, nested_trace_key: trace_function_key)
@@ -122,12 +122,14 @@ module Bitfab
               client: target_client, trace_function_key:, config: capture_config,
               max_depth:, max_captured_subtree_spans:, include_wrappers:, mock_on_replay_default:,
               root_receiver: self, root_method_name: method_name
-            ) { super(*args, **kwargs, &block) }
+            ) { Traceable.send(:as_root_call, self, method_name) { super(*args, **kwargs, &block) } }
           end
         end
       end
       wrapper.instance_variable_set(:@bitfab_span_method, method_name_str)
       wrapper.instance_variable_set(:@bitfab_span_key, trace_function_key)
+      wrapper.instance_variable_set(:@bitfab_trace_method, method_name_str)
+      wrapper.instance_variable_set(:@bitfab_trace_client, bound_client)
       preserve_visibility(klass, wrapper, method_name)
       klass.prepend(wrapper)
     end
@@ -142,9 +144,12 @@ module Bitfab
       bound_client = client
       wrapper = Module.new do
         define_method(method_name) do |*args, **kwargs, &block|
+          next super(*args, **kwargs, &block) if Traceable.send(:own_span_call?, self, method_name)
+
           Subtree.assert_surface!(:trace)
           session = Subtree.current_session
-          if !session || (bound_client && !session.client.equal?(bound_client))
+          if !session || (bound_client && !session.client.equal?(bound_client)) ||
+              Traceable.send(:root_handles_call?, self, method_name, wrapper)
             next super(*args, **kwargs, &block)
           end
           unless capture
@@ -176,6 +181,49 @@ module Bitfab
       klass.prepend(wrapper)
     end
 
+    ROOT_CALL_KEY = :bitfab_root_call
+
+    def self.as_root_call(receiver, method_name)
+      previous = Thread.current[ROOT_CALL_KEY]
+      Thread.current[ROOT_CALL_KEY] = [receiver, method_name.to_sym]
+      yield
+    ensure
+      Thread.current[ROOT_CALL_KEY] = previous
+    end
+    private_class_method :as_root_call
+
+    def self.root_handles_call?(receiver, method_name, node_wrapper)
+      marker = Thread.current[ROOT_CALL_KEY]
+      if marker && marker[0].equal?(receiver) && marker[1] == method_name.to_sym
+        Thread.current[ROOT_CALL_KEY] = nil
+        return true
+      end
+
+      trace_wrapper = inner_trace_wrapper(receiver, method_name, node_wrapper)
+      return false unless trace_wrapper
+
+      client = trace_wrapper.instance_variable_get(:@bitfab_trace_client) || Bitfab.client_or_nil
+      (client&.send(:should_record?) && !Subtree.nested_root_suppressed?) ? true : false
+    end
+    private_class_method :root_handles_call?
+
+    def self.own_span_call?(receiver, method_name)
+      span = SpanContext.current
+      return false unless span && span[:surface] == :span
+
+      span[:explicit_span_receiver].equal?(receiver) && span[:explicit_span_method_name] == method_name
+    end
+    private_class_method :own_span_call?
+
+    def self.inner_trace_wrapper(receiver, method_name, node_wrapper)
+      ancestors = receiver.is_a?(Module) ? receiver.singleton_class.ancestors : receiver.class.ancestors
+      name = method_name.to_s
+      ancestors.drop_while { |mod| !mod.equal?(node_wrapper) }.find do |mod|
+        mod.instance_variable_defined?(:@bitfab_trace_method) && mod.instance_variable_get(:@bitfab_trace_method) == name
+      end
+    end
+    private_class_method :inner_trace_wrapper
+
     def self.source_of(klass, method_name)
       path, line = klass.instance_method(method_name).source_location || [nil, nil]
       [path, line, method_name]
@@ -345,15 +393,14 @@ module Bitfab
 
       def method_added(method_name)
         super
+        if defined?(@_bitfab_pending_nodes) && @_bitfab_pending_nodes&.key?(method_name)
+          _bitfab_node_method(method_name, **@_bitfab_pending_nodes.delete(method_name))
+        end
         if defined?(@_bitfab_pending_spans) && @_bitfab_pending_spans&.key?(method_name)
-          config = @_bitfab_pending_spans.delete(method_name)
-          _bitfab_wrap_method(method_name, **config)
-        elsif defined?(@_bitfab_pending_traces) && @_bitfab_pending_traces&.key?(method_name)
-          config = @_bitfab_pending_traces.delete(method_name)
-          _bitfab_trace_method(method_name, **config)
-        elsif defined?(@_bitfab_pending_nodes) && @_bitfab_pending_nodes&.key?(method_name)
-          config = @_bitfab_pending_nodes.delete(method_name)
-          _bitfab_node_method(method_name, **config)
+          _bitfab_wrap_method(method_name, **@_bitfab_pending_spans.delete(method_name))
+        end
+        if defined?(@_bitfab_pending_traces) && @_bitfab_pending_traces&.key?(method_name)
+          _bitfab_trace_method(method_name, **@_bitfab_pending_traces.delete(method_name))
         end
       end
 

data/lib/bitfab/version.rb

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

metadata

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