rails-otel-context 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e06fe4be3a8bd4949ad32d7fbe9e3dac1090d9044b997c7427feee131776564
-  data.tar.gz: 61e3bc83de1debb6c9cafce615a8c7328b751bdbfb2ffa5bdf037cbae1a01a86
+  metadata.gz: f8ea9eb65d7e405bbd14a39889bbad983edbba5c4bdcce252157d426a2372bc6
+  data.tar.gz: c70ddac87d64c8359fe82fe142bda62e4968b3429ea6944796b475270310d1d7
 SHA512:
-  metadata.gz: 9424d03a617834466c9f52d7fb870f1a5dfdbd39c7966cf128c5df1bd87a497af38baff4be7838a9181f9e3c23e1659299c15b27d01d22d9af295c3cbbe4b4d3
-  data.tar.gz: 6201a8a0974a549ca93e3587d0fd416f57cc92c3594922d6e72685b9641477d2800ccf2e9b7c5d72d1504bbf877c8a3c47949e272cfbd647a3b697a61de7eaf1
+  metadata.gz: cfee7357103d1336be233b9b6724c1b6678117f7fcd3e57dda75ca473a3a608c8f511e7151db29cd9bce34627fcd8d0b482fcdb640812941c960385bf57acadd
+  data.tar.gz: 15888432fb759223a87cdf35f0dd9ae00c07ac59ef038b06bd49644968996b23fc910b0cca0f0912857bf8a4101ad9d005aa66596cef5b4a1e29de68a12486c8

data/lib/rails_otel_context/adapters/mysql2.rb

@@ -32,12 +32,11 @@ module RailsOtelContext
             end
           end
 
-          # AR context and span renaming handled by CallContextProcessor.apply_db_context.
+          # Push call-site into FrameContext BEFORE super so the OTel child span
+          # created inside super picks it up via CallContextProcessor#on_start.
           %i[query prepare].each do |method_name|
             define_method(method_name) do |*args|
-              result = super(*args)
-              mod.apply_call_site_to_span(OpenTelemetry::Trace.current_span, mod.call_site_for_app)
-              result
+              mod.with_call_site_frame { super(*args) }
             end
           end
         end

data/lib/rails_otel_context/adapters/pg.rb

@@ -42,16 +42,14 @@ module RailsOtelContext
             end
           end
 
-          # AR context and span renaming handled by CallContextProcessor.apply_db_context.
+          # Push call-site into FrameContext BEFORE super so the OTel child span
+          # created inside super picks it up via CallContextProcessor#on_start.
           methods.each do |method_name|
             define_method(method_name) do |*args, &user_block|
-              # Capture before super: PG yields into a block so the original
-              # call stack is only visible here, not inside the result block.
-              site = mod.call_site_for_app
-
-              super(*args) do |result|
-                mod.apply_call_site_to_span(OpenTelemetry::Trace.current_span, site)
-                user_block ? user_block.call(result) : result
+              mod.with_call_site_frame do
+                super(*args) do |result|
+                  user_block ? user_block.call(result) : result
+                end
               end
             end
           end

data/lib/rails_otel_context/adapters/trilogy.rb

@@ -32,11 +32,10 @@ module RailsOtelContext
             end
           end
 
-          # AR context and span renaming handled by CallContextProcessor.apply_db_context.
+          # Push call-site into FrameContext BEFORE super so the OTel child span
+          # created inside super picks it up via CallContextProcessor#on_start.
           define_method(:query) do |sql|
-            result = super(sql)
-            mod.apply_call_site_to_span(OpenTelemetry::Trace.current_span, mod.call_site_for_app)
-            result
+            mod.with_call_site_frame { super(sql) }
           end
         end
 

data/lib/rails_otel_context/call_context_processor.rb

@@ -82,17 +82,18 @@ module RailsOtelContext
     def apply_call_context(span)
       # Explicit override: app code called FrameContext.with_frame (or Frameable).
       # O(1) — no stack walk. Takes priority over automatic detection.
-      pushed = FrameContext.current
-      if pushed
-        span.set_attribute('code.namespace', pushed[:class_name])
-        span.set_attribute('code.function',  pushed[:method_name]) if pushed[:method_name]
-        return
-      end
+      # DB adapters push filepath/lineno too so the child span gets full call-site info.
+      site = FrameContext.current
+      unless site
+        # Default: walk the call stack to find the nearest app-code frame.
+        return unless Thread.respond_to?(:each_caller_location)
 
-      # Default: walk the call stack to find the nearest app-code frame.
-      return unless Thread.respond_to?(:each_caller_location)
+        site = call_site_for_app
+      end
+      set_call_site_attributes(span, site)
+    end
 
-      site = call_site_for_app
+    def set_call_site_attributes(span, site)
       return unless site
 
       span.set_attribute('code.namespace', site[:class_name])

data/lib/rails_otel_context/frame_context.rb

@@ -27,17 +27,19 @@ module RailsOtelContext
     class << self
       # Pushes +class_name+/+method_name+ for the duration of the block,
       # restoring whatever was pushed before (supports nesting).
-      def with_frame(class_name:, method_name:)
+      # Optional +filepath:+ and +lineno:+ are carried through to the span
+      # processor so DB adapter call-site info survives the span lifecycle.
+      def with_frame(class_name:, method_name:, filepath: nil, lineno: nil)
         prev = Thread.current[FRAME_KEY]
-        Thread.current[FRAME_KEY] = { class_name: class_name, method_name: method_name }.freeze
+        Thread.current[FRAME_KEY] = build_frame(class_name, method_name, filepath, lineno)
         yield
       ensure
         Thread.current[FRAME_KEY] = prev
       end
 
       # Manual push without a block. Caller must call +pop+ in an ensure.
-      def push(class_name:, method_name:)
-        Thread.current[FRAME_KEY] = { class_name: class_name, method_name: method_name }.freeze
+      def push(class_name:, method_name:, filepath: nil, lineno: nil)
+        Thread.current[FRAME_KEY] = build_frame(class_name, method_name, filepath, lineno)
       end
 
       # Clears the pushed frame. Pair with +push+ in an ensure block.
@@ -51,6 +53,15 @@ module RailsOtelContext
       end
 
       alias clear! pop
+
+      private
+
+      def build_frame(class_name, method_name, filepath, lineno)
+        frame = { class_name: class_name, method_name: method_name }
+        frame[:filepath] = filepath if filepath
+        frame[:lineno]   = lineno   if lineno
+        frame.freeze
+      end
     end
   end
 

data/lib/rails_otel_context/source_location.rb

@@ -46,6 +46,22 @@ module RailsOtelContext
       span.set_attribute('code.lineno',    site[:lineno]) if site[:lineno]
     end
 
+    # Wraps a block with the nearest app-code frame pushed into FrameContext.
+    # Used by DB adapters to make the call-site available to
+    # CallContextProcessor#on_start for the child span created inside the block.
+    # Uses with_frame (not push/pop) so nested frames are correctly restored.
+    def with_call_site_frame(&)
+      site = call_site_for_app
+      if site
+        FrameContext.with_frame(
+          class_name: site[:class_name], method_name: site[:method_name],
+          filepath: site[:filepath], lineno: site[:lineno], &
+        )
+      else
+        yield
+      end
+    end
+
     # Legacy helper kept for Redis and ClickHouse adapters that only need filepath + lineno.
     # Migrate those adapters to call_site_for_app + apply_call_site_to_span to remove this.
     def source_location_for_app

data/lib/rails_otel_context/version.rb

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

metadata

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