hermes_messenger_of_the_gods 3.0.0.rc4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32df338af3c22fa0c32c7bd627ef1532cf717fc71d9ab9d01f0d2b7dbb41e23
-  data.tar.gz: 7e2f8b3d4a4db443058930b3a7713d241309d381b54250c8048d85a31600d510
+  metadata.gz: 33c9ff0aa4e8742ae7b9d157836767f20d8b1a0a2d9c122677ff0e81c920c3f6
+  data.tar.gz: aeaeb01b41023f6e5af9b77e5364eddbf60afcfa02b747350c94e4d324d8a0e5
 SHA512:
-  metadata.gz: 455383e01eb7d5141a25805239677479838be0abbea5bf8e42e9ae25b9835e03c8da6459649891b47604402a26c98a90cc75ae783d7ede5d647a8259ad97fe6a
-  data.tar.gz: 022aa5ac6c26168d00796cd23eccd8db3221c885c8e203ad0dea6188a64c0d79528191c38a9e99357ccccedb774554afd07eb46751b905c54a065c98128ea03e
+  metadata.gz: '06167683706027e262b8f81e467c89d1ea506197a339419b061662a9d972bcd063d4e79f6f21b2f92177837aa1c958c64d7e4b34074c94fdce2669c69db97338'
+  data.tar.gz: fcf709e4fa3dec47060cf6fb63cddf0cfb5d1b87e9f9874b0cbdc6a4ddcbd379b0043ee3a9ccc9782cbd06413ac12d9dd2c1eb92a0756d1416be656e9de7f9e0

data/lib/hermes_messenger_of_the_gods/concerns/message.rb

@@ -71,6 +71,8 @@ module HermesMessengerOfTheGods
 
       class_methods do
         def send_messages(messages, options = {})
+          return if messages.empty?
+
           raise ArgumentError, "All messages must be #{self.class}" unless messages.all?{|m| m.is_a?(self) }
           messages.map(&:validate!)
           messages.first.endpoint.bulk_dispatch!(messages, options)

data/lib/hermes_messenger_of_the_gods/endpoints/sqs.rb

@@ -4,12 +4,41 @@ require 'aws-sdk-sqs'
 require 'json'
 require_relative './base'
 
+begin
+  require 'k8s-ruby'
+rescue LoadError
+  STDERR.puts 'k8s-ruby gem not found. Please install it to enable prefential scale-down of workers.'
+end
+
 module HermesMessengerOfTheGods
   module Endpoints
     class Sqs < Base
       VISIBILITY_EXTEND_DURATION  = 120
       VISIBILITY_EXTEND_FREQUENCY = 60
 
+      def self.k8s_client
+        return unless defined?(K8s)
+
+        @k8s_client ||= K8s::Client.in_cluster_config
+      end
+
+      def self.set_deletion_cost(cost)
+        # If there is no k8s client or the cost is the same as the last time we set it, we don't need to do anything
+        return unless k8s_client || @last_deletion_cost == cost
+
+        k8s_client.api('v1').resource('pods', namespace: ENV['SYSTEM_NAMESPACE']).merge_patch(ENV['HOSTNAME'], {
+          metadata: {
+            annotations: { 
+              "controller.kubernetes.io/pod-deletion-cost" => cost.to_s
+            },
+          }
+        })
+
+        @last_deletion_cost = cost
+      rescue StandardError => e
+        STDERR.puts "Error setting deletion cost: #{e.message}"
+      end
+
       def initialize(*args)
         super
         @message_mux = Monitor.new
@@ -33,6 +62,14 @@ module HermesMessengerOfTheGods
         @work_start_time_mux.synchronize { @work_start_time = Time.now }
       end
 
+      def received_work_in_last_check?
+        @work_start_time_mux.synchronize { @received_work_in_last_check || false } 
+      end
+
+      def received_work_in_last_check=(val)
+        @work_start_time_mux.synchronize { @received_work_in_last_check = val }
+      end
+
       def inflight_messages
         @message_mux.synchronize { @inflight_messages ||= [] }
       end
@@ -61,11 +98,20 @@ module HermesMessengerOfTheGods
       end
 
       def work_off(&blk)
-        poller.before_request { |_stats| throw :stop_polling if shutting_down? }
+        poller.before_request do |_stats| 
+          throw :stop_polling if shutting_down?
+
+          self.class.set_deletion_cost(0) unless received_work_in_last_check?
+
+          self.received_work_in_last_check = false
+        end
 
         poller.poll(poll_options) do |messages, _stats|
           self.inflight_messages = messages = Array.wrap(messages)
 
+          self.received_work_in_last_check = true
+          self.class.set_deletion_cost(messages.size)
+
           working_messages do
             completion_results = messages.group_by do |msg|
               # We return false if we are shutting down so the messages are not deleted.

data/lib/hermes_messenger_of_the_gods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HermesMessengerOfTheGods
-  VERSION = '3.0.0.rc4'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermes_messenger_of_the_gods
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0
 platform: ruby
 authors:
 - Brian Malinconico
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -250,9 +250,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: