Concurrency and Throttle cannot both be used on a job

lib/active_job/traffic_control/base.rb

@@ -24,12 +24,10 @@ def lock_key(prefix, job, config_attr)
             if config_attr[:key].respond_to?(:call)
               "traffic_control:#{prefix}:#{config_attr[:key].call(job)}"
             else
-              @static_job_key ||= begin
-                if config_attr[:key].present?
-                  "traffic_control:#{prefix}:#{config_attr[:key]}"
-                else
-                  "traffic_control:#{prefix}:#{cleaned_name}"
-                end
+              if config_attr[:key].present?
+                "traffic_control:#{prefix}:#{config_attr[:key]}"
+              else
+                "traffic_control:#{prefix}:#{cleaned_name}"
               end
             end
           end

test/active_job/traffic_control_test.rb

@@ -95,6 +95,14 @@ def perform
     end
   end
 
+  class ThrottleConcurrencyTestJob < ActiveJob::Base
+    throttle threshold: 2, period: 1.second, drop: true
+    concurrency 1, drop: true
+
+    def perform
+    end
+  end
+
   def test_that_it_has_a_version_number
     refute_nil ::ActiveJob::TrafficControl::VERSION
   end
@@ -196,6 +204,13 @@ def test_everything_at_once
     EverythingBaseJob.perform_now
     assert_equal 1, $count
   end
+
+  def test_throttle_concurrency_different_keys
+    job = ThrottleConcurrencyTestJob.new
+    throttle = ThrottleConcurrencyTestJob.throttling_lock_key(job)
+    concurrency = ThrottleConcurrencyTestJob.concurrency_lock_key(job)
+    refute_equal throttle, concurrency
+  end
 end
 
 class MemcachedTrafficControlTest < Minitest::Test