hanami-events-cloud_pubsub 3.0.1 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed996f19617d35dea1812cfe7de9c53add0a7be29a25cf6735f264754f8c46c
-  data.tar.gz: 85d62a2346e2260bc46402e7fa15a894e28c7b7b7d5b85dd7b4aa24ceaa62506
+  metadata.gz: 0c771a179c93a8264e30f783a31b3c623c301206c587f9fb76f3dfcff9834731
+  data.tar.gz: 6b4b4ec5bbef668fc5fdf3d46a336a1646a440eeaeb68825803211dc6797ac34
 SHA512:
-  metadata.gz: 641c25a25fad9f9d5408818719b72d3035f9b0fcd0d162f32dab7c0c9868bf3db2c74beae12821e9fb792f19d6bcc4005854e5ee346e18415e689ecdcbc25459
-  data.tar.gz: 56911f5ab294af2ed08a30e4e1b5e1f947e130a7d8229073ae195ab538e2d63a36dab0260410707c64264175667781bb41c93da722174dbe56c86f115d7c77e5
+  metadata.gz: dd9fdb68cd1a9bfffadd5a55e3656c39e884dfa99f57324dba5b2609309c3077e8a83ed6d9bfe169dd5cf4ead82ab1fbe38c057ac889ae099f7f54aad8304aa0
+  data.tar.gz: 339896e5b18a3396f6988c19b846f6995d1fc3368b5430ff25c5ef5a759c9beac1609715aa2221ce03ea7470c3f769a4b8035a6fdb1198dd420fb4d619ba432f

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-09-25 19:54:44 UTC using RuboCop version 0.89.0.
+# on 2020-12-08 03:28:27 UTC using RuboCop version 0.89.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -15,13 +15,23 @@ Lint/RedundantCopDisableDirective:
 # Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 21
+  Max: 25
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 11
 
 # Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 11
+
 # Offense count: 1
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:

data/Gemfile.lock

@@ -8,10 +8,10 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (3.0.1)
+    hanami-events-cloud_pubsub (3.0.6)
       dry-configurable (>= 0.8)
       gapic-common (>= 0.3.4)
-      google-cloud-pubsub (>= 0.38.1, < 2.1)
+      google-cloud-pubsub (>= 0.38.1, < 2.4)
       hanami-cli (~> 0.2)
       hanami-events (~> 0.2.0)
       rack
@@ -36,8 +36,9 @@ GEM
     dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     gapic-common (0.3.4)
       google-protobuf (~> 3.12, >= 3.12.2)
       googleapis-common-protos (>= 1.3.9, < 2.0)
@@ -47,10 +48,10 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
+    google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-pubsub (2.0.0)
+    google-cloud-pubsub (2.3.0)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
       google-cloud-pubsub-v1 (~> 0.0)
@@ -58,21 +59,21 @@ GEM
       gapic-common (~> 0.3)
       google-cloud-errors (~> 1.0)
       grpc-google-iam-v1 (>= 0.6.10, < 2.0)
-    google-protobuf (3.13.0)
+    google-protobuf (3.14.0)
     googleapis-common-protos (1.3.10)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (>= 1.0.5, < 2.0)
       grpc (~> 1.27)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
-    googleauth (0.13.1)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    grpc (1.32.0)
+    grpc (1.34.0)
       google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (0.6.10)
@@ -130,6 +131,7 @@ GEM
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     signet (0.14.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)

data/hanami-events-cloud_pubsub.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dry-configurable', '>= 0.8'
   spec.add_dependency 'gapic-common', '>= 0.3.4'
-  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 2.1'
+  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 2.4'
   spec.add_dependency 'hanami-cli', '~> 0.2'
   spec.add_dependency 'hanami-events', '~> 0.2.0'
   spec.add_dependency 'rack'

data/lib/hanami/events/cloud_pubsub.rb

@@ -52,7 +52,7 @@ module Hanami
       }, reader: true
       setting :error_handlers, [
         ->(err, msg) do
-          logger.error "Message(#{msg.message_id}) failed with exception #{err.inspect}"
+          logger.error "Message(#{msg}) failed with exception #{err.inspect}"
         end
       ], reader: true
 

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -59,7 +59,8 @@ module Hanami
         end
 
         def shutdown
-          subscriber.stop.wait!
+          stop
+          wait
           self
         end
 
@@ -68,8 +69,8 @@ module Hanami
           self
         end
 
-        def wait
-          subscriber.wait!
+        def wait(timeout = 60)
+          subscriber.wait!(timeout)
           self
         end
 
@@ -85,8 +86,9 @@ module Hanami
 
         def run_handler(message)
           middleware.invoke(message) { handler.call(message) }
+          message.ack!
         rescue StandardError => e
-          run_error_handlers(e, message)
+          run_error_handlers(e, message.message_id.to_s)
           message.nack! if CloudPubsub.config.auto_retry.enabled
           raise
         end
@@ -132,16 +134,25 @@ module Hanami
         end
 
         def apply_retry_options(sub)
-          return {} unless CloudPubsub.config.auto_retry.enabled
+          retry_policy = build_retry_policy
+          attempts = CloudPubsub.config.auto_retry.max_attempts
 
-          sub.retry_policy = Google::Cloud::PubSub::RetryPolicy.new(
+          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
+          sub.dead_letter_topic = dead_letter_topic if sub.dead_letter_topic&.name != dead_letter_topic&.name
+          sub.dead_letter_max_delivery_attempts = attempts if sub.dead_letter_topic&.name != dead_letter_topic&.name
+
+          sub
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def build_retry_policy
+          return unless CloudPubsub.config.auto_retry.enabled
+
+          Google::Cloud::PubSub::RetryPolicy.new(
             minimum_backoff: CloudPubsub.config.auto_retry.minimum_backoff,
             maximum_backoff: CloudPubsub.config.auto_retry.maximum_backoff
           )
-          sub.dead_letter_topic = dead_letter_topic
-          sub.dead_letter_max_delivery_attempts = CloudPubsub.config.auto_retry.max_attempts
-
-          sub
         end
       end
       # rubocop:enable Metrics/ClassLength:

data/lib/hanami/events/cloud_pubsub/runner.rb

@@ -9,7 +9,7 @@ module Hanami
       class Runner
         attr_reader :logger, :adapter
 
-        def initialize(adapter:, logger:, sleep_time: 2)
+        def initialize(adapter:, logger:, sleep_time: 30)
           @logger = logger
           @adapter = adapter
           @sleep_time = sleep_time
@@ -40,9 +40,8 @@ module Hanami
         def gracefully_shutdown
           stop
           logger.info "Gracefully shutting down CloudPubsub runner: #{self}"
-          sleep_for_a_bit
+          adapter.listeners.each { |l| l.wait(@sleep_time) }
           adapter.flush_messages
-          adapter.listeners.each(&:wait)
           handle_on_shutdown
 
           self
@@ -102,10 +101,6 @@ module Hanami
           MSG
         end
 
-        def sleep_for_a_bit
-          sleep @sleep_time
-        end
-
         def handle_on_shutdown
           return if CloudPubsub.on_shutdown_handlers.empty?
 

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.0.1'
+      VERSION = '3.0.6'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.6
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -47,7 +47,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Google Cloud Pub/Sub adapter for the hanami-events gem