hanami-events-cloud_pubsub 2.8.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ed69df79fc8f4c3197cc63e2c70afcc30532dd1dd61de56b40d816ef512633
-  data.tar.gz: 8b2cd963546a1a051fbb1fdef5c34d69c81c93b928ad7465481fe2e26e0b6415
+  metadata.gz: 5112da85db469fae18a876b6f4a98ae0f70c557b215c6ce5cd09294a98cb56be
+  data.tar.gz: 9b1ac9101488c8e42104df3ce9075c641b9d634932c212ee9da7f837fa1449b3
 SHA512:
-  metadata.gz: 3c10ba39f6b0c6f3f4ffbd7a5073019821e0ecbdfd30be769a9aee8c61a0d38ff0c9dc3ad5047f1c7ca9aaabf57320a3e9e2d1a682524329eb5991d68bc801fb
-  data.tar.gz: 9e5855ad6001ab46e7acafb27929f2d3ffdc0f341e31a22752f0e9bb9e0a9e1d24669fc73288481ee17e174018acadb78048f957e5c8a2028d1eb9963dcb7c6e
+  metadata.gz: 7aa2d8aca9fb271a9c7ee5197858f46ca66e65e0b098dfad3015fb982c346f779792f5b6184d25ad64731c34e7aa1394cbc08acbb00db7e441a23d9496b4fca8
+  data.tar.gz: 85564ccda38f3e5ca26e8dc4719961b1b7483d3d5a56e7387af9bf39f321159dfd4bbf0f488570aa37fdfee3ebb16610d49752660828ee7618cddbf76d9f8185

data/.rubocop.yml

@@ -2,9 +2,10 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  NewCops: enable
   Exclude:
     - bin/*
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Metrics/BlockLength:
   Exclude:

data/.rubocop_todo.yml

@@ -1,13 +1,24 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-30 15:26:46 -0400 using RuboCop version 0.72.0.
+# on 2020-09-25 19:54:44 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/hanami/events/adapter/cloud_pubsub.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 21
+
+# Offense count: 4
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
@@ -16,10 +27,3 @@ Metrics/MethodLength:
 Style/GlobalVars:
   Exclude:
     - 'examples/server.rb'
-
-# Offense count: 35
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 96

data/Gemfile

@@ -11,3 +11,5 @@ gem 'hanami-events', github: 'hanami/events'
 gem 'pry'
 gem 'rubocop'
 gem 'simplecov', require: false
+
+gem 'request_id', '~> 0.4.3'

data/Gemfile.lock

@@ -8,9 +8,10 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (2.8.1)
+    hanami-events-cloud_pubsub (3.0.3)
       dry-configurable (>= 0.8)
-      google-cloud-pubsub (>= 0.38.1, < 1.7)
+      gapic-common (>= 0.3.4)
+      google-cloud-pubsub (>= 0.38.1, < 2.4)
       hanami-cli (~> 0.2)
       hanami-events (~> 0.2.0)
       rack
@@ -20,12 +21,12 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    coderay (1.1.2)
+    ast (2.4.1)
+    coderay (1.1.3)
     concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    dry-configurable (0.11.5)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -35,43 +36,45 @@ 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)
+      googleapis-common-protos-types (>= 1.0.4, < 2.0)
+      googleauth (~> 0.9)
+      grpc (~> 1.25)
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.2)
+    google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-pubsub (1.6.1)
+    google-cloud-pubsub (2.3.0)
       concurrent-ruby (~> 1.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.8)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-      grpc-google-iam-v1 (~> 0.6.9)
-    google-gax (1.8.1)
-      google-protobuf (~> 3.9)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleauth (~> 0.9)
-      grpc (~> 1.24)
-      rly (~> 0.2.3)
-    google-protobuf (3.12.2)
+      google-cloud-core (~> 1.5)
+      google-cloud-pubsub-v1 (~> 0.0)
+    google-cloud-pubsub-v1 (0.1.2)
+      gapic-common (~> 0.3)
+      google-cloud-errors (~> 1.0)
+      grpc-google-iam-v1 (>= 0.6.10, < 2.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.12.0)
+    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.28.0)
-      google-protobuf (~> 3.11)
+    grpc (1.34.0)
+      google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (0.6.10)
       google-protobuf (~> 3.11)
@@ -83,48 +86,52 @@ GEM
     hanami-utils (1.3.6)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
-    jaro_winkler (1.5.4)
-    jwt (2.2.1)
+    jwt (2.2.2)
     memoist (0.16.2)
     method_source (1.0.0)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    os (1.1.0)
-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
-    prometheus-client (2.0.0)
+    os (1.1.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    prometheus-client (2.1.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
-    rack (2.2.2)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
+    request_id (0.4.3)
     rexml (3.2.4)
-    rly (0.2.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.89.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    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)
@@ -147,6 +154,7 @@ DEPENDENCIES
   prometheus-client
   pry
   rake (~> 13.0)
+  request_id (~> 0.4.3)
   rspec (~> 3.0)
   rubocop
   simplecov

data/README.md

@@ -106,6 +106,19 @@ Then, run the worker process:
 bundle exec cloudpubsub run
 ```
 
+# `RequestId` Integration
+
+To gem has an integration with [request_id](https://github.com/remind101/request_id), so you can trace interactions between various components in your app. To make it work properly, make sure the `request_id` is added to your Gemfile, then require the middleware:
+
+```ruby
+require 'hanami/events/cloud_pubsub/middleware/request_id'
+
+Hanami::Events::CloudPubsub.configure do |config|
+  # ...
+end
+```
+
+
 # Prometheus Integration
 
 If you have the `prometheus-client` gem installed, a `/metrics` endpoint will

data/examples/client.rb

@@ -12,7 +12,7 @@ Hanami::Events::CloudPubsub.setup
 
 pubsub = Google::Cloud::Pubsub.new project_id: 'emulator'
 
-events = Hanami::Events.initialize(:cloud_pubsub, pubsub: pubsub, logger: Logger.new(STDOUT))
+events = Hanami::Events.initialize(:cloud_pubsub, pubsub: pubsub, logger: Logger.new($stdout))
 
 3.times do
   events.broadcast('user.deleted', user_id: 1)

data/examples/server.rb

@@ -4,6 +4,8 @@ Hanami::Events::CloudPubsub.configure do |config|
   config.subscriber.streams = 2
   config.subscriber.threads.push = 2
   config.subscriber.threads.callback = 2
+  config.auto_retry.enabled = true
+  config.auto_retry.dead_letter_topic_name = 'my-dead-letter-topic-name'
 
   config.subscriptions_loader = -> do
     $events.subscribe('user.deleted', id: 'testing-2') do |payload|

data/hanami-events-cloud_pubsub.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/adHawk/hanami-events-cloud_pubsub'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '>= 2.5.0'
+
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -23,7 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-configurable', '>= 0.8'
-  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 1.7'
+  spec.add_dependency 'gapic-common', '>= 0.3.4'
+  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/adapter/cloud_pubsub.rb

@@ -11,31 +11,40 @@ module Hanami
       #
       # @api private
       class CloudPubsub
-        attr_reader :subscribers, :listeners, :topic_registry
+        attr_reader :subscribers, :listeners, :topic_registry, :middleware
 
         def initialize(params)
           @pubsub = params[:pubsub]
-          @logger = params[:logger] || Logger.new(STDOUT)
+          @logger = params[:logger] || Logger.new($stdout)
           @listen = params[:listen] || false
           @subscribers = Concurrent::Array.new
           @listeners = Concurrent::Array.new
           @serializer_type = params.fetch(:serializer, :json).to_sym
           @topic_registry = {}
           @mutex = Mutex.new
+          @middleware = ::Hanami::Events::CloudPubsub.config.client_middleware
         end
 
         # Brodcasts event to all subscribes
         #
         # @param event [Symbol, String] the event name
         # @param payload [Hash] the event data
-        def broadcast(name, payload, **message_opts)
+        def broadcast(name, input_payload, **message_opts)
           event_name = namespaced(name)
           topic = topic_for event_name
-          payload = serializer.serialize(payload)
-          attributes = { id: SecureRandom.uuid, event_name: event_name }
-
-          topic.publish_async(payload, **attributes, **message_opts) do |result|
-            logger.info "Published event #{result.inspect}"
+          serialized_payload = serializer.serialize(input_payload)
+          attrs = { id: SecureRandom.uuid, event_name: event_name }
+
+          middleware.invoke(serialized_payload, **attrs, **message_opts) do |payload, **opts|
+            topic.publish_async(payload, **opts) do |result|
+              msg = result.message.grpc.to_h
+
+              if result.succeeded?
+                logger.info "Published #{name.inspect} published", **msg
+              else
+                logger.warn "Failed to broadcast #{name.inspect} event", error: result.error, **msg # rubocop:disable Layout/LineLength
+              end
+            end
           end
         end
 
@@ -74,7 +83,8 @@ module Hanami
             handler: method(:call_subscribers),
             logger: logger,
             topic: topic,
-            subscriber_opts: subscriber_opts
+            subscriber_opts: subscriber_opts,
+            dead_letter_topic: dead_letter_topic
           )
 
           @listeners << listener
@@ -95,7 +105,7 @@ module Hanami
           @serializer ||= Hanami::Events::Serializer[@serializer_type].new
         end
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         def topic_for(name)
           return @topic_registry[name.to_s] if @topic_registry[name.to_s]
 
@@ -107,7 +117,15 @@ module Hanami
 
           @topic_registry[name.to_s] = topic
         end
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
+
+        def dead_letter_topic
+          conf = Hanami::Events::CloudPubsub.config.auto_retry
+
+          return unless conf.enabled
+
+          topic_for namespaced(conf.dead_letter_topic_name)
+        end
 
         def namespaced(val, sep: '.')
           [Hanami::Events::CloudPubsub.namespace, val].compact.join(sep)

data/lib/hanami/events/cloud_pubsub.rb

@@ -5,7 +5,6 @@ require 'hanami/events'
 require 'hanami/events/cloud_pubsub/version'
 require 'hanami/events/cloud_pubsub/middleware/stack'
 require 'hanami/events/cloud_pubsub/middleware/logging'
-require 'hanami/events/cloud_pubsub/middleware/auto_retry'
 require 'hanami/events/cloud_pubsub/runner'
 require 'hanami/events/cloud_pubsub/errors'
 require 'google/cloud/pubsub'
@@ -32,7 +31,7 @@ module Hanami
       setting :project_id, reader: true
       setting :auto_create_subscriptions, false, reader: true
       setting :auto_create_topics, false, reader: true
-      setting :logger, Logger.new(STDOUT), reader: true
+      setting :logger, Logger.new($stdout), reader: true
       setting :subscriptions_loader, proc {
         abort <<~MSG
           ┌────────────────────────────────────────────────────────────────────────────────┐
@@ -58,8 +57,7 @@ module Hanami
       ], reader: true
 
       middleware_stack = Middleware::Stack.new(
-        Middleware::Logging.new,
-        Middleware::AutoRetry.new
+        Middleware::Logging.new
       )
 
       begin
@@ -72,8 +70,31 @@ module Hanami
 
       setting :middleware, middleware_stack
 
+      client_middleware_stack = Middleware::Stack.new
+
+      begin
+        require 'request_id'
+        require 'hanami/events/cloud_pubsub/middleware/client/request_id'
+        require 'hanami/events/cloud_pubsub/middleware/request_id'
+
+        client_middleware_stack.prepend(Middleware::Client::RequestId.new)
+        middleware_stack.prepend(Middleware::RequestId.new)
+      rescue LoadError
+        # ok
+      end
+
+      setting :client_middleware, client_middleware_stack
+
       setting :on_shutdown_handlers, [], reader: true
 
+      setting :auto_retry do
+        setting :enabled, false
+        setting :max_attempts, 1200
+        setting :dead_letter_topic_name
+        setting :minimum_backoff, 30
+        setting :maximum_backoff, 600
+      end
+
       def self.finalize_settings!
         conf_hash = config.pubsub
         conf_hash.each { |key, val| Google::Cloud::Pubsub.configure[key] = val }

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

@@ -102,8 +102,8 @@ module Hanami
             end
 
             def shutdown
-              STDOUT.flush
-              STDERR.flush
+              $stdout.flush
+              $stderr.flush
               runner.gracefully_shutdown
             ensure
               @finished_shutting_down = true

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

@@ -5,6 +5,7 @@ require 'hanami/events/cloud_pubsub/safe_error_handler'
 module Hanami
   module Events
     module CloudPubsub
+      # rubocop:disable Metrics/ClassLength:
       # @api private
       class Listener
         attr_reader :topic,
@@ -13,8 +14,10 @@ module Hanami
                     :logger,
                     :handler,
                     :event_name,
-                    :subscriber_opts,
-                    :middleware
+                    :input_subscriber_opts,
+                    :middleware,
+                    :dead_letter_topic
+
         # rubocop:disable Metrics/ParameterLists
         def initialize(topic:,
                        logger:,
@@ -22,25 +25,24 @@ module Hanami
                        event_name:,
                        subscriber_id:,
                        subscriber_opts: {},
-                       middleware: CloudPubsub.config.middleware)
+                       middleware: CloudPubsub.config.middleware,
+                       dead_letter_topic: nil)
           @topic = topic
           @logger = logger
           @handler = handler
           @event_name = event_name
           @subscriber_id = subscriber_id
-          @subscriber_opts = CloudPubsub.config.subscriber.to_h.merge(subscriber_opts)
+          @input_subscriber_opts = subscriber_opts
           @middleware = middleware
+          @dead_letter_topic = dead_letter_topic
         end
         # rubocop:enable Metrics/ParameterLists
 
         def register
           subscription = subscription_for(subscriber_id)
-
-          listener = subscription.listen(subscriber_opts) do |message|
-            handle_message(message)
-          end
-
-          logger.debug("Registered listener for #{subscriber_id} with opts #{subscriber_opts}")
+          apply_retry_options(subscription)
+          listener = subscription.listen(**subscriber_options) { |m| handle_message(m) }
+          logger.debug("Registered listener for #{subscriber_id} with: #{subscriber_options}")
 
           @subscriber = listener
 
@@ -83,8 +85,10 @@ module Hanami
 
         def run_handler(message)
           middleware.invoke(message) { handler.call(message) }
+          message.ack!
         rescue StandardError => e
           run_error_handlers(e, message)
+          message.nack! if CloudPubsub.config.auto_retry.enabled
           raise
         end
 
@@ -120,7 +124,28 @@ module Hanami
                 "a subscription already exists for #{sub_name} " \
                 "but its name #{found_subscription.topic.name} does not match #{@event_name}"
         end
+
+        def subscriber_options
+          @subscriber_options ||= {
+            **CloudPubsub.config.subscriber.to_h,
+            **input_subscriber_opts
+          }
+        end
+
+        def apply_retry_options(sub)
+          return {} unless CloudPubsub.config.auto_retry.enabled
+
+          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
+        end
       end
+      # rubocop:enable Metrics/ClassLength:
     end
   end
 end

data/lib/hanami/events/cloud_pubsub/middleware/client/request_id.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Events
+    module CloudPubsub
+      module Middleware
+        module Client
+          # Broadcasts events with current request id
+          class RequestId
+            def call(payload, attributes = {})
+              attributes.merge!(
+                request_id: ::RequestId.request_id || SecureRandom.uuid
+              )
+
+              yield(payload, **attributes)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanami/events/cloud_pubsub/middleware/request_id.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+begin
+  require 'request_id'
+rescue LoadError
+  abort 'Please add "request_id" to your Gemfile to use this middleware'
+end
+
+module Hanami
+  module Events
+    module CloudPubsub
+      module Middleware
+        # Middleware used for logging useful information about an event
+        class RequestId
+          def call(msg, **opts)
+            setup_request_id(msg)
+            yield(**opts)
+          ensure
+            clear_request_id(msg)
+          end
+
+          private
+
+          def setup_request_id(msg)
+            id = msg.attributes['request_id'] || msg.attributes[:request_id]
+
+            ::RequestId.request_id = id || SecureRandom.uuid
+          rescue StandardError => e
+            warn "Could not set request_id (#{e.message})"
+          end
+
+          def clear_request_id(_msg)
+            ::RequestId.request_id = nil
+          rescue StandardError => e
+            warn "Could not clear request_id (#{e.message})"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanami/events/cloud_pubsub/middleware/stack.rb

@@ -40,14 +40,14 @@ module Hanami
             @entries.shift
           end
 
-          def invoke(message)
+          def invoke(*args, **kwargs)
             stack = entries.dup
 
             traverse_stack = proc do |**opts|
               if stack.empty?
-                yield(message)
+                yield(*args, **kwargs, **opts)
               else
-                stack.shift.call(message, **opts, &traverse_stack)
+                stack.shift.call(*args, **kwargs, **opts, &traverse_stack)
               end
             end
 

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

@@ -86,13 +86,12 @@ module Hanami
         # some reason.
         #
         # See: https://github.com/mperham/sidekiq/blob/e447dae961ebc894f12848d9f33446a07ffc67dc/bin/sidekiqload#L74
-        # rubocop:disable Metrics/AbcSize
         def debug_info
           <<~MSG
             ╔══════ BACKTRACES
             #{Thread.list.flat_map { |thr| ThreadInspector.new(thr).to_s }.join("\n")}
             ╠══════ LISTENERS
-            #{adapter.listeners.map { |lis| '║ ' + lis.format }.join("\n")}
+            #{adapter.listeners.map { |lis| "║ #{lis.format}" }.join("\n")}
             ║
             ╠══════ GENERAL
             ║ ready?: #{ready?}
@@ -102,7 +101,6 @@ module Hanami
             ╚══════
           MSG
         end
-        # rubocop:enable Metrics/AbcSize
 
         def sleep_for_a_bit
           sleep @sleep_time
@@ -114,11 +112,9 @@ module Hanami
           logger.info('Calling custom on_shutdown handler')
 
           CloudPubsub.on_shutdown_handlers.each do |handler|
-            begin
-              handler.call(adapter)
-            rescue StandardError => e
-              logger.warn("Shutdown handler failed (#{e.message})")
-            end
+            handler.call(adapter)
+          rescue StandardError => e
+            logger.warn("Shutdown handler failed (#{e.message})")
           end
         end
       end

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

@@ -48,7 +48,7 @@ module Hanami
         end
 
         def join_backtrace(pretty_backtrace)
-          pretty_backtrace.map! { |line| "║\t" + line }
+          pretty_backtrace.map! { |line| "║\t#{line}" }
           pretty_backtrace << '║'
           pretty_backtrace.join("\n")
         end

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '2.8.1'
+      VERSION = '3.0.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: gapic-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +47,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +57,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -178,9 +192,10 @@ files:
 - lib/hanami/events/cloud_pubsub/health_check_server.rb
 - lib/hanami/events/cloud_pubsub/integration.rb
 - lib/hanami/events/cloud_pubsub/listener.rb
-- lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb
+- lib/hanami/events/cloud_pubsub/middleware/client/request_id.rb
 - lib/hanami/events/cloud_pubsub/middleware/logging.rb
 - lib/hanami/events/cloud_pubsub/middleware/prometheus.rb
+- lib/hanami/events/cloud_pubsub/middleware/request_id.rb
 - lib/hanami/events/cloud_pubsub/middleware/stack.rb
 - lib/hanami/events/cloud_pubsub/register.rb
 - lib/hanami/events/cloud_pubsub/runner.rb
@@ -193,7 +208,7 @@ homepage: https://github.com/adHawk/hanami-events-cloud_pubsub
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,15 +216,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Google Cloud Pub/Sub adapter for the hanami-events gem
 test_files: []

data/lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami
-  module Events
-    module CloudPubsub
-      # Middleware
-      module Middleware
-        # Middleware used for automatically acknowledging messages
-        class AutoRetry
-          attr_reader :max_attempts
-
-          def initialize(logger: nil, max_attempts: 1200)
-            @logger = logger
-            @max_attempts = max_attempts
-          end
-
-          def call(message, **args)
-            succeeded = false
-            failed = false
-            yield(**args)
-            succeeded = true
-          rescue StandardError => e
-            failed = true
-            raise e
-          ensure
-            ack_or_reject(message, succeeded, failed, args)
-          end
-
-          private
-
-          def ack_or_reject(message, succeeded, failed, args)
-            if succeeded
-              handle_success(message, args)
-            elsif failed && max_attempts_reached?(args)
-              handle_max_attempts_reached(message, args)
-            elsif failed
-              handle_failure(message, args)
-            else
-              handle_unfinished(message, args)
-            end
-          end
-
-          def handle_success(message, _args)
-            message.acknowledge!
-            logger.debug "Message(#{message.message_id}) was acknowledged"
-          end
-
-          def max_attempts_reached?(args)
-            args.key?(:attempts) && args[:attempts] >= max_attempts
-          end
-
-          def handle_max_attempts_reached(message, _args)
-            id = message.message_id
-            msg = 'number of attempts exceeded max attempts ' \
-                  "of #{max_attempts}, acknowledging message"
-            logger.debug "Message(#{id}) failed, #{msg}"
-            message.acknowledge!
-          end
-
-          def handle_failure(message, args)
-            id = message.message_id
-            seconds = calculate_backoff_seconds(message, args)
-            success = message.modify_ack_deadline!(seconds)
-            msg = "added #{success ? seconds : 0} seconds of delay to ack deadline"
-            logger.debug "Message(#{id}) failed, #{msg}" if success
-          end
-
-          def handle_unfinished(message, _args)
-            id = message.message_id
-            message.reject!
-            logger.warn "Message(#{id}) was terminated from outside, rescheduling"
-          end
-
-          def logger
-            @logger || CloudPubsub.logger
-          end
-
-          def calculate_backoff_seconds(_message, args)
-            amt = if args.key?(:attempts)
-                    count = args[:attempts]
-                    # min + exponential + random smear
-                    15 + count**4 + (rand(30) * (count + 1))
-                  else
-                    60
-                  end
-
-            amt > 600 ? 600 : amt
-          end
-        end
-      end
-    end
-  end
-end