railswatch_gem 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e813b247ee297eccab4b8fc1e2240142bdd0dfe29a49c95bb6e39e2e7ff38ecd
-  data.tar.gz: fb805d469b067b639d1e2860f68d0ca51cd2360b544ccce7f9a4b868984fde08
+  metadata.gz: 7104283a38fc40386d74cd268ea296724e592374b7a57438387da67f778bd30b
+  data.tar.gz: 8965ca361f832aa434723f86d54a2159c2102a12436918ab8577680c2add5ccf
 SHA512:
-  metadata.gz: 66833fbfc3fc437c766c07686167d7224c190876d0d9d4f93431db6fb9a11e6d795ea1fb5f73eeec62c44b9c719fb790c033ce800b12fc2ee2bda9024e138ff9
-  data.tar.gz: 1f4e3dac70f8e457c73f944fd63426d09e908c41537719a85f50dad8a86e777065899066342939f8aa853e3069a87d5a45bbfe6ea40306ad3fbf641605a78928
+  metadata.gz: e98665bebe25182bbd7295f4d77f0c9d088f114f11b60dd56de0159fc354ac9a56ffc7167b84b6009fc5fde9e19e18d95583ef9471d146cc6031b5ceb537ac29
+  data.tar.gz: a45c68ded7600b4d769b4ed2e538a5de46e11ef72ac207ff725915164fef74ab6b8966fa4a479078d47f0e3cf8aba403cb6823b277023e51ba6d2e829ea37c9c

data/lib/railswatch_gem/query_source_processor.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module RailswatchGem
+  # OTel SpanProcessor that captures application-level stack traces on database spans.
+  #
+  # Unlike ActiveSupport::Notifications subscribers (which fire AFTER a span closes),
+  # SpanProcessor#on_start runs while the span is still recording, so the attribute
+  # lands on the correct span (PG / ActiveRecord) rather than its parent.
+  class QuerySourceProcessor < OpenTelemetry::SDK::Trace::SpanProcessor
+    MAX_FRAMES = 10
+
+    DB_SCOPES = %w[
+      OpenTelemetry::Instrumentation::PG
+      OpenTelemetry::Instrumentation::ActiveRecord
+      OpenTelemetry::Instrumentation::Mysql2
+      OpenTelemetry::Instrumentation::Trilogy
+    ].freeze
+
+    def initialize(app_root)
+      @app_root = app_root.to_s
+      @app_prefix = "#{@app_root}/"
+    end
+
+    def on_start(span, _parent_context)
+      return unless RailswatchGem.config.track_query_source
+      return unless span.recording?
+
+      scope_name = span.instrumentation_scope&.name.to_s
+      return unless DB_SCOPES.include?(scope_name)
+
+      frames = caller_locations(0, 50)
+        .select { |f| f.path.start_with?(@app_root) && !f.path.include?("/vendor/") }
+        .first(MAX_FRAMES)
+        .map { |f| "#{f.path.delete_prefix(@app_prefix)}:#{f.lineno} in `#{f.label}`" }
+
+      span.set_attribute("code.stacktrace", frames.join("\n")) if frames.any?
+    rescue StandardError
+      # Never break the app for instrumentation
+    end
+
+    def on_finish(_span); end
+    def shutdown(timeout: nil) = OpenTelemetry::SDK::Trace::Export::SUCCESS
+    def force_flush(timeout: nil) = OpenTelemetry::SDK::Trace::Export::SUCCESS
+  end
+end
+

data/lib/railswatch_gem/railtie.rb

@@ -2,8 +2,6 @@
 
 module RailswatchGem
   class Railtie < ::Rails::Railtie
-    MAX_STACKTRACE_FRAMES = 10
-
     config.after_initialize do
       if RailswatchGem.config.api_key.present?
         RailswatchGem.start!
@@ -39,28 +37,5 @@ module RailswatchGem
         end
       end
     end
-
-    initializer "railswatch.query_source_location" do
-      ActiveSupport.on_load(:active_record) do
-        app_root = Rails.root.to_s
-
-        ActiveSupport::Notifications.subscribe("sql.active_record") do |*, payload|
-          next unless RailswatchGem.config.enabled
-          next unless RailswatchGem.config.track_query_source
-
-          span = OpenTelemetry::Trace.current_span
-          next unless span&.recording?
-
-          frames = caller_locations(0, 40)
-            .select { |f| f.path.start_with?(app_root) && !f.path.include?("/vendor/") }
-            .first(MAX_STACKTRACE_FRAMES)
-            .map { |f| "#{f.path.delete_prefix(app_root + '/')}:#{f.lineno} in `#{f.label}`" }
-
-          span.set_attribute("code.stacktrace", frames.join("\n")) if frames.any?
-        rescue => e
-          Rails.logger.debug { "[Railswatch] Query source capture skipped: #{e.message}" } if defined?(Rails.logger)
-        end
-      end
-    end
   end
 end

data/lib/railswatch_gem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailswatchGem
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/railswatch_gem.rb

@@ -3,6 +3,7 @@
 require "railswatch_gem/version"
 require "railswatch_gem/configuration"
 require "railswatch_gem/helpers"
+require "railswatch_gem/query_source_processor"
 require "railswatch_gem/instrumentation/ai_helper"
 require "railswatch_gem/instrumentation/openai"
 require "railswatch_gem/instrumentation/anthropic"
@@ -32,9 +33,14 @@ module RailswatchGem
       ENV['OTEL_EXPORTER_OTLP_PROTOCOL'] = 'http/json'
       ENV['OTEL_EXPORTER_OTLP_COMPRESSION'] = 'gzip'
 
+      app_root = defined?(::Rails) ? ::Rails.root.to_s : Dir.pwd
+
       OpenTelemetry::SDK.configure do |c|
         c.service_name = config.service_name
 
+        # Capture application stack traces on DB spans (runs on_start before export)
+        c.add_span_processor(QuerySourceProcessor.new(app_root)) if config.track_query_source
+
         c.add_span_processor(
           OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
             OpenTelemetry::Exporter::OTLP::Exporter.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railswatch_gem
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tyler Hammett
@@ -79,6 +79,7 @@ files:
 - lib/railswatch_gem/instrumentation/ai_helper.rb
 - lib/railswatch_gem/instrumentation/anthropic.rb
 - lib/railswatch_gem/instrumentation/openai.rb
+- lib/railswatch_gem/query_source_processor.rb
 - lib/railswatch_gem/railtie.rb
 - lib/railswatch_gem/version.rb
 homepage: https://railswatch.com