railswatch_gem 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab1600349c2d7702f4e7972b165296254f2aefcb5b4714bb7a45dd286f180065
-  data.tar.gz: d1a43e912c06c23a56d32872bc9ccf31bb691ff66960c49dd02c6c736ad3b7e4
+  metadata.gz: '02985088f2afd6a08aeb35ac5f6b5d95d7e65287b8d9be0848b01d654ee1253c'
+  data.tar.gz: 1274fcc8d855b6ca31a97539b88b4ccc4bacc629bbaf0b8cd26640927ff506c2
 SHA512:
-  metadata.gz: 57cec176ed6376bc0ea49d46fe04c2c288e1fef27b7d67c97ea8b2451b2a15d03133ab010bcab193a59e0f550435407206c29a9127aeb33f670a66832c245bc7
-  data.tar.gz: 981333528bdad9a2e4fb5eaaeff5c155f2d3655a672a66afc6d516686f823429255e2e95942b975dbc91e501e119f8947f68333ae34b441fd0b430c45b827726
+  metadata.gz: 73a7baa455c8ab7c2e527daf48fc48dd2bff19b4ca9d67584c424351fd2ff92092b15ee6655571ea2c43641d623c1645b0af1265370d8e28cb84c7554b75838e
+  data.tar.gz: 0d06b74786c73c587dc3f1841f534b3ab86e4f14241f5476eb7e7012d9cd13b98f5b56e02f0edc9f9fc9dff1ef203737f13fc439d4567199558bc7739128f894

data/lib/railswatch_gem/configuration.rb

@@ -2,7 +2,8 @@
 
 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
 
     def initialize
       @api_key = ENV["RAILSWATCH_API_KEY"]
@@ -10,6 +11,19 @@ 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
     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)
+      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,44 @@
 
 module RailswatchGem
   class Railtie < ::Rails::Railtie
-    # Automatically boot the instrumentation when Rails finishes initializing.
     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
+
+    # 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
+
+        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
+            # Never break the app for instrumentation
+            Rails.logger.debug { "[Railswatch] User identification skipped: #{e.message}" } if defined?(Rails.logger)
+          end
+        end
+      end
+    end
   end
 end

data/lib/railswatch_gem/version.rb

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

data/lib/railswatch_gem.rb

@@ -29,6 +29,9 @@ module RailswatchGem
       return unless config.enabled
       return if @started
 
+      ENV['OTEL_EXPORTER_OTLP_PROTOCOL'] = 'http/json'
+      ENV['OTEL_EXPORTER_OTLP_COMPRESSION'] = 'gzip'
+
       OpenTelemetry::SDK.configure do |c|
         c.service_name = config.service_name
 
@@ -36,9 +39,7 @@ module RailswatchGem
           OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
             OpenTelemetry::Exporter::OTLP::Exporter.new(
               endpoint: config.ingest_url,
-              headers: { "X-Railswatch-Token" => config.api_key },
-              protocol: :http_json,
-              compression: :gzip
+              headers: { "X-Railswatch-Token" => config.api_key }
             )
           )
         )

metadata

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