hanami-events-cloud_pubsub 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee0ba4911c74d444d15ac8a68be7b29f6545bac4b5a3f334b82e7227c36f428
-  data.tar.gz: 1d04b3640314ab6cd95dcffe2c2e7e8f7d43c757ca7d82d47b012ffd2f5230b3
+  metadata.gz: 3d44039a04524e3577341b8dce78ee4479b24b49972d9be9e5353ac8e1186b4c
+  data.tar.gz: 84546314a907e147de4fbbcce02ec85e802c089e7ec2ed5b242e76bc53b63839
 SHA512:
-  metadata.gz: 88b2756beaf9b141768e60d119298bd2723882bf931000ffbf4ac81f1db5bfde8fab8458fcf25b92e9d4623538d6d7ef521116a511da2ea8545f6ee0e7741fdc
-  data.tar.gz: a059d2529907d76bc6f5be1c0e9f5298b5d883aef43e645a8b4d3ac6401bf00c8440fea93a8d924f2f06223ff93ff7c67588e4588a9a4a93baf84da2f01971e5
+  metadata.gz: 63555a20d775ee80b5841991b4a2e3176d63e55e447f318a3ffed81f115790ba7e9149c1a170c2fc53b5f03d26dcbd3de679b7c513074213495f193b2960d19f
+  data.tar.gz: 3a21d8e97f431bca8b24cbffb2f09428cc743ff68f85225a0b71435f20196583e390e39c42bf6f1c9d425504ca9324b28310807bb631ddc8caed86a494a22960

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,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (3.0.4)
+    hanami-events-cloud_pubsub (3.0.5)
       dry-configurable (>= 0.8)
       gapic-common (>= 0.3.4)
       google-cloud-pubsub (>= 0.38.1, < 2.4)

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

@@ -87,7 +87,7 @@ module Hanami
           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
@@ -133,18 +133,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(
-            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.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, "Faled to apply retry options (see https://github.com/googleapis/google-cloud-ruby/issues/8237)")
+          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
+          )
         end
       end
       # rubocop:enable Metrics/ClassLength:

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.0.4'
+      VERSION = '3.0.5'
     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.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable