opentrace 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb32ca6add6d7b4d92ca4f05177c785e3e266b38d5aa2406f8ac28704ccecb0
-  data.tar.gz: 9da8b1f881bdc66df31692edf4eb08c49cd6a6fd70dba9f8d04a5ac5a1298de8
+  metadata.gz: d768edfb2fd22f19187ff5e8f51abde81345f7a04cde6cc3a367ba4a1bc74faf
+  data.tar.gz: 0fe2d4458c4f1cbb4599ec27420a42b3e20e1c548129c19ef0181f34ea2dd81b
 SHA512:
-  metadata.gz: d32b99d092d9fdf1f90db8a3f911b86c7e05d47222a69d253f17e2ee73adc885594435dd36b073a68efe544479eb2b645f3d74f9dfe9d0b561e20189e0303b86
-  data.tar.gz: 73caacdb683c3b109337be153e640b5cbfbd1343b02d84ca4f796447597206a7b85bf076668a78f9e188f4f614ac3d8b8adaad020f5aa7caf29ada8aa10bc9bd
+  metadata.gz: 5eaa0f312e0a689744d42d9e06ce63a211024d377f0a2e7e68cb2879510636866957ed5dcedbfda5ede82d8dd223dc1e47197ef951ab4aeeb5c738c2501f4b87
+  data.tar.gz: c4b49a941eb4eec04db0d5d2ebf5973c45bd43ceda14c2043c44ff82554c78cffdb48a493b2e69c3eb1b40566977b3eae465d463f85729bad5f3fa85742032a4

data/lib/opentrace/client.rb

@@ -175,38 +175,50 @@ module OpenTrace
       deadline = Time.now + @config.flush_interval
 
       loop do
-        if batch.empty?
-          # Block until first item arrives or timeout
-          item = pop_with_timeout(deadline - Time.now)
-          return nil if item.nil? && @queue.closed?
-          batch << item if item
-        else
-          # Non-blocking drain up to batch_size
-          while batch.size < @config.batch_size
-            begin
-              item = @queue.pop(true) # non_block = true
-              batch << item
-            rescue ThreadError
-              break # queue empty
-            end
+        # Non-blocking drain: grab everything currently in the queue
+        while batch.size < @config.batch_size
+          begin
+            item = @queue.pop(true) # non_block = true
+            batch << item
+          rescue ThreadError, ClosedQueueError
+            break # queue empty or closed
           end
         end
 
         break if batch.size >= @config.batch_size
         break if Time.now >= deadline
-        break if @queue.closed?
+
+        # Queue closed — return remaining items or nil to signal shutdown
+        if @queue.closed?
+          return batch.empty? ? nil : batch
+        end
+
+        # Queue is empty but we haven't hit batch_size or deadline.
+        # Block (up to MAX_POP_WAIT) instead of busy-spinning so we
+        # release the GIL and let request-serving fibers run.
+        item = pop_with_timeout(deadline - Time.now)
+        return nil if item.nil? && @queue.closed?
+        batch << item if item
       end
 
       batch
     end
 
+    # Maximum time to block in a single Queue#pop call.
+    # Falcon (and other fiber-based servers) rely on the GIL being released
+    # periodically so their health-check fibers can run.  A long blocking
+    # pop (e.g. 5 seconds) starves those fibers and causes Falcon to
+    # SIGKILL the worker.  By capping at 0.5s we yield the GIL frequently
+    # enough to keep the health-check happy (30s default timeout).
+    MAX_POP_WAIT = 0.5
+
     def pop_with_timeout(timeout)
       if timeout <= 0
         # Deadline already passed — still try a non-blocking pop in case
         # items arrived while we were busy (e.g. during version check).
         @queue.pop(true)
       else
-        @queue.pop(timeout: timeout)
+        @queue.pop(timeout: [timeout, MAX_POP_WAIT].min)
       end
     rescue ThreadError, ClosedQueueError
       nil

data/lib/opentrace/config.rb

@@ -6,7 +6,7 @@ module OpenTrace
     LEVELS = { debug: 0, info: 1, warn: 2, error: 3, fatal: 4 }.freeze
     LEVEL_INTS = { "DEBUG" => 0, "INFO" => 1, "WARN" => 2, "ERROR" => 3, "FATAL" => 4 }.freeze
 
-    attr_accessor :endpoint, :api_key, :service, :environment, :timeout, :enabled,
+    attr_accessor :endpoint, :api_key, :service, :environment, :timeout,
                   :context, :hostname, :pid, :git_sha,
                   :batch_size, :flush_interval,
                   :max_retries, :retry_base_delay, :retry_max_delay,
@@ -34,8 +34,13 @@ module OpenTrace
                 :explain_slow_queries, :explain_threshold_ms,
                 :runtime_metrics, :runtime_metrics_interval
 
-    # Custom writers that invalidate the level cache
-    attr_reader :min_level, :allowed_levels, :ignore_paths
+    # Custom writers that invalidate caches
+    attr_reader :enabled, :min_level, :allowed_levels, :ignore_paths
+
+    def enabled=(val)
+      @enabled = val
+      @enabled_cache = nil
+    end
 
     def min_level=(val)
       @min_level = val
@@ -115,6 +120,7 @@ module OpenTrace
       @runtime_metrics = false        # Collect GC/runtime metrics
       @runtime_metrics_interval = 30  # Interval in seconds
       @level_cache = nil
+      @enabled_cache = nil
     end
 
     def valid?
@@ -122,7 +128,12 @@ module OpenTrace
     end
 
     def enabled?
-      @enabled && valid?
+      # Cache the enabled+valid result to avoid recomputing valid? on every call.
+      # Invalidated by finalize! (called at end of configure block) and enabled= setter.
+      if @enabled_cache.nil?
+        @enabled_cache = @enabled && valid?
+      end
+      @enabled_cache
     end
 
     def min_level_value
@@ -138,7 +149,10 @@ module OpenTrace
         build_level_cache!
         cache = @level_cache
       end
-      key = level.to_s.upcase
+      # Avoid allocating a new String when the level is already uppercase.
+      # On the hot path (called per SQL query, per log line), this saves
+      # one String allocation per call.
+      key = level.is_a?(String) && level == level.upcase ? level : level.to_s.upcase
       result = cache[key]
       return result unless result.nil?
       # Unknown level (e.g. "UNKNOWN"): treat as severity 0
@@ -149,6 +163,7 @@ module OpenTrace
     # Pre-compute the level cache. Called at end of configure block
     # and lazily when settings change afterward.
     def finalize!
+      @enabled_cache = nil
       build_level_cache!
     end
 

data/lib/opentrace/rails.rb

@@ -43,8 +43,12 @@ if defined?(::Rails::Railtie)
           # Swallow - never affect the host app
         end
 
-        # SQL subscriber — lightweight counter + optional forwarding with filtering
+        # SQL subscriber — lightweight counter + optional forwarding with filtering.
+        # Cache config values at subscribe time to avoid repeated config lookups
+        # on every single SQL query (can be 50-200+ per request).
         sql_logging = OpenTrace.config.sql_logging
+        explain_enabled = OpenTrace.config.explain_slow_queries
+        explain_threshold = OpenTrace.config.explain_threshold_ms
         ActiveSupport::Notifications.subscribe("sql.active_record") do |name, started, finished, id, payload|
           sql_count = Fiber[:opentrace_sql_count]
           collector = Fiber[:opentrace_collector]
@@ -81,8 +85,8 @@ if defined?(::Rails::Railtie)
             end
 
             # Flag slow queries for background EXPLAIN (opt-in)
-            if OpenTrace.config.explain_slow_queries &&
-               duration_ms > OpenTrace.config.explain_threshold_ms &&
+            if explain_enabled &&
+               duration_ms > explain_threshold &&
                explainable_query?(raw_sql)
               pending = Fiber[:opentrace_pending_explains] ||= []
               if pending.size < 3
@@ -328,6 +332,12 @@ if defined?(::Rails::Railtie)
           return unless OpenTrace.enabled?
 
           duration = duration_ms&.round(2)
+
+          # Determine level BEFORE doing any expensive work (regex, hashing).
+          # Most SQL logs are DEBUG — skip everything if DEBUG is filtered.
+          level = (duration && duration > 1000) ? "WARN" : "DEBUG"
+          return unless OpenTrace.config.level_allowed?(level)
+
           threshold = OpenTrace.config.sql_duration_threshold_ms
 
           # Skip if below threshold
@@ -354,7 +364,6 @@ if defined?(::Rails::Railtie)
             metadata[:sql_table] = $1
           end
 
-          level = (duration && duration > 1000) ? "WARN" : "DEBUG"
           message = "SQL #{payload[:name]} #{duration}ms"
 
           OpenTrace.log(level, message, metadata)

data/lib/opentrace/version.rb

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

metadata

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