railswatch_gem 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02985088f2afd6a08aeb35ac5f6b5d95d7e65287b8d9be0848b01d654ee1253c'
-  data.tar.gz: 1274fcc8d855b6ca31a97539b88b4ccc4bacc629bbaf0b8cd26640927ff506c2
+  metadata.gz: 51d84f78da3a10be4c22945395c3802e6d7e6622fca6da46db2f51a59c73af13
+  data.tar.gz: '018bf2d1fbaed1fdc4f4e97caf4de19ea4d4a04f70b3e8c149a058c5137d4430'
 SHA512:
-  metadata.gz: 73a7baa455c8ab7c2e527daf48fc48dd2bff19b4ca9d67584c424351fd2ff92092b15ee6655571ea2c43641d623c1645b0af1265370d8e28cb84c7554b75838e
-  data.tar.gz: 0d06b74786c73c587dc3f1841f534b3ab86e4f14241f5476eb7e7012d9cd13b98f5b56e02f0edc9f9fc9dff1ef203737f13fc439d4567199558bc7739128f894
+  metadata.gz: 296307ae6dfc447f56e0c9614d69c236324f23bf1209a2e6a23b1f09ce51885644216b7d99ed5b01fd35b163ac0bc72c161d021a218eba2735b22d9afac7705a
+  data.tar.gz: 499075bcc71e108cfd42f18c23337a05a32ee1f624ac5e8b1faf9b63bb7addb404e8773646f7fa0ee9799e99cd8bb2819d7cd1fdbe66c4017088b0622a6d505d

data/lib/railswatch_gem/configuration.rb

@@ -3,7 +3,8 @@
 module RailswatchGem
   class Configuration
     attr_accessor :api_key, :service_name, :ingest_url, :enabled,
-                  :track_users, :identify_user
+                  :track_users, :identify_user,
+                  :track_query_source
 
     def initialize
       @api_key = ENV["RAILSWATCH_API_KEY"]
@@ -13,11 +14,9 @@ module RailswatchGem
       @enabled = true
       @track_users = true
       @identify_user = DEFAULT_IDENTIFY_USER
+      @track_query_source = true
     end
 
-    # Default strategy: extract id and email if available.
-    # Customers can override with any proc that receives a user object
-    # and returns a Hash of OTel attribute key => value pairs.
     DEFAULT_IDENTIFY_USER = ->(user) {
       attrs = {}
       attrs["enduser.id"]    = user.id.to_s       if user.respond_to?(:id)

data/lib/railswatch_gem/railtie.rb

@@ -2,6 +2,11 @@
 
 module RailswatchGem
   class Railtie < ::Rails::Railtie
+    # Paths that belong to the host application (not gems or Ruby internals)
+    APP_PATH_PATTERN = %r{/(app|lib|config)/}.freeze
+    IGNORE_PATH_PATTERN = %r{/vendor/|/railswatch_gem/}.freeze
+    MAX_STACKTRACE_FRAMES = 10
+
     config.after_initialize do
       if RailswatchGem.config.api_key.present?
         RailswatchGem.start!
@@ -10,9 +15,6 @@ module RailswatchGem
       end
     end
 
-    # Auto-inject user identification into all controllers.
-    # Sets enduser.id (and optionally email/role) on the current OTel span
-    # so RailsWatch can group requests by user on the Users tab.
     initializer "railswatch.user_identification" do
       ActiveSupport.on_load(:action_controller_base) do
         around_action :railswatch_identify_user
@@ -35,11 +37,31 @@ module RailswatchGem
             attrs = RailswatchGem.config.identify_user.call(user)
             attrs.each { |key, value| span.set_attribute(key, value) if value.present? }
           rescue => e
-            # Never break the app for instrumentation
             Rails.logger.debug { "[Railswatch] User identification skipped: #{e.message}" } if defined?(Rails.logger)
           end
         end
       end
     end
+
+    initializer "railswatch.query_source_location" do
+      ActiveSupport.on_load(:active_record) do
+        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.match?(APP_PATH_PATTERN) && !f.path.match?(IGNORE_PATH_PATTERN) }
+            .first(MAX_STACKTRACE_FRAMES)
+            .map { |f| "#{f.path}:#{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.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railswatch_gem
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tyler Hammett