rails-otel-context 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3591d00a6587ead8c6abae8400911722b3b7e3802570dd0dcd65abc8ec2c1e79
-  data.tar.gz: 96fc8db0139458f2baa708e9b518ee70ffb35594257d321390188f6f26c14176
+  metadata.gz: 004afd0d90983e7e0acbe3f53e498e9c8583f67cb9d1f0eac650f9d801a7bb6d
+  data.tar.gz: 96da00012f2fb29cf86bd99530d9cdaf7be375135612543b29f7acf60e73569e
 SHA512:
-  metadata.gz: e3c445ff373ed66d3693a26534090c24a9f1ab737c575a050c935659e575b3c466ab70d03d599d6dd0ef5a555388d7ec36ab5a41ddf496b2eb9a10577a1472d1
-  data.tar.gz: 3aa56abef92ecca9159f54495a73f73c5d0e57347020d3163318b83135d58e1b308c2565d8cfa1651a33dd865d233601cf0932466e700f88765d130408a58ecb
+  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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsOtelContext
-  VERSION = '0.8.1'
+  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.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Last9