bitfab 0.36.6 → 0.36.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd73e07889e4f74cd94c6ca534e423a7aa95e3ce6f1e1ba306e9fe33df8de8df
-  data.tar.gz: fb2eb3cd99066d8338f6ad03d18bc3a8de9f3955659aa66835c83066a95d3595
+  metadata.gz: f18189ba0b9b7a2c8cd23ee6672f927af7f9f6400457d71d86b90c13a61698e9
+  data.tar.gz: 61f38c9eb03166eeef759aca2914a015e92fe89247c163541c786331ed8fa26d
 SHA512:
-  metadata.gz: b7155a3d0426c00f57668975485f2ba722bd3f0555dd897024f586290b36265f5851d49cc88242eb552421758b9d624b31e21edfb8290e68f693110e8b93cd32
-  data.tar.gz: 87ae26a27f8864294f431b80d87f0a7f768fdb2a2f09786929dad90d61316ce7c1106e75fe9271c63260cebe3545a2e73676e94295aa281f4d24c0d101184b0f
+  metadata.gz: 8940e1f95426c3fa3343d48a340b3b4b2d2adec10c714b9e204ac7fdcfa348fba28b6bf4ed1820c1acd67536883a21701ccf401bc547cf2c3bd4c9b929169f6f
+  data.tar.gz: 88935462030c7997ab153444e327666cc0040a0baed397c19322bfd1cedff2c9ef6624b64ce227aba02cad471d6ad05c639b1cdfbdb6a69f3a6e2f1346dca395

data/lib/bitfab/otel.rb

@@ -19,6 +19,7 @@ module Bitfab
   module Otel
     OPERATION_ATTRIBUTE = "bitfab.operation"
     PAYLOAD_ATTRIBUTE = "bitfab.payload"
+    CARRIER_REF_IVAR = :@bitfab_carrier_ref
     MAX_REQUEST_BYTES_ENV = "BITFAB_OTEL_MAX_REQUEST_BYTES"
     EXPORT_CONCURRENCY_ENV = "BITFAB_OTEL_EXPORT_CONCURRENCY"
     MAX_EXPORT_REQUEST_BYTES = 3_000_000
@@ -164,24 +165,6 @@ module Bitfab
         end
       end
 
-      # Bounded, because the only thing that removes an entry is the encode
-      # that consumes it: a span the processor drops under backpressure never
-      # reaches encode, and its ref would otherwise sit here for the life of the
-      # process. The queue is the ceiling on how many spans can be waiting at
-      # once, so anything older than that is already unreachable. Evicting a
-      # live one costs an ack, and the barrier falls back to asking the server.
-      def record_carrier_ref(span_id, ref)
-        ensure_process_state
-        submission_mutex.synchronize do
-          carrier_refs[span_id] = ref
-          carrier_refs.shift while carrier_refs.size > MAX_QUEUE_SIZE
-        end
-      end
-
-      def take_carrier_ref(span_id)
-        submission_mutex.synchronize { carrier_refs.delete(span_id) }
-      end
-
       def monotonic_now
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
@@ -198,10 +181,8 @@ module Bitfab
         reset_state_after_fork
       end
 
-      # Carrier refs belong to the parent's run, never the child's.
       def reset_state_after_fork
         @state_pid = Process.pid
-        @carrier_refs = {}
       end
 
       private
@@ -217,14 +198,6 @@ module Bitfab
       def live_transports_mutex
         @live_transports_mutex ||= Mutex.new
       end
-
-      def submission_mutex
-        @submission_mutex ||= Mutex.new
-      end
-
-      def carrier_refs
-        @carrier_refs ||= {}
-      end
     end
 
     # Encodes carrier spans as OTLP/JSON and posts them straight to Bitfab.
@@ -551,6 +524,7 @@ module Bitfab
           payload,
           max_carrier_bytes: PayloadBudget::MAX_COMPRESSIBLE_SPAN_CARRIER_BYTES
         )
+        encoded_payload.instance_variable_set(CARRIER_REF_IVAR, meta.ref) if meta.ref
         started_at = meta.started_at || Time.now
         ended_at = meta.ended_at || Time.now
         errored = meta.errored
@@ -573,7 +547,6 @@ module Bitfab
             },
             start_timestamp: started_at
           )
-          Otel.record_carrier_ref(span.context.hex_span_id, meta.ref) if meta.ref
           span.status = OpenTelemetry::Trace::Status.error if errored
           span.finish(end_timestamp: ended_at)
         end
@@ -709,7 +682,9 @@ module Bitfab
       class << self
         def encode_span(span)
           encoded = JSON.generate(span_to_otlp(span))
-          EncodedSpan.new(encoded, encoded.bytesize, Otel.take_carrier_ref(span.hex_span_id))
+          payload = span.attributes&.fetch(PAYLOAD_ATTRIBUTE, nil)
+          ref = payload&.instance_variable_get(CARRIER_REF_IVAR)
+          EncodedSpan.new(encoded, encoded.bytesize, ref)
         end
 
         def trim_span(span)

data/lib/bitfab/version.rb

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

metadata

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