rails-otel-context 0.8.1 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3591d00a6587ead8c6abae8400911722b3b7e3802570dd0dcd65abc8ec2c1e79
-  data.tar.gz: 96fc8db0139458f2baa708e9b518ee70ffb35594257d321390188f6f26c14176
+  metadata.gz: c77108c1ddfab7776d31052f6633e7ec132aafb415f682099f571e5c4758db89
+  data.tar.gz: 262506de5a8bc5a4bbfa74341bdb79113fd54f4d0fe6d247c51cb35db395b006
 SHA512:
-  metadata.gz: e3c445ff373ed66d3693a26534090c24a9f1ab737c575a050c935659e575b3c466ab70d03d599d6dd0ef5a555388d7ec36ab5a41ddf496b2eb9a10577a1472d1
-  data.tar.gz: 3aa56abef92ecca9159f54495a73f73c5d0e57347020d3163318b83135d58e1b308c2565d8cfa1651a33dd865d233601cf0932466e700f88765d130408a58ecb
+  metadata.gz: 6dd47b5fcaea795a44e9e2db032fd77ccfddb97bef173be6ff1c19499e52e5ffbe26ff3b8a9ce8a5d4bf145f2f2aa58cd115aac04ac7ebf166d6dc98d0401ae6
+  data.tar.gz: 5ac0a1d07185865a92f79bab9895b04f5405b7f4a4978f6ded96878ad1b4bb0ed76c093bcd1a7ab912f5c1935f6989fb692fc4dd9d9000a2f211b294c777123d

data/lib/rails_otel_context/activerecord_context.rb

@@ -13,12 +13,10 @@ module RailsOtelContext
   #    Transaction.recent_completed.to_a where the scope method returns before
   #    SQL fires.
   module ActiveRecordContext
-    THREAD_KEY        = :_rails_otel_ctx_ar
-    SCOPE_THREAD_KEY  = :_rails_otel_ctx_scope
-    TIMING_ID_KEY     = :_rails_otel_ctx_timing_id
-    TIMING_START_KEY  = :_rails_otel_ctx_timing_start
-    DB_SLOW_ATTR      = 'db.slow'
-    private_constant :THREAD_KEY, :SCOPE_THREAD_KEY, :TIMING_ID_KEY, :TIMING_START_KEY
+    THREAD_KEY       = :_rails_otel_ctx_ar
+    SCOPE_THREAD_KEY = :_rails_otel_ctx_scope
+    DB_SLOW_ATTR     = 'db.slow'
+    private_constant :THREAD_KEY, :SCOPE_THREAD_KEY
 
     # Frozen regex — only the verb regex remains; table extraction uses index+slice.
     SQL_VERB_RE = /\A(\w+)/i
@@ -81,16 +79,11 @@ module RailsOtelContext
 
     # Subscriber for sql.active_record notifications.
     class Subscriber
-      def initialize
-        @threshold = RailsOtelContext.configuration.slow_query_threshold_ms
-      end
-
-      def start(_name, id, payload)
+      def start(_name, _id, payload)
         ar_name = payload[:name]
-        return unless ar_name
-        return if ar_name == 'SCHEMA' || ar_name.start_with?('CACHE')
+        return if ar_name == 'SCHEMA' || ar_name&.start_with?('CACHE')
 
-        ctx = if ar_name == 'SQL'
+        ctx = if ar_name.nil? || ar_name == 'SQL'
                 ActiveRecordContext.parse_sql_context(payload[:sql])
               else
                 ActiveRecordContext.parse_ar_name(ar_name)
@@ -109,11 +102,6 @@ module RailsOtelContext
         ctx[:async] = true if payload[:async]
         Thread.current[THREAD_KEY] = ctx
 
-        if @threshold
-          Thread.current[TIMING_ID_KEY]    = id
-          Thread.current[TIMING_START_KEY] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        end
-
         # Enrich the current span directly. When OTel instruments via driver-level
         # prepend (Trilogy, PG, Mysql2), the span is created BEFORE this notification
         # fires, so CallContextProcessor#on_start sees nil AR context. Applying here
@@ -123,15 +111,7 @@ module RailsOtelContext
         ActiveRecordContext.apply_to_span(OpenTelemetry::Trace.current_span, ctx)
       end
 
-      def finish(_name, id, _payload)
-        if @threshold && Thread.current[TIMING_ID_KEY].equal?(id)
-          elapsed_ms = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - Thread.current[TIMING_START_KEY]) * 1000
-          Thread.current[TIMING_ID_KEY] = nil
-          if elapsed_ms >= @threshold
-            span = OpenTelemetry::Trace.current_span
-            span.set_attribute(DB_SLOW_ATTR, true) if span.context.valid?
-          end
-        end
+      def finish(_name, _id, _payload)
       ensure
         Thread.current[THREAD_KEY] = nil
       end
@@ -195,8 +175,6 @@ module RailsOtelContext
     def clear!
       Thread.current[THREAD_KEY]       = nil
       Thread.current[SCOPE_THREAD_KEY] = nil
-      Thread.current[TIMING_ID_KEY]    = nil
-      Thread.current[TIMING_START_KEY] = nil
     end
 
     # Test helpers: set AR context directly for unit tests.
@@ -280,11 +258,14 @@ module RailsOtelContext
                 end
       return nil unless keyword
 
-      table = extract_table_after(sql, keyword)
-      return nil unless table
+      table      = extract_table_after(sql, keyword)
+      model_name = table ? ar_table_model_map[table] : nil
 
-      model_name = ar_table_model_map[table]
-      return nil unless model_name
+      # Fall back to the virtual "SQL" model when the table cannot be resolved
+      # (e.g. SELECT SLEEP(0.2), SELECT 1, raw DDL). This lets the span-name
+      # formatter produce "SQL.Select" / "SQL.Update" for tab-group purposes
+      # instead of leaving the span unnamed.
+      model_name ||= 'SQL'
 
       { model_name: model_name, method_name: verb,
         query_key: "#{model_name}.#{verb}".freeze }

data/lib/rails_otel_context/adapters/clickhouse.rb

@@ -64,7 +64,7 @@ module RailsOtelContext
             define_method(method_name) do |*args, &block|
               return super(*args, &block) if Thread.current[reentrancy_key]
 
-              source = mod.source_location_for_app
+              site      = mod.call_site_for_app
               statement = args.first.is_a?(String) ? args.first : nil
 
               tracer = OpenTelemetry.tracer_provider.tracer('rails-otel-context-clickhouse')
@@ -76,7 +76,7 @@ module RailsOtelContext
                 span.set_attribute('db.statement', statement) if statement
 
                 result = super(*args, &block)
-                mod.apply_source_to_span(span, source)
+                mod.apply_call_site_to_span(span, site)
                 result
               end
             ensure

data/lib/rails_otel_context/adapters/redis.rb

@@ -24,47 +24,35 @@ module RailsOtelContext
       def build_patch_module
         mod = Module.new do
           class << self
+            include RailsOtelContext::SourceLocation
+
             attr_accessor :app_root
 
             def configure(app_root:)
               @app_root = app_root.to_s
             end
-
-            def source_location_for_app
-              return unless Thread.respond_to?(:each_caller_location)
-
-              Thread.each_caller_location do |location|
-                path = location.absolute_path || location.path
-                next unless path&.start_with?(app_root)
-                next if path.include?('/gems/')
-
-                return [path.delete_prefix("#{app_root}/"), location.lineno]
-              end
-
-              nil
-            end
           end
 
           define_method(:call) do |command, redis_config, &block|
-            source = mod.source_location_for_app
-            return super(command, redis_config, &block) unless source
+            site = mod.call_site_for_app
+            return super(command, redis_config, &block) unless site
 
-            OpenTelemetry::Instrumentation::Redis.with_attributes(
-              'code.filepath' => source[0],
-              'code.lineno' => source[1]
-            ) do
+            attrs = { 'code.namespace' => site[:class_name], 'code.filepath' => site[:filepath] }
+            attrs['code.function'] = site[:method_name] if site[:method_name]
+            attrs['code.lineno']   = site[:lineno]      if site[:lineno]
+            OpenTelemetry::Instrumentation::Redis.with_attributes(attrs) do
               super(command, redis_config, &block)
             end
           end
 
           define_method(:call_pipelined) do |commands, redis_config, &block|
-            source = mod.source_location_for_app
-            return super(commands, redis_config, &block) unless source
+            site = mod.call_site_for_app
+            return super(commands, redis_config, &block) unless site
 
-            OpenTelemetry::Instrumentation::Redis.with_attributes(
-              'code.filepath' => source[0],
-              'code.lineno' => source[1]
-            ) do
+            attrs = { 'code.namespace' => site[:class_name], 'code.filepath' => site[:filepath] }
+            attrs['code.function'] = site[:method_name] if site[:method_name]
+            attrs['code.lineno']   = site[:lineno]      if site[:lineno]
+            OpenTelemetry::Instrumentation::Redis.with_attributes(attrs) do
               super(commands, redis_config, &block)
             end
           end

data/lib/rails_otel_context/call_context_processor.rb

@@ -39,9 +39,10 @@ module RailsOtelContext
 
     def initialize(app_root:, config: RailsOtelContext.configuration)
       @app_root = app_root.to_s
-      @request_context_enabled = config.request_context_enabled
-      @custom_span_attributes = config.custom_span_attributes
-      @span_name_formatter = config.span_name_formatter
+      @request_context_enabled     = config.request_context_enabled
+      @custom_span_attributes      = config.custom_span_attributes
+      @span_name_formatter         = config.span_name_formatter
+      @slow_query_threshold_ms     = config.slow_query_threshold_ms
     end
 
     def on_start(span, _parent_context)
@@ -51,7 +52,25 @@ module RailsOtelContext
       apply_custom_attributes(span) if @custom_span_attributes
     end
 
-    def on_finish(_span); end
+    def on_finish(span)
+      return unless @slow_query_threshold_ms
+      return unless span.respond_to?(:attributes) && span.attributes&.key?('db.system')
+
+      start_ns = span.start_timestamp
+      end_ns   = span.end_timestamp
+      return unless start_ns && end_ns
+
+      duration_ms = (end_ns - start_ns) / 1_000_000.0
+      return unless duration_ms >= @slow_query_threshold_ms
+
+      # span.recording? is false here — the span has finished and current_span
+      # has reverted to the HTTP parent. Write directly to the backing attributes
+      # hash so db.slow lands on the actual DB span, not the HTTP parent.
+      attrs = span.instance_variable_get(:@attributes)
+      attrs.store(ActiveRecordContext::DB_SLOW_ATTR, true) if attrs.respond_to?(:store)
+    rescue StandardError
+      nil
+    end
 
     def force_flush(timeout: nil); end
 

data/lib/rails_otel_context/railtie.rb

@@ -41,10 +41,17 @@ module RailsOtelContext
     initializer 'rails_otel_context.install_frame_context' do
       ActiveSupport.on_load(:action_controller) do
         around_action do |_controller, block|
+          # Reset N+1 query counter at the start of every request so counts
+          # never bleed across requests on Puma's reused threads. This runs
+          # regardless of request_context_enabled, which only gates whether
+          # RequestContext.set is called (and would reset it there too).
+          Thread.current[RailsOtelContext::RequestContext::QUERY_COUNT_KEY] = nil
           RailsOtelContext::FrameContext.with_frame(
             class_name: self.class.name,
             method_name: action_name
           ) { block.call }
+        ensure
+          Thread.current[RailsOtelContext::RequestContext::QUERY_COUNT_KEY] = nil
         end
       end
     end

data/lib/rails_otel_context/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsOtelContext
-  VERSION = '0.8.1'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-otel-context
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.5
 platform: ruby
 authors:
 - Last9