hermes_messenger_of_the_gods 3.0.0.rc5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 198222807509b3910bc1db6d0bbe5819956401176abd8b3f1d13c7163c95c1dd
-  data.tar.gz: f476dc6f1ebf9123527890d229d63e1068c1c6487004879550f9dc3a8307643a
+  metadata.gz: 66cf9c906ee1778e68e8064e13f77c5157284335c7c1f25bb1cf9328b151a1a0
+  data.tar.gz: 55c3008d04eb24472e3c574938140d7db78e68fa8960acc1f5198dc331ffe0d9
 SHA512:
-  metadata.gz: 1ac7755e67b7c37be401031ea1f8e596d3afe1d26719d7d028964835185d3b2f2fa822bbc7c7dec97f5f411f97b1527397d6d9067e5b718a83eed6f511e74337
-  data.tar.gz: ad8a934c454ab879432ebdf2d7f363fcbfb8bcf31f74354064274bcf761c0eba21dca927fa1d085cb57d5f35a11025bec62093ddf5c1401c2753c16585a75432
+  metadata.gz: '08844c25373078afe15fca74c7aa7129c46708c62c58865527617de9bf63ef972ab26ae92a14f62363764be2678a924a611be26432216c674190d26340c07cae'
+  data.tar.gz: 2dd3a36e8091eec825c3ae2ddc2843e3b2658cd192c8e1773b0429868a69cb6c969f0c9aa2011670dc9503ee4b6320a62871b2663b319eef2901329a07ca637e

data/.github/workflows/test.yml

@@ -7,16 +7,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rubyVersion: ["2.7.8", "3.0.4", "3.1.2", "3.2.2"]
+        rubyVersion: ["2.7.8", "3.0.4", "3.1.2", "3.2.2", "3.3.7", "3.4.1"]
     runs-on: ubuntu-latest
     steps:
       - name: Install SSH Key
-        uses: webfactory/ssh-agent@v0.5.2
+        uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.GH_ACTIONS_SSH_PRIVATE_KEY }}
 
       - name: Pull
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ${{ github.workspace }}/src/github.com/${{ github.repository }}
       - uses: ruby/setup-ruby@v1

data/lib/hermes_messenger_of_the_gods/concerns/worker.rb

@@ -25,7 +25,7 @@ module HermesMessengerOfTheGods
         end
 
         def healthy?
-          !endpoint.has_pending_work? || (
+          !endpoint.received_work_in_last_check? || (
             last_task_performed &&
             Time.now - last_task_performed < expected_work_frequency
           )

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,21 @@ 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?
+        end
+
+        poller.after_empty_receive do |_stats|
+          self.received_work_in_last_check = false
+          self.class.set_deletion_cost(0)
+        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.
@@ -131,17 +178,6 @@ module HermesMessengerOfTheGods
         queue.reload.data
       end
 
-      def has_pending_work?
-        data = queue_data.attributes
-
-        approximate_pending_messages = data['ApproximateNumberOfMessages'].to_i -
-                                       data['ApproximateNumberOfMessagesNotVisible'].to_i -
-                                       data['ApproximateNumberOfMessagesDelayed'].to_i
-
-        # Just in case the math is off
-        approximate_pending_messages.positive?
-      end
-
       def to_transmit_payload(message, raw_message, dispatch_options = {})
         send_opts = fetch_option(:send_options, raw_message) || {}
 

data/lib/hermes_messenger_of_the_gods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HermesMessengerOfTheGods
-  VERSION = '3.0.0.rc5'
+  VERSION = '3.0.1'
 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.rc5
+  version: 3.0.1
 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: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -250,11 +250,11 @@ 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
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Create and receive messages like a god!