railswatch_gem 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf72315894a0b5340f7b847d0a4c377137e2a9bae3940c6498dbb9f5bd7d642
-  data.tar.gz: 690b95a780c37b2ab7b368c8e1b8462681f4bfcdca650c56237823985286e95f
+  metadata.gz: 51d84f78da3a10be4c22945395c3802e6d7e6622fca6da46db2f51a59c73af13
+  data.tar.gz: '018bf2d1fbaed1fdc4f4e97caf4de19ea4d4a04f70b3e8c149a058c5137d4430'
 SHA512:
-  metadata.gz: 8968464f6cb0887b97fdc5796cc6c15dd02b6dd451542d545b1c58f9726b1036415a0fc702fdd01f4e3e60b165dde57d4f98d703873e21ffcfd952b2a6888c77
-  data.tar.gz: 229a9d48d69681f448e24f798b1a7549258e604adc15bfd8c94f734193f8fe3813a3e830bb9850e9f8de53b1d764208b9a661601c8266a99dd942f3c07958f04
+  metadata.gz: 296307ae6dfc447f56e0c9614d69c236324f23bf1209a2e6a23b1f09ce51885644216b7d99ed5b01fd35b163ac0bc72c161d021a218eba2735b22d9afac7705a
+  data.tar.gz: 499075bcc71e108cfd42f18c23337a05a32ee1f624ac5e8b1faf9b63bb7addb404e8773646f7fa0ee9799e99cd8bb2819d7cd1fdbe66c4017088b0622a6d505d

data/lib/railswatch_gem/configuration.rb

@@ -2,7 +2,9 @@
 
 module RailswatchGem
   class Configuration
-    attr_accessor :api_key, :service_name, :ingest_url, :enabled
+    attr_accessor :api_key, :service_name, :ingest_url, :enabled,
+                  :track_users, :identify_user,
+                  :track_query_source
 
     def initialize
       @api_key = ENV["RAILSWATCH_API_KEY"]
@@ -10,6 +12,17 @@ module RailswatchGem
       @service_name = ENV["RAILSWATCH_SERVICE_NAME"] || default_name
       @ingest_url = ENV["RAILSWATCH_INGEST_URL"] || "https://ingest.railswatch.com/api/v1/ingest"
       @enabled = true
+      @track_users = true
+      @identify_user = DEFAULT_IDENTIFY_USER
+      @track_query_source = true
     end
+
+    DEFAULT_IDENTIFY_USER = ->(user) {
+      attrs = {}
+      attrs["enduser.id"]    = user.id.to_s       if user.respond_to?(:id)
+      attrs["enduser.email"] = user.email.to_s     if user.respond_to?(:email)
+      attrs["enduser.role"]  = user.role.to_s      if user.respond_to?(:role)
+      attrs
+    }
   end
 end

data/lib/railswatch_gem/railtie.rb

@@ -2,14 +2,66 @@
 
 module RailswatchGem
   class Railtie < ::Rails::Railtie
-    # Automatically boot the instrumentation when Rails finishes initializing.
+    # 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
-      # Check if properly configured (e.g. via ENV vars or initializer)
       if RailswatchGem.config.api_key.present?
         RailswatchGem.start!
       else
         puts "[Railswatch] API Key not found. Observability disabled."
       end
     end
+
+    initializer "railswatch.user_identification" do
+      ActiveSupport.on_load(:action_controller_base) do
+        around_action :railswatch_identify_user
+
+        private
+
+        def railswatch_identify_user
+          yield
+        ensure
+          return unless RailswatchGem.config.track_users
+          return unless respond_to?(:current_user, true)
+
+          begin
+            user = current_user
+            return unless user
+
+            span = OpenTelemetry::Trace.current_span
+            return unless span&.recording?
+
+            attrs = RailswatchGem.config.identify_user.call(user)
+            attrs.each { |key, value| span.set_attribute(key, value) if value.present? }
+          rescue => e
+            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.2.3"
+  VERSION = "0.4.0"
 end

metadata

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