fix grpc timeouts

Author: matthewgoslett

Dockerfile

@@ -29,7 +29,7 @@ RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
 # Install Composer Application Dependencies
 COPY composer.json /opt/php-pubsub/
 RUN composer install --no-autoloader --no-scripts --no-interaction \
-    && composer require google/proto-client-php ^0.6 \
+    && composer require google/proto-client-php ^0.10.0 \
     && composer require google/gax
 
 COPY src /opt/php-pubsub/src

README.md

@@ -31,7 +31,7 @@ The library will automatically choose gRPC over REST if all dependencies are ins
 pecl install grpc
 
 composer require google/gax
-composer require google/proto-client-php ^0.6
+composer require google/proto-client-php ^0.10.0
 ```
 
 ## Usage

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.1 - ?
+
+* Fix to gRPC timeouts
+
 ## 3.0.0 - 2017-01-03
 
 * Bump up google/cloud requirement to ^0.11.0|^0.12.0|^0.13.0|^0.20.0

src/GoogleCloudPubSubAdapter.php

@@ -136,7 +136,11 @@ public function subscribe($channel, callable $handler)
         $isSubscriptionLoopActive = true;
 
         while ($isSubscriptionLoopActive) {
-            $messages = $subscription->pull();
+            $messages = $subscription->pull([
+                'grpcOptions' => [
+                    'timeoutMillis' => null,
+                ],
+            ]);
 
             foreach ($messages as $message) {
                 /** @var Message $message */

tests/GoogleCloudPubSubAdapterTest.php

@@ -140,16 +140,19 @@ public function testSubscribeWhenSubscriptionMustBeCreated()
             ->andReturn(false);
         $subscription->shouldReceive('create')
             ->once();
-        $subscription->shouldReceive('pull')
-            ->once()
-            ->andReturn($messageBatch1);
+
         $subscription->shouldReceive('acknowledge')
             ->with($message1)
             ->once();
         $subscription->shouldReceive('acknowledge')
             ->with($message2)
             ->once();
         $subscription->shouldReceive('pull')
+            ->with([
+                'grpcOptions' => [
+                    'timeoutMillis' => null,
+                ],
+            ])
             ->once()
             ->andReturn($messageBatch2);
         $subscription->shouldReceive('acknowledge')
@@ -205,6 +208,11 @@ public function testSubscribeWhenSubscriptionExists()
             ->andReturn(true);
         $subscription->shouldNotHaveReceived('create');
         $subscription->shouldReceive('pull')
+            ->with([
+                'grpcOptions' => [
+                    'timeoutMillis' => null,
+                ],
+            ])
             ->once()
             ->andReturn($messageBatch1);
         $subscription->shouldReceive('acknowledge')
@@ -214,6 +222,11 @@ public function testSubscribeWhenSubscriptionExists()
             ->with($message2)
             ->once();
         $subscription->shouldReceive('pull')
+            ->with([
+                'grpcOptions' => [
+                    'timeoutMillis' => null,
+                ],
+            ])
             ->once()
             ->andReturn($messageBatch2);
         $subscription->shouldReceive('acknowledge')
@@ -267,6 +280,11 @@ public function testSubscribeWhenAutoTopicCreationIsDisabled()
         $subscription->shouldNotHaveReceived('exists');
         $subscription->shouldNotHaveReceived('create');
         $subscription->shouldReceive('pull')
+            ->with([
+                'grpcOptions' => [
+                    'timeoutMillis' => null,
+                ],
+            ])
             ->once()
             ->andReturn($messageBatch1);
         $subscription->shouldReceive('acknowledge')
@@ -276,6 +294,11 @@ public function testSubscribeWhenAutoTopicCreationIsDisabled()
             ->with($message2)
             ->once();
         $subscription->shouldReceive('pull')
+            ->with([
+                'grpcOptions' => [
+                    'timeoutMillis' => null,
+                ],
+            ])
             ->once()
             ->andReturn($messageBatch2);
         $subscription->shouldReceive('acknowledge')