bitfab 0.65.4 → 0.65.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7bdd7dbd520e06041d5250b0b291f90b3a22d0b92ed6c43bc29b2d869f6135
-  data.tar.gz: b2a722780ca027f97c46433e6b2bba6db6223bc70122dba24e141a5b868a3c81
+  metadata.gz: a9c94aca223ea9794e110a16dae0e3e4f23ef45a2cf345c6bbaf396fc6b10b5f
+  data.tar.gz: 9c99a4266ec0109d155caeea5e1bb7792fb38c5e9d510e3552a2df60d192160a
 SHA512:
-  metadata.gz: f79740fe5b1fcae3ffb8d5926b4ecb7852988dcd36671c8b18486480b1de8b818c96f36621b2606dfc2c057b12dd7718fdaf5efa026b2102dac4cd92c9dd3e4e
-  data.tar.gz: 6e71b00586519e4edf32ee3b8c984adfcf3fa39e77b23a1dc79c6890419a3d0dda12dd9bce72bac02645fe3281e618b38d7960a9e531e09b54305f1dea9e5ed9
+  metadata.gz: fa01c2d028e06cc338df64527d011df63e0a01dcec25559b4816523c951aed2b55ab0034075c7c09babec22d927bb4e5f0654456e82fd76e5d41815d0851fa30
+  data.tar.gz: 6f865c897e2ac1975c1b2a64cfbdf5c933f24356db7294e97a8ce11712cbf1937b942701c5237cd62dd79a68ae422dfaf46ed6eba3545e6c8522bdf0070831af

data/lib/bitfab/client.rb

@@ -58,7 +58,8 @@ module Bitfab
       @resolved_api_key = nil
       @api_key_warned = false
       @http_client = HttpClient.new(api_key: -> { resolve_api_key }, service_url: @service_url, timeout:)
-      @http_client.configure_simulation_plan(enabled: simulation_plan, start: !api_key_resolved_lazily?)
+      @http_client.configure_simulation_plan(enabled: simulation_plan, start: !api_key_resolved_lazily?,
+        can_read: -> { simulation_plan_readable? })
       @datasets = Datasets.new(@http_client)
       @categories = Categories.new(@http_client)
       @organization_members = OrganizationMembers.new(@http_client)
@@ -853,6 +854,13 @@ module Bitfab
       !resolve_api_key.nil?
     end
 
+    def simulation_plan_readable?
+      recording = capture_configured? || ReplayContext.current || SeedContext.current
+      recording && !lookup_api_key.nil?
+    rescue
+      false
+    end
+
     def tracing_enabled?
       return false unless capture_configured?
 

data/lib/bitfab/http_client.rb

@@ -56,8 +56,8 @@ module Bitfab
       @close_condition = ConditionVariable.new
     end
 
-    def configure_simulation_plan(enabled: true, start: true)
-      @simulation_plan = SimulationPlan.new(self, enabled:)
+    def configure_simulation_plan(enabled: true, start: true, can_read: nil)
+      @simulation_plan = SimulationPlan.new(self, enabled:, can_read:)
       @simulation_plan.refresh if start
       @simulation_plan
     end

data/lib/bitfab/simulation_plan.rb

@@ -42,9 +42,10 @@ module Bitfab
       end
     end
 
-    def initialize(reader, enabled: true)
+    def initialize(reader, enabled: true, can_read: nil)
       @reader = reader
       @enabled = enabled
+      @can_read = can_read
       @pid = Process.pid
       @mutex = Mutex.new
       @condition = ConditionVariable.new
@@ -56,25 +57,26 @@ module Bitfab
       @stopped = false
       @first_read_finished = false
       @first_read_deadline = nil
+      @read_started = false
       self.class.register(self)
     end
 
     def disabled?
-      !@enabled || !ENV.fetch("BITFAB_DISABLE_SIM_PLAN", "").strip.empty?
+      switched_off? || (!@read_started && !readable?)
     end
 
     def refresh
       reset_after_fork
-      return if disabled? || @stopped
+      return if disabled?
 
-      @mutex.synchronize { start_reader(0) if @thread.nil? && now >= @refresh_after }
+      refresh_for_record
     end
 
     def send_span(payload, declared_node: false, discard: nil, &submit)
-      refresh
+      refresh_for_record
       data = payload.dig("rawSpan", "span_data")
       key = payload["rootTraceFunctionKey"] || payload["traceFunctionKey"]
-      if disabled? || key.nil? || !data.is_a?(Hash) || framework?(payload)
+      if switched_off? || key.nil? || !data.is_a?(Hash) || framework?(payload)
         submit.call(payload)
         return
       end
@@ -84,11 +86,11 @@ module Bitfab
     end
 
     def send_trace(payload, &submit)
-      refresh
+      refresh_for_record
       entry = [payload, nil, submit]
       ready = @mutex.synchronize do
         id = trace_id(payload)
-        if !disabled? && !@stopped && id && (@draining.include?(id) || @held.any? { |held| held[1] && trace_id(held[0]) == id })
+        if !switched_off? && !@stopped && id && (@draining.include?(id) || @held.any? { |held| held[1] && trace_id(held[0]) == id })
           hold(entry)
         else
           entry
@@ -172,6 +174,21 @@ module Bitfab
 
     private
 
+    def refresh_for_record
+      reset_after_fork
+      return if switched_off? || @stopped
+
+      @mutex.synchronize { start_reader(0) if @thread.nil? && now >= @refresh_after }
+    end
+
+    def switched_off?
+      !@enabled || !ENV.fetch("BITFAB_DISABLE_SIM_PLAN", "").strip.empty?
+    end
+
+    def readable?
+      @can_read.nil? || @can_read.call == true
+    end
+
     def now
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
@@ -194,7 +211,7 @@ module Bitfab
 
     def hold(entry)
       @held << entry
-      start_reader([@refresh_after - now, 0].max) if @thread.nil? && !@stopped && !disabled?
+      start_reader([@refresh_after - now, 0].max) if @thread.nil? && !@stopped && !switched_off?
       @held.shift if @held.length > MAX_HELD
     end
 
@@ -210,7 +227,7 @@ module Bitfab
     end
 
     def prepare(payload, key)
-      return payload if key.nil? || disabled?
+      return payload if key.nil? || switched_off?
       return apply(payload, key) if @mutex.synchronize { @content_off }
 
       without_unread_content(payload)
@@ -232,6 +249,7 @@ module Bitfab
     end
 
     def start_reader(delay)
+      @read_started = true
       @first_read_deadline ||= now + delay + READ_TIMEOUT
       @thread = Thread.new { read_until_loaded(delay) }
       @thread.name = "bitfab-sim-plan"
@@ -270,7 +288,7 @@ module Bitfab
 
     def read_until_loaded(delay)
       pause(delay) if delay.positive?
-      parsed = (disabled? || @stopped) ? nil : read_once
+      parsed = (switched_off? || @stopped) ? nil : read_once
       entries = @mutex.synchronize do
         @first_read_finished = true
         @content_off = parsed if parsed

data/lib/bitfab/version.rb

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

metadata

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