opentrace 0.14.1 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e351721dd14bd088cfae4e5ab01a8ef16686fff3f2d1cb9aed984fad47c48c6
-  data.tar.gz: 8a098bfb548ea1a867aa1a57a50ebec3214a466e29d88f5a515a5409839650f5
+  metadata.gz: e5c67d0aecd2be7ec0624bd339bda99a46d8c2de8d0a04009d6778f94cefee3d
+  data.tar.gz: 0b54c97978becc24a2339e1f615de4f715388fc9247dc88099880dc7e1532a43
 SHA512:
-  metadata.gz: b383410de64041a2b247d8b44d511bf5bde57f4e7c62fd7ceabdd0dd875a487d0ec3c21eb46d524d3ed55cb4faaef3e8acc4046bfec724040990f918d5f02fd2
-  data.tar.gz: e822d353c5b393c0a408fe63926df46631ef0b90b726fa48db9d6feaf033185778af3436988994eb3b555f32c4009d4603e4e5f3f96b9a092c7d4f3758275187
+  metadata.gz: 60bc99ef6e4e950851358a9dbf3b2b8342209f81ff24d58eb248c07362657d4c040c1f60e6e8fdb3cb56d625cac4f8b9a4641e953241a1af52195f27232790f6
+  data.tar.gz: d655b2237f513c8b3fe8a12e936086937fc80b1f50d5bb3766b6e5ef3ed1a137d90bf9798546aa99413633dba9e9588c87f2b99d4e54e226c0842fea720f309e

data/lib/opentrace/circuit_breaker.rb

@@ -14,6 +14,7 @@ module OpenTrace
       @state             = CLOSED
       @failure_count     = 0
       @last_failure_at   = nil
+      @half_open_probe_sent = false
       @mutex             = Mutex.new
     end
 
@@ -25,12 +26,18 @@ module OpenTrace
         when OPEN
           if Time.now - @last_failure_at >= @recovery_timeout
             @state = HALF_OPEN
+            @half_open_probe_sent = true
             true
           else
             false
           end
         when HALF_OPEN
-          false
+          if @half_open_probe_sent
+            false
+          else
+            @half_open_probe_sent = true
+            true
+          end
         end
       end
     end
@@ -38,6 +45,7 @@ module OpenTrace
     def record_success
       @mutex.synchronize do
         @failure_count = 0
+        @half_open_probe_sent = false
         @state = CLOSED
       end
     end
@@ -46,7 +54,12 @@ module OpenTrace
       @mutex.synchronize do
         @failure_count += 1
         @last_failure_at = Time.now
-        @state = OPEN if @failure_count >= @failure_threshold
+        if @state == HALF_OPEN
+          @half_open_probe_sent = false
+          @state = OPEN
+        elsif @failure_count >= @failure_threshold
+          @state = OPEN
+        end
       end
     end
 
@@ -55,6 +68,7 @@ module OpenTrace
         @state = CLOSED
         @failure_count = 0
         @last_failure_at = nil
+        @half_open_probe_sent = false
       end
     end
   end

data/lib/opentrace/client.rb

@@ -322,11 +322,20 @@ module OpenTrace
       @rate_limit_until = Time.now + retry_after
 
       # Re-enqueue batch items if space allows
+      re_enqueued = 0
       batch.each do |payload|
         break if @queue.size >= MAX_QUEUE_SIZE
-        @queue.push(payload)
-      rescue ClosedQueueError
-        break
+        begin
+          @queue.push(payload)
+          re_enqueued += 1
+        rescue ClosedQueueError
+          break
+        end
+      end
+      dropped = batch.size - re_enqueued
+      if dropped > 0
+        @stats.increment(:dropped_error, dropped)
+        fire_on_drop(dropped, :shutdown)
       end
     end
 
@@ -404,6 +413,8 @@ module OpenTrace
     end
 
     def unix_socket_send(json)
+      require "socket" unless defined?(UNIXSocket)
+
       payload = if @config.compression && json.bytesize > @config.compression_threshold
                   gzip_compress(json)
                 else
@@ -416,9 +427,14 @@ module OpenTrace
       socket.write(payload)
       socket.flush
 
-      # Read 4-byte status code response
-      response_data = socket.read(4)
-      status = response_data&.unpack1("N") || 500
+      # Read 4-byte status code response with timeout
+      if IO.select([socket], nil, nil, 5)
+        response_data = socket.read(4)
+        status = response_data&.unpack1("N") || 500
+      else
+        @stats.increment(:socket_timeouts)
+        status = 500
+      end
       socket.close
 
       UnixSocketResponse.new(status)

data/lib/opentrace/config.rb

@@ -23,7 +23,7 @@ module OpenTrace
                   :trace_propagation,
                   :log_forwarding, :view_tracking, :cache_tracking,
                   :deprecation_tracking, :detailed_request_log,
-                  :sample_rate, :sampler, :before_send,
+                  :sampler, :before_send,
                   :sql_normalization, :log_trace_injection,
                   :source_context, :before_breadcrumb,
                   :pii_scrubbing, :pii_patterns, :pii_disabled_patterns,
@@ -35,7 +35,7 @@ module OpenTrace
                 :runtime_metrics, :runtime_metrics_interval
 
     # Custom writers that invalidate caches
-    attr_reader :enabled, :min_level, :allowed_levels, :ignore_paths
+    attr_reader :enabled, :min_level, :allowed_levels, :ignore_paths, :sample_rate
 
     def enabled=(val)
       @enabled = val
@@ -56,6 +56,14 @@ module OpenTrace
       @ignore_paths = val
     end
 
+    def sample_rate=(val)
+      val = val.to_f
+      unless (0.0..1.0).cover?(val)
+        raise ArgumentError, "sample_rate must be between 0.0 and 1.0, got #{val}"
+      end
+      @sample_rate = val
+    end
+
     def initialize
       @endpoint    = nil
       @api_key     = nil

data/lib/opentrace/middleware.rb

@@ -5,6 +5,22 @@ require_relative "trace_context"
 
 module OpenTrace
   class Middleware
+    # All Fiber-local keys managed by this middleware.
+    # Centralised so cleanup never misses one.
+    FIBER_KEYS = %i[
+      opentrace_collector
+      opentrace_cached_context
+      opentrace_sql_count
+      opentrace_sql_total_ms
+      opentrace_trace_id
+      opentrace_span_id
+      opentrace_parent_span_id
+      opentrace_transaction_name
+      opentrace_breadcrumbs
+      opentrace_session_id
+      opentrace_pending_explains
+    ].freeze
+
     def initialize(app)
       @app = app
     end
@@ -65,22 +81,16 @@ module OpenTrace
         collector.memory_after = current_rss_mb
       end
 
-      Fiber[:opentrace_collector] = nil
-      Fiber[:opentrace_cached_context] = nil
-      Fiber[:opentrace_sql_count] = nil
-      Fiber[:opentrace_sql_total_ms] = nil
-      Fiber[:opentrace_trace_id] = nil
-      Fiber[:opentrace_span_id] = nil
-      Fiber[:opentrace_parent_span_id] = nil
-      Fiber[:opentrace_transaction_name] = nil
-      Fiber[:opentrace_breadcrumbs] = nil
-      Fiber[:opentrace_session_id] = nil
-      Fiber[:opentrace_pending_explains] = nil
+      cleanup_fiber_locals
       OpenTrace.current_request_id = nil
     end
 
     private
 
+    def cleanup_fiber_locals
+      FIBER_KEYS.each { |key| Fiber[key] = nil }
+    end
+
     # Extract trace context from incoming request headers.
     # Priority: W3C traceparent > X-Trace-ID > request_id > generate new
     def extract_trace_context(env)

data/lib/opentrace/payload_builder.rb

@@ -13,7 +13,9 @@ module OpenTrace
       elsif entry.is_a?(Hash)
         entry # legacy direct payload
       end
-    rescue StandardError
+    rescue StandardError => e
+      OpenTrace.stats.increment(:payload_build_errors) if OpenTrace.respond_to?(:stats)
+      $stderr.puts "[OpenTrace] PayloadBuilder error: #{e.class}: #{e.message}" if OpenTrace.respond_to?(:config) && OpenTrace.config.respond_to?(:debug) && OpenTrace.config.debug
       nil
     end
 
@@ -26,12 +28,18 @@ module OpenTrace
 
       static_ctx = OpenTrace.send(:static_context)
       static_ctx.each { |k, v| meta[k] ||= v }
-      meta[:request_id] ||= request_id if request_id
 
       # Extract trace_id from metadata if user provided it there
       meta_trace_id = meta.delete(:trace_id)
       effective_trace_id = meta_trace_id || trace_id
 
+      # Promote indexed fields to top-level (remove from metadata to avoid duplication)
+      commit_hash = meta.delete(:git_sha)
+      effective_request_id = meta.delete(:request_id) || request_id
+      exception_class = meta.delete(:exception_class)
+      error_fingerprint = meta.delete(:error_fingerprint)
+      source_file, source_line = extract_source_location(meta[:backtrace])
+
       payload = {
         timestamp: format_timestamp(ts),
         level: level.to_s.upcase,
@@ -41,6 +49,12 @@ module OpenTrace
         metadata: meta.compact
       }
 
+      payload[:commit_hash] = commit_hash if commit_hash
+      payload[:request_id] = effective_request_id.to_s if effective_request_id
+      payload[:exception_class] = exception_class if exception_class
+      payload[:error_fingerprint] = error_fingerprint if error_fingerprint
+      payload[:source_file] = source_file if source_file
+      payload[:source_line] = source_line if source_line && source_line > 0
       payload[:event_type] = event_type.to_s if event_type
       payload[:trace_id] = effective_trace_id.to_s if effective_trace_id
       payload[:span_id] = span_id if span_id
@@ -67,13 +81,19 @@ module OpenTrace
         meta[:user_id] = cached_ctx[:user_id]
       end
 
+      exception_class = nil
+      error_fingerprint = nil
+      source_file = nil
+      source_line = nil
+
       if exc_class
-        meta[:exception_class] = exc_class
+        exception_class = exc_class
         meta[:exception_message] = exc_message&.slice(0, 500)
         if exc_backtrace
           cleaned = clean_backtrace(exc_backtrace)
           meta[:backtrace] = cleaned.first(15)
-          meta[:error_fingerprint] = OpenTrace.send(:compute_error_fingerprint, exc_class, cleaned)
+          error_fingerprint = OpenTrace.send(:compute_error_fingerprint, exc_class, cleaned)
+          source_file, source_line = extract_source_location(cleaned)
         end
       end
 
@@ -117,6 +137,10 @@ module OpenTrace
                 end
       meta[:transaction_name] = transaction_name if transaction_name
 
+      # Promote indexed fields to top-level (remove from metadata to avoid duplication)
+      commit_hash = meta.delete(:git_sha)
+      effective_request_id = meta.delete(:request_id) || request_id
+
       payload = {
         timestamp: format_timestamp(started),
         level: level,
@@ -125,6 +149,12 @@ module OpenTrace
         message: message,
         metadata: meta.compact
       }
+      payload[:commit_hash] = commit_hash if commit_hash
+      payload[:request_id] = effective_request_id.to_s if effective_request_id
+      payload[:exception_class] = exception_class if exception_class
+      payload[:error_fingerprint] = error_fingerprint if error_fingerprint
+      payload[:source_file] = source_file if source_file
+      payload[:source_line] = source_line if source_line && source_line > 0
       payload[:trace_id] = trace_id.to_s if trace_id
       payload[:span_id] = span_id if span_id
       payload[:parent_span_id] = parent_span_id if parent_span_id
@@ -143,6 +173,22 @@ module OpenTrace
       end
     end
 
+    # Extract source file and line number from the first app-relevant backtrace line.
+    # Format: "app/controllers/users_controller.rb:42:in `show'"
+    def extract_source_location(backtrace)
+      return [nil, nil] unless backtrace.is_a?(Array) && !backtrace.empty?
+
+      line = backtrace.first.to_s
+      parts = line.split(":", 3)
+      return [nil, nil] if parts.length < 2
+
+      file = parts[0]
+      line_num = parts[1].to_i
+      [file, line_num]
+    rescue StandardError
+      [nil, nil]
+    end
+
     def clean_backtrace(backtrace)
       if defined?(::Rails) && ::Rails.respond_to?(:backtrace_cleaner)
         ::Rails.backtrace_cleaner.clean(backtrace)

data/lib/opentrace/stats.rb

@@ -26,10 +26,8 @@ module OpenTrace
       @started_at = Time.now
     end
 
-    # Hot path: no mutex. Under CRuby's GIL, Hash#[]= with integer
-    # increment is effectively atomic for single operations.
     def increment(counter, amount = 1)
-      @counters[counter] += amount
+      @mutex.synchronize { @counters[counter] += amount }
     end
 
     def get(counter)

data/lib/opentrace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenTrace
-  VERSION = "0.14.1"
+  VERSION = "0.15.1"
 end

data/lib/opentrace.rb

@@ -25,13 +25,17 @@ module OpenTrace
   # Null object for when OpenTrace is not configured.
   # All methods are no-ops, avoiding nil checks on the hot path.
   class NilClient
+    def initialize
+      @nil_stats = NilStats.new
+    end
+
     def enqueue(_) = nil
     def shutdown(timeout: 5) = nil
     def queue_size = 0
     def circuit_state = :closed
     def auth_suspended? = false
     def stats_snapshot = { queue_size: 0, circuit_state: :closed, auth_suspended: false }
-    def stats = NilStats.new
+    def stats = @nil_stats
     def supports?(_) = false
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentrace
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.1
 platform: ruby
 authors:
 - OpenTrace