google-gax 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7271bd48161698b84de9f66e337c3742e44b765f75fa1344c2e59b3608359e65
-  data.tar.gz: d2483f6d0f41e82f6655a1d5893712785721b73b7c675772752f457c9de0986e
+  metadata.gz: a7f8010fa4f0d2dfc3ace5ee432ffa2f583e929d7eda782683f610405e92b74a
+  data.tar.gz: a37e9831369c63beb27229466d88977b08641bdc1d3fcafece667c30f852bfdb
 SHA512:
-  metadata.gz: 8b92de0ba1398fd9d71a7cdd66aa000975677996fefcfdcf4828d12c6fff7194c0b93da9178eaf26d51d924f77dc3b493ad3bffba5011d1e8ea7bfb670d92311
-  data.tar.gz: cf0103edeab0f7e8244b2e008d72974bb7562236281d6eed0ce2466740f48a56a433d934286d9205d89d84382003ace8f55527250cba09b4868b6b57b80b74e1
+  metadata.gz: f9592566de488a67eabb12c5c7d9552313708342fc458ddf153d342ff271166906e05c592038525ccb6df4ca5a7aec86d51c653908d2733834588bafe7f50390
+  data.tar.gz: 44cbb8ffbfb3ef7b47b1d1eee2cefddee2f4fa20d03fc4b4cb0d19d127a1156dfa379250aab52bb546c327c657d1d3c5fc625eb8cd5118cba819bf9350cf51d4

data/lib/google/gax/settings.rb

@@ -511,7 +511,9 @@ module Google
         bundle_descriptor = bundle_descriptors[snake_name]
 
         defaults[snake_name] = CallSettings.new(
-          timeout: timeout,
+          timeout: calc_method_timeout(
+            timeout, method_config, overriding_method
+          ),
           retry_options: merge_retry_options(
             construct_retry(method_config,
                             service_config['retry_codes'],
@@ -533,11 +535,20 @@ module Google
       defaults
     end
 
+    # @private Determine timeout in seconds for the current method.
+    def calc_method_timeout(timeout, method_config, overriding_method)
+      timeout_override = method_config['timeout_millis']
+      if overriding_method && overriding_method.key?('timeout_millis')
+        timeout_override = overriding_method['timeout_millis']
+      end
+      timeout_override ? timeout_override / 1000 : timeout
+    end
+
     module_function :construct_settings, :construct_bundling,
                     :construct_retry, :upper_camel_to_lower_underscore,
-                    :merge_retry_options
+                    :merge_retry_options, :calc_method_timeout
     private_class_method :construct_bundling, :construct_retry,
                          :upper_camel_to_lower_underscore,
-                         :merge_retry_options
+                         :merge_retry_options, :calc_method_timeout
   end
 end

data/lib/google/gax/version.rb

@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.7.1'.freeze
   end
 end

data/spec/google/gax/settings_spec.rb

@@ -63,6 +63,9 @@ A_CONFIG = {
         'SomeHTTPSPageStreamingMethod' => {
           'retry_codes_name' => 'bar_retry',
           'retry_params_name' => 'default'
+        },
+        'TimeoutMethod' => {
+          'timeout_millis' => 10_000
         }
       }
     }
@@ -119,6 +122,9 @@ describe Google::Gax do
     )
     expect(settings.metadata).to match('key' => 'value')
     expect(settings.errors).to match_array([StandardError])
+
+    settings = defaults['timeout_method']
+    expect(settings.timeout).to be(10)
   end
 
   it 'overrides settings' do
@@ -129,6 +135,9 @@ describe Google::Gax do
             'SomeHTTPSPageStreamingMethod' => nil,
             'BundlingMethod' => {
               'bundling' => nil
+            },
+            'TimeoutMethod' => {
+              'timeout_millis' => nil
             }
           }
         }
@@ -149,6 +158,9 @@ describe Google::Gax do
     expect(settings.timeout).to be(30)
     expect(settings.page_descriptor).to be_a(Google::Gax::PageDescriptor)
     expect(settings.retry_options).to be_nil
+
+    settings = defaults['timeout_method']
+    expect(settings.timeout).to be(30)
   end
 
   it 'overrides settings more precisely' do
@@ -174,6 +186,9 @@ describe Google::Gax do
             'BundlingMethod' => {
               'retry_params_name' => 'default',
               'retry_codes_name' => 'baz_retry'
+            },
+            'TimeoutMethod' => {
+              'timeout_millis' => 20_000
             }
           }
         }
@@ -205,5 +220,8 @@ describe Google::Gax do
     expect(settings.retry_options.retry_codes).to match_array(
       [RETRY_DICT['code_c']]
     )
+
+    settings = defaults['timeout_method']
+    expect(settings.timeout).to be(20)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
@@ -222,7 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Aids the development of APIs for clients and servers based on GRPC and Google