Adjust CurrentAttributes to use String, fixes #5536

Changes.md

@@ -2,6 +2,12 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/main/Ent-Changes.md)
 
+HEAD
+----------
+
+- Adjust CurrentAttributes to work with the String class name so we aren't referencing
+the Class within a Rails initializer [#5536]
+
 6.5.7
 ----------
 

lib/sidekiq/middleware/current_attributes.rb

@@ -11,18 +11,18 @@ module Sidekiq
   #
   #   # in your initializer
   #   require "sidekiq/middleware/current_attributes"
-  #   Sidekiq::CurrentAttributes.persist(Myapp::Current)
+  #   Sidekiq::CurrentAttributes.persist("Myapp::Current")
   #
   module CurrentAttributes
     class Save
       include Sidekiq::ClientMiddleware
 
       def initialize(cattr)
-        @klass = cattr
+        @strklass = cattr
       end
 
       def call(_, job, _, _)
-        attrs = @klass.attributes
+        attrs = @strklass.constantize.attributes
         if attrs.any?
           if job.has_key?("cattr")
             job["cattr"].merge!(attrs)
@@ -38,12 +38,12 @@ module Sidekiq
       include Sidekiq::ServerMiddleware
 
       def initialize(cattr)
-        @klass = cattr
+        @strklass = cattr
       end
 
       def call(_, job, _, &block)
         if job.has_key?("cattr")
-          @klass.set(job["cattr"], &block)
+          @strklass.constantize.set(job["cattr"], &block)
         else
           yield
         end
@@ -51,8 +51,8 @@ module Sidekiq
     end
 
     def self.persist(klass, config = Sidekiq.default_configuration)
-      config.client_middleware.add Save, klass
+      config.client_middleware.add Save, klass.to_s
-      config.server_middleware.add Load, klass
+      config.server_middleware.add Load, klass.to_s
     end
   end
 end

myapp/app/lib/myapp/current.rb

@@ -0,0 +1,5 @@
+module Myapp
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :tenant_id
+  end
+end

myapp/config/initializers/sidekiq.rb

@@ -32,14 +32,8 @@ class TimedWorker
   end
 end
 
-module Myapp
-  class Current < ActiveSupport::CurrentAttributes
-    attribute :tenant_id
-  end
-end
-
 require "sidekiq/middleware/current_attributes"
-Sidekiq::CurrentAttributes.persist(Myapp::Current) # Your AS::CurrentAttributes singleton
+Sidekiq::CurrentAttributes.persist("Myapp::Current") # Your AS::CurrentAttributes singleton
 
 # Sidekiq.transactional_push!
 

test/current_attributes.rb

@@ -16,7 +16,7 @@ describe "Current attributes" do
   end
 
   it "saves" do
-    cm = Sidekiq::CurrentAttributes::Save.new(Myapp::Current)
+    cm = Sidekiq::CurrentAttributes::Save.new("Myapp::Current")
     job = {}
     with_context(:user_id, 123) do
       cm.call(nil, job, nil, nil) do
@@ -26,7 +26,7 @@ describe "Current attributes" do
   end
 
   it "loads" do
-    cm = Sidekiq::CurrentAttributes::Load.new(Myapp::Current)
+    cm = Sidekiq::CurrentAttributes::Load.new("Myapp::Current")
 
     job = {"cattr" => {"user_id" => 123}}
     assert_nil Myapp::Current.user_id
@@ -37,7 +37,7 @@ describe "Current attributes" do
   end
 
   it "persists" do
-    Sidekiq::CurrentAttributes.persist(Myapp::Current, @config)
+    Sidekiq::CurrentAttributes.persist("Myapp::Current", @config)
     job_hash = {}
     with_context(:user_id, 16) do
       @config.client_middleware.invoke(nil, job_hash, nil, nil) do