google-cloud-pubsub 0.33.2 → 0.34.0

data/lib/google/cloud/pubsub/snapshot.rb

@@ -18,7 +18,7 @@ require "google/cloud/pubsub/snapshot/list"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # # Snapshot
       #
@@ -35,7 +35,7 @@ module Google
       # @example
       #   require "google/cloud/pubsub"
       #
-      #   pubsub = Google::Cloud::Pubsub.new
+      #   pubsub = Google::Cloud::PubSub.new
       #   sub = pubsub.subscription "my-sub"
       #
       #   snapshot = sub.create_snapshot "my-snapshot"
@@ -47,14 +47,14 @@ module Google
         attr_accessor :service
 
         ##
-        # @private The gRPC Google::Pubsub::V1::Snapshot object.
+        # @private The gRPC Google::Cloud::PubSub::V1::Snapshot object.
         attr_accessor :grpc
 
         ##
         # @private Create an empty {Snapshot} object.
         def initialize
           @service = nil
-          @grpc = Google::Pubsub::V1::Snapshot.new
+          @grpc = Google::Cloud::PubSub::V1::Snapshot.new
         end
 
         ##
@@ -72,14 +72,14 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-sub"
         #
         #   snapshot = sub.create_snapshot "my-snapshot"
         #   snapshot.topic.name #=> "projects/my-project/topics/my-topic"
         #
         def topic
-          Topic.new_lazy @grpc.topic, service
+          Topic.from_name @grpc.topic, service
         end
 
         ##
@@ -99,7 +99,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #   sub = pubsub.subscription "my-sub"
         #
         #   snapshot = sub.create_snapshot "my-snapshot"
@@ -157,7 +157,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   pubsub.snapshots.each do |snapshot|
         #     snapshot.delete
@@ -170,7 +170,7 @@ module Google
         end
 
         ##
-        # @private New Snapshot from a Google::Pubsub::V1::Snapshot
+        # @private New Snapshot from a Google::Cloud::PubSub::V1::Snapshot
         # object.
         def self.from_grpc grpc, service
           new.tap do |f|
@@ -196,5 +196,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/snapshot/list.rb

@@ -17,7 +17,7 @@ require "delegate"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       class Snapshot
         ##
         # Snapshot::List is a special case Array with additional values.
@@ -25,7 +25,7 @@ module Google
           ##
           # If not empty, indicates that there are more snapshots
           # that match the request and this value should be passed to
-          # the next {Google::Cloud::Pubsub::Project#snapshots} to continue.
+          # the next {Google::Cloud::PubSub::Project#snapshots} to continue.
           attr_accessor :token
 
           ##
@@ -45,7 +45,7 @@ module Google
           # @example
           #   require "google/cloud/pubsub"
           #
-          #   pubsub = Google::Cloud::Pubsub.new
+          #   pubsub = Google::Cloud::PubSub.new
           #
           #   snapshots = pubsub.snapshots
           #   if snapshots.next?
@@ -64,7 +64,7 @@ module Google
           # @example
           #   require "google/cloud/pubsub"
           #
-          #   pubsub = Google::Cloud::Pubsub.new
+          #   pubsub = Google::Cloud::PubSub.new
           #
           #   snapshots = pubsub.snapshots
           #   if snapshots.next?
@@ -98,7 +98,7 @@ module Google
           # @example Iterating each snapshot by passing a block:
           #   require "google/cloud/pubsub"
           #
-          #   pubsub = Google::Cloud::Pubsub.new
+          #   pubsub = Google::Cloud::PubSub.new
           #
           #   snapshots = pubsub.snapshots
           #   snapshots.all do |snapshot|
@@ -108,7 +108,7 @@ module Google
           # @example Using the enumerator by not passing a block:
           #   require "google/cloud/pubsub"
           #
-          #   pubsub = Google::Cloud::Pubsub.new
+          #   pubsub = Google::Cloud::PubSub.new
           #
           #   snapshots = pubsub.snapshots
           #   all_names = snapshots.all.map do |snapshot|
@@ -118,7 +118,7 @@ module Google
           # @example Limit the number of API calls made:
           #   require "google/cloud/pubsub"
           #
-          #   pubsub = Google::Cloud::Pubsub.new
+          #   pubsub = Google::Cloud::PubSub.new
           #
           #   snapshots = pubsub.snapshots
           #   snapshots.all(request_limit: 10) do |snapshot|
@@ -144,7 +144,7 @@ module Google
 
           ##
           # @private New Snapshots::List from a
-          # Google::Pubsub::V1::ListSnapshotsRequest object.
+          # Google::Cloud::PubSub::V1::ListSnapshotsRequest object.
           def self.from_grpc grpc_list, service, max = nil
             subs = new(Array(grpc_list.snapshots).map do |grpc|
               Snapshot.from_grpc grpc, service
@@ -174,5 +174,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/subscriber.rb

@@ -15,19 +15,20 @@
 
 require "google/cloud/pubsub/service"
 require "google/cloud/pubsub/subscriber/stream"
+require "google/cloud/pubsub/subscriber/timed_unary_buffer"
 require "monitor"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       ##
       # Subscriber object used to stream and process messages from a
-      # Subscription. See {Google::Cloud::Pubsub::Subscription#listen}
+      # Subscription. See {Google::Cloud::PubSub::Subscription#listen}
       #
       # @example
       #   require "google/cloud/pubsub"
       #
-      #   pubsub = Google::Cloud::Pubsub.new
+      #   pubsub = Google::Cloud::PubSub.new
       #
       #   sub = pubsub.subscription "my-topic-sub"
       #
@@ -68,7 +69,8 @@ module Google
 
         ##
         # @private Implementation attributes.
-        attr_reader :stream_inventory, :stream_pool, :thread_pool, :service
+        attr_reader :stream_inventory, :stream_pool, :thread_pool, :buffer,
+                    :service
 
         ##
         # @private Create an empty {Subscriber} object.
@@ -94,6 +96,8 @@ module Google
           end
           @stream_pool = stream_pool.map(&:value)
 
+          @buffer = TimedUnaryBuffer.new self
+
           super() # to init MonitorMixin
         end
 
@@ -107,6 +111,8 @@ module Google
             @started = true
             @stopped = false
 
+            # Start the buffer before the streams are all started
+            @buffer.start
             @stream_pool.map do |stream|
               Thread.new { stream.start }
             end
@@ -133,6 +139,8 @@ module Google
             end
           end
           stop_pool.map(&:join)
+          # Stop the buffer after the streams are all stopped
+          synchronize { @buffer.stop }
 
           self
         end
@@ -185,7 +193,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #
@@ -224,7 +232,7 @@ module Google
         # @example
         #   require "google/cloud/pubsub"
         #
-        #   pubsub = Google::Cloud::Pubsub.new
+        #   pubsub = Google::Cloud::PubSub.new
         #
         #   sub = pubsub.subscription "my-topic-sub"
         #
@@ -252,6 +260,7 @@ module Google
             @last_error = error
             @error_callbacks
           end
+          error_callbacks = default_error_callbacks if error_callbacks.empty?
           error_callbacks.each { |error_callback| error_callback.call error }
         end
 
@@ -267,7 +276,24 @@ module Google
         def inspect
           "#<#{self.class.name} #{self}>"
         end
+
+        protected
+
+        def default_error_callbacks
+          # This is memoized to reduce calls to the configuration.
+          @default_error_callbacks ||= begin
+            error_callback = Google::Cloud::PubSub.configuration.on_error
+            error_callback ||= Google::Cloud.configure.on_error
+            if error_callback
+              [error_callback]
+            else
+              []
+            end
+          end
+        end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/subscriber/enumerator_queue.rb

@@ -15,7 +15,7 @@
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       class Subscriber
         # @private
         class EnumeratorQueue
@@ -48,5 +48,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/subscriber/inventory.rb

@@ -17,7 +17,7 @@ require "monitor"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       class Subscriber
         ##
         # @private
@@ -114,7 +114,7 @@ module Google
                 unless delay_gap.positive?
                   delay_target = nil
                   delay_gap = nil # wait until broadcast
-                  stream.delay_inventory!
+                  stream.renew_lease!
                 end
 
                 @wait_cond.wait delay_gap
@@ -132,5 +132,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end

data/lib/google/cloud/pubsub/subscriber/stream.rb

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-require "google/cloud/pubsub/subscriber/async_unary_pusher"
 require "google/cloud/pubsub/subscriber/enumerator_queue"
 require "google/cloud/pubsub/subscriber/inventory"
 require "google/cloud/pubsub/service"
@@ -23,7 +22,7 @@ require "concurrent"
 
 module Google
   module Cloud
-    module Pubsub
+    module PubSub
       class Subscriber
         ##
         # @private
@@ -32,7 +31,7 @@ module Google
 
           ##
           # @private Implementation attributes.
-          attr_reader :callback_thread_pool, :push_thread_pool
+          attr_reader :callback_thread_pool
 
           ##
           # Subscriber attributes.
@@ -48,18 +47,16 @@ module Google
             @paused  = nil
             @pause_cond = new_cond
 
-            @inventory = Inventory.new self, subscriber.stream_inventory
+            @inventory = Inventory.new self, @subscriber.stream_inventory
             @callback_thread_pool = Concurrent::FixedThreadPool.new \
-              subscriber.callback_threads
-            @push_thread_pool = Concurrent::FixedThreadPool.new \
-              subscriber.push_threads
+              @subscriber.callback_threads
 
             @stream_keepalive_task = Concurrent::TimerTask.new(
               execution_interval: 30
             ) do
               # push empty request every 30 seconds to keep stream alive
               unless inventory.empty?
-                push Google::Pubsub::V1::StreamingPullRequest.new
+                push Google::Cloud::PubSub::V1::StreamingPullRequest.new
               end
             end.execute
 
@@ -96,12 +93,6 @@ module Google
 
               # Once all the callbacks are stopped, we can stop the inventory.
               @inventory.stop
-
-              # Stop the publisher and send the final batch of changes.
-              @async_pusher.stop if @async_pusher # will push current batch
-
-              # Stop the push thread pool now that the pusher is stopped.
-              @push_thread_pool.shutdown
             end
 
             self
@@ -116,13 +107,6 @@ module Google
           end
 
           def wait!
-            synchronize do
-              # # Wait for the push thread pool to finish pushing all remaining
-              # changes. Do not wait indefinitely.
-              @push_thread_pool.wait_for_termination 60
-              @push_thread_pool.kill if @push_thread_pool.shuttingdown?
-            end
-
             self
           end
 
@@ -133,9 +117,8 @@ module Google
             return true if ack_ids.empty?
 
             synchronize do
-              @async_pusher ||= AsyncUnaryPusher.new(self).start
-              @async_pusher.acknowledge ack_ids
               @inventory.remove ack_ids
+              @subscriber.buffer.acknowledge ack_ids
               unpause_streaming!
             end
 
@@ -149,19 +132,13 @@ module Google
             return true if mod_ack_ids.empty?
 
             synchronize do
-              @async_pusher ||= AsyncUnaryPusher.new(self).start
-              @async_pusher.delay deadline, mod_ack_ids
               @inventory.remove mod_ack_ids
+              @subscriber.buffer.modify_ack_deadline deadline, mod_ack_ids
               unpause_streaming!
             end
 
             true
           end
-          alias delay modify_ack_deadline
-
-          def async_pusher
-            synchronize { @async_pusher }
-          end
 
           def push request
             synchronize { @request_queue.push request }
@@ -173,12 +150,13 @@ module Google
 
           ##
           # @private
-          def delay_inventory!
+          def renew_lease!
             synchronize do
               return true if @inventory.empty?
 
-              @async_pusher ||= AsyncUnaryPusher.new(self).start
-              @async_pusher.delay subscriber.deadline, @inventory.ack_ids
+              @subscriber.buffer.renew_lease @subscriber.deadline,
+                                             @inventory.ack_ids
+              unpause_streaming!
             end
 
             true
@@ -214,7 +192,7 @@ module Google
             @request_queue = EnumeratorQueue.new self
             @request_queue.push initial_input_request
             old_queue.each { |obj| @request_queue.push obj }
-            enum = subscriber.service.streaming_pull @request_queue.each
+            enum = @subscriber.service.streaming_pull @request_queue.each
 
             @stopped = nil
             @paused  = nil
@@ -239,8 +217,8 @@ module Google
 
                 synchronize do
                   # Create receipt of received messages reception
-                  @async_pusher ||= AsyncUnaryPusher.new(self).start
-                  @async_pusher.delay subscriber.deadline, received_ack_ids
+                  @subscriber.buffer.modify_ack_deadline @subscriber.deadline,
+                                                         received_ack_ids
 
                   # Add received messages to inventory
                   @inventory.add received_ack_ids
@@ -276,7 +254,7 @@ module Google
             retry
           rescue StandardError => e
             synchronize do
-              subscriber.error! e
+              @subscriber.error! e
               start_streaming! unless @stopped
             end
 
@@ -290,9 +268,9 @@ module Google
 
             Concurrent::Future.new(executor: callback_thread_pool) do
               begin
-                subscriber.callback.call rec_msg
+                @subscriber.callback.call rec_msg
               rescue StandardError => callback_error
-                subscriber.error! callback_error
+                @subscriber.error! callback_error
               end
             end.execute
           end
@@ -339,12 +317,12 @@ module Google
           end
 
           def initial_input_request
-            Google::Pubsub::V1::StreamingPullRequest.new.tap do |req|
-              req.subscription = subscriber.subscription_name
-              req.stream_ack_deadline_seconds = subscriber.deadline
+            Google::Cloud::PubSub::V1::StreamingPullRequest.new.tap do |req|
+              req.subscription = @subscriber.subscription_name
+              req.stream_ack_deadline_seconds = @subscriber.deadline
               req.modify_deadline_ack_ids += @inventory.ack_ids
               req.modify_deadline_seconds += \
-                @inventory.ack_ids.map { subscriber.deadline }
+                @inventory.ack_ids.map { @subscriber.deadline }
             end
           end
 
@@ -368,5 +346,7 @@ module Google
         end
       end
     end
+
+    Pubsub = PubSub unless const_defined? :Pubsub
   end
 end