posthog-rails 3.12.3 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499457f4cdb3d65001ca2052dcce6231b7f56879333a5dd5c957376460a70992
-  data.tar.gz: e06c59907254de2d57373a167b20c21d5e54df9aca89b59bda2f138cd81e731b
+  metadata.gz: dbadf59825cbf2d519a1eab2aa36e56cba2bc9c395076857e50bc126e41300b0
+  data.tar.gz: de897b215980ee6bcbbfe54416073fed3d5b9321fce30443dacb015a7785b073
 SHA512:
-  metadata.gz: 6c51cd064c094fc7df538a348a3faf842a873597e527eadb65e341850649beb09e18159d191b32bce744077ed54afa6c791479c74045ed018007cb647b666a05
-  data.tar.gz: c61468861d957d4a5cc41276fdae05ce4f00d621af51320dbb05c8f9571df28aa1d89524600f25ce71e2bfe1b9864678b5340583888e7682a9da7b1cc514a847
+  metadata.gz: 33068f5f9b2673d0f9acf9f1acb20f50a8f99c04e1182911d9245c539e8d2566a3c42fb6da125d89853a7cadadf187754b3d49e24666a46d274800bc9badf82f
+  data.tar.gz: d94d7cff285e97a7769683f1349689b770d8ddb3610ceb0f21cf68067ca56b0fe2ffbb103f2c5720fd39270cc3d84f6c8fb9e9c4e39fb83e2fb65a8da35123c3

data/lib/generators/posthog/templates/posthog.rb

@@ -37,6 +37,12 @@ PostHog::Rails.configure do |config|
   # making it easier to identify affected users and debug user-specific issues.
   # config.current_user_method = :current_user
 
+  # Or provide a resolver for apps that store user context outside controllers,
+  # such as ActiveSupport::CurrentAttributes. The resolver takes precedence over
+  # current_user_method and may accept the controller as an argument.
+  # config.current_user_resolver = proc { Current.user }
+  # config.current_user_resolver = proc { |controller| controller.current_user }
+
   # Additional exception classes to exclude from reporting
   # These are added to the default excluded exceptions
   # config.excluded_exceptions = [

data/lib/posthog/rails/capture_exceptions.rb

@@ -69,20 +69,40 @@ module PostHog
       def extract_distinct_id(env)
         # Prefer authenticated Rails user context. Request/tracing context is
         # applied later by the core capture path if this returns nil.
-        if PostHog::Rails.config&.capture_user_context && env['action_controller.instance']
-          controller = env['action_controller.instance']
-          method_name = PostHog::Rails.config&.current_user_method || :current_user
+        return nil unless PostHog::Rails.config&.capture_user_context
 
-          if controller.respond_to?(method_name, true)
-            user = controller.send(method_name)
-            user_id = extract_user_id(user) if user
-            return user_id if present?(user_id)
-          end
-        end
+        user = extract_current_user(env['action_controller.instance'])
+        user_id = extract_user_id(user) if user
+        return user_id if present?(user_id)
 
         nil
       end
 
+      def extract_current_user(controller)
+        resolver = PostHog::Rails.config&.current_user_resolver
+        return resolve_current_user(resolver, controller) if resolver
+
+        method_name = PostHog::Rails.config&.current_user_method || :current_user
+        return unless controller.respond_to?(method_name, true)
+
+        controller.send(method_name)
+      end
+
+      def resolve_current_user(resolver, controller)
+        call_current_user_resolver(resolver, controller)
+      rescue StandardError => e
+        PostHog::Logging.logger.warn("current_user_resolver failed: #{e.message}")
+        nil
+      end
+
+      def call_current_user_resolver(resolver, controller)
+        if resolver.arity.zero?
+          controller ? controller.instance_exec(&resolver) : resolver.call
+        elsif controller
+          resolver.call(controller)
+        end
+      end
+
       def extract_user_id(user)
         # Use configured method if specified
         method_name = PostHog::Rails.config&.user_id_method

data/lib/posthog/rails/configuration.rb

@@ -32,6 +32,10 @@ module PostHog
       # @return [Symbol] Method name to call on controller to get the current user. Defaults to :current_user.
       attr_accessor :current_user_method
 
+      # @return [Proc, nil] Callable used to resolve the current user. When set, this takes precedence over
+      #   current_user_method. The callable may accept the controller instance or no arguments.
+      attr_accessor :current_user_resolver
+
       # @return [Symbol, nil] Method name to call on the user object to get distinct_id. When nil, tries:
       #   posthog_distinct_id, distinct_id, id, pk, uuid in order.
       attr_accessor :user_id_method
@@ -68,6 +72,7 @@ module PostHog
         @use_tracing_headers = true
         @capture_user_context = true
         @current_user_method = :current_user
+        @current_user_resolver = nil
         @user_id_method = nil
         @logs_enabled = false
         @logs_forward_rails_logger = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posthog-rails
 version: !ruby/object:Gem::Version
-  version: 3.12.3
+  version: 3.13.0
 platform: ruby
 authors:
 - PostHog
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 description: Automatic exception tracking and instrumentation for Ruby on Rails applications
   using PostHog
 email: engineering@posthog.com