rails-otel-context 0.8.0 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9939fbc8981d0be3075a1c3f7dcbda1c87a0b0d40a5dc9186ace04aa05ef3aa
-  data.tar.gz: 88a58856ae020819ec9c17e5027d1b24b3c5da1d4609d3c43b909fa1e88df979
+  metadata.gz: 004afd0d90983e7e0acbe3f53e498e9c8583f67cb9d1f0eac650f9d801a7bb6d
+  data.tar.gz: 96da00012f2fb29cf86bd99530d9cdaf7be375135612543b29f7acf60e73569e
 SHA512:
-  metadata.gz: dc0385bb7df75a0e678dcf03e1b77fa6826427395504bea021e11282f4f1d9f67aadbae64f59cef0d971fe3a6ac2f3208c81d60ea8ef953e316f9196a2ad5c20
-  data.tar.gz: 468262bd9bf9b9df37705e0aab8d5f39b3610b5754407c4f6f1220594b297eba8f01b3538ddb6fa71ff5e037b4551f7bce97c30e9dac565b500b7c956fb79d54
+  metadata.gz: d909cd98bcb6a018a8e957765c3e4ae5bfcf4d583536c3819aa639ec63a7029e81f9cda60e80f2ba7961490a0e6e19d8c32d976dc9f7ee8cc4ef09e035bb5810
+  data.tar.gz: 0a6b2433ec72221942b287a584def552ebd59b5857db83d58c41051f75c2a3b23f9aa5380b74db1a08f28d201a5791dfee1ee0254b8d140e8cf55f3c299d1c87

data/lib/rails_otel_context/activerecord_context.rb

@@ -87,10 +87,16 @@ module RailsOtelContext
 
       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'
+        # Set up slow-query timing regardless of whether we can map a model name,
+        # so that raw SQL (connection.execute, SELECT SLEEP, etc.) still sets db.slow.
+        if @threshold
+          Thread.current[TIMING_ID_KEY]    = id
+          Thread.current[TIMING_START_KEY] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        end
+
+        ctx = if ar_name.nil? || ar_name == 'SQL'
                 ActiveRecordContext.parse_sql_context(payload[:sql])
               else
                 ActiveRecordContext.parse_ar_name(ar_name)
@@ -109,11 +115,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
@@ -280,11 +281,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/call_context_processor.rb

@@ -61,7 +61,6 @@ module RailsOtelContext
 
     def apply_call_context(span)
       # Fast path: caller pushed a frame explicitly — O(1), zero allocations.
-      # DB adapters will overwrite this with the exact call site post-query.
       pushed = FrameContext.current
       if pushed
         span.set_attribute('code.namespace', pushed[:class_name])
@@ -69,8 +68,7 @@ module RailsOtelContext
         return
       end
 
-      # Fallback: walk the call stack. DB spans without a pushed frame take this
-      # path; the adapter's post-query walk (shallower) will overwrite the result.
+      # Fallback: walk the call stack to find the first app-code frame.
       return unless Thread.respond_to?(:each_caller_location)
 
       site = call_site_for_app

data/lib/rails_otel_context/railtie.rb

@@ -18,6 +18,21 @@ module RailsOtelContext
         processor = RailsOtelContext::CallContextProcessor.new(app_root: Rails.root)
         OpenTelemetry.tracer_provider.add_span_processor(processor)
       end
+
+      # Warm the table→model map once at boot (after eager_load! in production so
+      # all descendants are available). Without this, the first SQL-named span on a
+      # cold boot hits an empty map and falls through without model context.
+      ActiveSupport.on_load(:active_record) do
+        RailsOtelContext::ActiveRecordContext.ar_table_model_map
+      end
+    end
+
+    # Reset the table→model map after every code reload in development.
+    # In development, classes are lazy-loaded so the map built on first access
+    # may be empty or stale. to_prepare runs after each reload when all currently
+    # referenced models are loaded, guaranteeing a fresh index.
+    config.to_prepare do
+      RailsOtelContext::ActiveRecordContext.reset_ar_table_model_map!
     end
 
     # Push the controller class + action name as the active frame for every

data/lib/rails_otel_context/version.rb

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

metadata

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