solid_queue_autoscaler 1.0.11 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf794daeb74474c136c8aec706793bf74617dcb610abf42df89ddb4fefd99274
-  data.tar.gz: 96ec9ad6993871c7773ff524c5d71ff3e919ff89aacba5587d5dee63aa277f5d
+  metadata.gz: bf4f38fa3806f153c03715b02554d1a82837da595fb9dadf4fb8063d6f52b3c8
+  data.tar.gz: 3737a7de81ab147dbd8e38fc87a2f601c21ea4d895758418f4bd484b0483ea12
 SHA512:
-  metadata.gz: 0b8dd105d028035aee534300ee1d91af9193faefe4e27c8ba3d72c98b3c401cdc52a04894bdeef0b14ebdd7a42f120e563bb378509f2a9ac046a18554c7079d0
-  data.tar.gz: 9980ac5a53affb82b264cd9e7c9bacb388d26a5ecc0116fdd1e22ce527c66ec63bc51d5fe47a492df1941df1b4d0052cfed721e7e4b62566a5c70ab885852f9c
+  metadata.gz: 1ef6933dfe8a7936ba524ebd2fc94f46b20b6545b2e008e6d5e2c5c4753f54f866b82ef84eb75b39aa9d49e69ca476bae9be36cfdfff9cd39f97a380627e38f0
+  data.tar.gz: 14b04452165bac891d292dfdcb4dd7fb11993d6b5c772c43e658e2492437bcf7af2b9004f616b1caf9b73e606bb018855cd9f36be7b7a0909f336be59fc34952

data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.12] - 2025-01-17
+
+### Fixed
+- **Fixed AutoscaleJob being enqueued to "default" queue** - Added `queue_as :autoscaler` to the job class
+  - The issue was that SolidQueue recurring jobs capture the queue name during initialization, BEFORE Rails `after_initialize` hooks run
+  - Without a static `queue_as` in the class, jobs defaulted to the "default" queue
+  - The `apply_job_settings!` method can still override this via configuration, but the default must be set in the class for SolidQueue recurring to work correctly
+
 ## [1.0.11] - 2025-01-17
 
 ### Fixed

data/lib/solid_queue_autoscaler/adapters/base.rb

@@ -32,6 +32,10 @@ module SolidQueueAutoscaler
     #     end
     #   end
     class Base
+      # Default retry configuration for transient network errors
+      DEFAULT_MAX_RETRIES = 3
+      DEFAULT_RETRY_DELAYS = [1, 2, 4].freeze # Exponential backoff in seconds
+
       # @param config [Configuration] the autoscaler configuration
       def initialize(config:)
         @config = config
@@ -97,6 +101,32 @@ module SolidQueueAutoscaler
       def log_dry_run(message)
         logger.info("[DRY RUN] #{message}")
       end
+
+      # Executes a block with retry logic for transient errors.
+      # Uses exponential backoff with configurable delays.
+      #
+      # @param error_classes [Array<Class>] Exception classes that should trigger a retry
+      # @param max_retries [Integer] Maximum number of retry attempts (default: 3)
+      # @param delays [Array<Integer>] Delay in seconds for each retry (default: [1, 2, 4])
+      # @param retryable_check [Proc, nil] Optional proc to determine if a specific error should be retried
+      # @yield The block to execute with retry logic
+      # @return [Object] The result of the block
+      def with_retry(error_classes, max_retries: DEFAULT_MAX_RETRIES, delays: DEFAULT_RETRY_DELAYS, retryable_check: nil)
+        attempts = 0
+        begin
+          attempts += 1
+          yield
+        rescue *error_classes => e
+          should_retry = retryable_check ? retryable_check.call(e) : true
+          if attempts < max_retries && should_retry
+            delay = delays[attempts - 1] || delays.last
+            logger&.warn("[Autoscaler] #{name} API error (attempt #{attempts}/#{max_retries}), retrying in #{delay}s: #{e.message}")
+            sleep(delay)
+            retry
+          end
+          raise
+        end
+      end
     end
   end
 end

data/lib/solid_queue_autoscaler/adapters/heroku.rb

@@ -20,10 +20,6 @@ module SolidQueueAutoscaler
     #     config.process_type = 'worker'
     #   end
     class Heroku < Base
-      # Retry configuration for transient network errors
-      MAX_RETRIES = 3
-      RETRY_DELAYS = [1, 2, 4].freeze # Exponential backoff in seconds
-
       # Errors that are safe to retry (transient network issues)
       RETRYABLE_ERRORS = [
         Excon::Error::Timeout,
@@ -32,7 +28,7 @@ module SolidQueueAutoscaler
       ].freeze
 
       def current_workers
-        with_retry do
+        with_retry(RETRYABLE_ERRORS, retryable_check: method(:retryable_error?)) do
           formation = client.formation.info(app_name, process_type)
           formation['quantity']
         end
@@ -50,7 +46,7 @@ module SolidQueueAutoscaler
           return quantity
         end
 
-        with_retry do
+        with_retry(RETRYABLE_ERRORS, retryable_check: method(:retryable_error?)) do
           client.formation.update(app_name, process_type, { quantity: quantity })
         end
         quantity
@@ -88,24 +84,6 @@ module SolidQueueAutoscaler
 
       private
 
-      # Executes a block with retry logic for transient network errors.
-      # Uses exponential backoff: 1s, 2s, 4s delays between retries.
-      def with_retry
-        attempts = 0
-        begin
-          attempts += 1
-          yield
-        rescue *RETRYABLE_ERRORS => e
-          if attempts < MAX_RETRIES && retryable_error?(e)
-            delay = RETRY_DELAYS[attempts - 1] || RETRY_DELAYS.last
-            logger&.warn("[Autoscaler] Heroku API error (attempt #{attempts}/#{MAX_RETRIES}), retrying in #{delay}s: #{e.message}")
-            sleep(delay)
-            retry
-          end
-          raise
-        end
-      end
-
       # Determines if an error should be retried.
       # Retries timeouts and 5xx errors, but not 4xx client errors.
       def retryable_error?(error)

data/lib/solid_queue_autoscaler/adapters/kubernetes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'net/http'
+
 module SolidQueueAutoscaler
   module Adapters
     # Kubernetes adapter for scaling Deployment replicas.
@@ -30,15 +32,21 @@ module SolidQueueAutoscaler
       # Kubernetes API path for apps/v1 group
       APPS_API_VERSION = 'apis/apps/v1'
 
-      # Retry configuration for transient network errors
-      MAX_RETRIES = 3
-      RETRY_DELAYS = [1, 2, 4].freeze # Exponential backoff in seconds
-
       # Default timeout for Kubernetes API calls (seconds)
       DEFAULT_TIMEOUT = 30
 
+      # Errors that are safe to retry (transient network issues)
+      RETRYABLE_ERRORS = [
+        Errno::ECONNREFUSED,
+        Errno::ETIMEDOUT,
+        Errno::ECONNRESET,
+        Net::OpenTimeout,
+        Net::ReadTimeout,
+        SocketError
+      ].freeze
+
       def current_workers
-        with_retry do
+        with_retry(RETRYABLE_ERRORS) do
           deployment = apps_client.get_deployment(deployment_name, namespace)
           deployment.spec.replicas
         end
@@ -52,7 +60,7 @@ module SolidQueueAutoscaler
           return quantity
         end
 
-        with_retry do
+        with_retry(RETRYABLE_ERRORS) do
           patch_body = { spec: { replicas: quantity } }
           apps_client.patch_deployment(deployment_name, patch_body, namespace)
         end
@@ -75,25 +83,6 @@ module SolidQueueAutoscaler
 
       private
 
-      # Executes a block with retry logic for transient network errors.
-      # Uses exponential backoff: 1s, 2s, 4s delays between retries.
-      def with_retry
-        attempts = 0
-        begin
-          attempts += 1
-          yield
-        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::ECONNRESET,
-               Net::OpenTimeout, Net::ReadTimeout, SocketError => e
-          if attempts < MAX_RETRIES
-            delay = RETRY_DELAYS[attempts - 1] || RETRY_DELAYS.last
-            logger&.warn("[Autoscaler] Kubernetes API error (attempt #{attempts}/#{MAX_RETRIES}), retrying in #{delay}s: #{e.message}")
-            sleep(delay)
-            retry
-          end
-          raise
-        end
-      end
-
       def apps_client
         @apps_client ||= build_apps_client
       end

data/lib/solid_queue_autoscaler/autoscale_job.rb

@@ -2,15 +2,17 @@
 
 module SolidQueueAutoscaler
   class AutoscaleJob < ActiveJob::Base
-    # IMPORTANT: Use a static queue name so SolidQueue recurring jobs work correctly.
-    # When using SolidQueue recurring.yml without specifying queue:, SolidQueue
-    # checks the job class's queue_name attribute. A dynamic queue_as block
-    # returns a Proc that isn't evaluated by recurring jobs, causing jobs to
-    # go to 'default' queue instead.
+    # Default queue - this MUST be set here (not dynamically) because SolidQueue
+    # recurring jobs capture the queue name during initialization, BEFORE
+    # Rails after_initialize hooks run.
     #
-    # To use a custom queue:
-    # 1. Set queue: in your recurring.yml (recommended)
-    # 2. Or use AutoscaleJob.set(queue: :my_queue).perform_later
+    # The apply_job_settings! method can override this after Rails initializers
+    # run, but the default must be set here for SolidQueue recurring to work.
+    #
+    # You can customize the queue via:
+    #   config.job_queue = :my_queue
+    #
+    # For SolidQueue recurring.yml, you can also set queue: directly in the YAML.
     queue_as :autoscaler
 
     discard_on ConfigurationError

data/lib/solid_queue_autoscaler/railtie.rb

@@ -11,6 +11,11 @@ module SolidQueueAutoscaler
       # Configuration happens via initializer, nothing to do here
     end
 
+    # After all initializers have run, apply job settings from configuration
+    config.after_initialize do
+      SolidQueueAutoscaler.apply_job_settings!
+    end
+
     rake_tasks do
       namespace :solid_queue_autoscaler do
         desc 'Run the autoscaler once for a specific worker (default: :default). Use WORKER=name'

data/lib/solid_queue_autoscaler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidQueueAutoscaler
-  VERSION = '1.0.11'
+  VERSION = '1.0.13'
 end

data/lib/solid_queue_autoscaler.rb

@@ -100,6 +100,33 @@ module SolidQueueAutoscaler
       end
     end
 
+    # Apply job settings (queue, priority) from configuration to AutoscaleJob.
+    # Called automatically after Rails initializers run via the railtie.
+    # Uses the first configured worker's job_queue/job_priority settings.
+    def apply_job_settings!
+      return unless defined?(AutoscaleJob)
+      return if configurations.empty?
+
+      # Use the first configured worker's settings
+      first_config = configurations.values.first
+      job_queue = first_config&.job_queue || :autoscaler
+      job_priority = first_config&.job_priority
+
+      # Set the queue_name class attribute directly (not via queue_as block)
+      # This ensures SolidQueue recurring jobs pick up the correct queue
+      # Convert to string since ActiveJob internally uses strings for queue names
+      AutoscaleJob.queue_name = job_queue.to_s
+
+      # Set priority if configured
+      if job_priority && AutoscaleJob.respond_to?(:priority=)
+        AutoscaleJob.priority = job_priority
+      end
+
+      first_config&.logger&.debug(
+        "[SolidQueueAutoscaler] AutoscaleJob configured: queue=#{job_queue}, priority=#{job_priority || 'default'}"
+      )
+    end
+
     # Verify the installation is complete and working.
     # Prints a human-friendly report (when verbose: true) and returns a VerificationResult.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue_autoscaler
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.13
 platform: ruby
 authors:
 - reillyse