fluent-plugin-google-cloud 0.6.13.pre.memory.1 → 0.6.13.pre.memory.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26e153a8191c18cf52ed1efdc552d5323045683
-  data.tar.gz: 3111b02b15f0a930f7cbd0d28b5517ffbe56a0ab
+  metadata.gz: 26e55203b2c40d92dfa4087065c41b547291cdf0
+  data.tar.gz: dc3d1822611b4dfc35e00980449e525ab54e75e1
 SHA512:
-  metadata.gz: 4e569bbf17acbb4c997c3321bee3d7bac9cdbaa21c5e8b6d6f40bf996906ac3cc41f4ae7e7ae2f8085251369cefa5a0be4261d3529c294a305c7e0bb4aba2d1c
-  data.tar.gz: 28562ed528b840677aca44c5f5982740e0e936a1eb9bb15ed8ca35d36f821fbc0931e8888ffe53a99cc4c73e622b10dbda51b8146c8ec2f1ecec97b6b671d042
+  metadata.gz: 670621b542a34fe36eac6b2ca0dda0a59043116476a61068060c7622c4def2def173e7d11342483e4f1b4bcf192cab2e0f736745558160e700c6ee7575189c2a
+  data.tar.gz: 1b37a3134df21f2fa17685f93f1ba2f2b1bb6a260add960a26b6dc6cd764f1cc42fff2581ac2bcfb739bddc01bd168bf6d23cecce8a422b022a8e9b306f7436e

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.13.pre.memory.1)
+    fluent-plugin-google-cloud (0.6.13.pre.memory.2)
       fluentd (~> 0.10)
       google-api-client (~> 0.14)
       google-cloud-logging (~> 1.2.3)
       googleapis-common-protos (~> 1.3)
       googleauth (~> 0.5)
-      grpc (~> 1.8)
+      grpc (~> 1.8.3)
       json (~> 1.8)
 
 GEM
@@ -55,7 +55,7 @@ GEM
       googleauth (~> 0.5.1)
       grpc (~> 1.0)
       rly (~> 0.2.3)
-    google-protobuf (3.5.1)
+    google-protobuf (3.5.1.1)
     googleapis-common-protos (1.3.7)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ eos
   gem.homepage      =
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.6.13.pre.memory.1'
+  gem.version       = '0.6.13.pre.memory.2'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -24,7 +24,7 @@ eos
   gem.add_runtime_dependency 'google-api-client', '~> 0.14'
   gem.add_runtime_dependency 'google-cloud-logging', '~> 1.2.3'
   gem.add_runtime_dependency 'googleauth', '~> 0.5'
-  gem.add_runtime_dependency 'grpc', '~> 1.8'
+  gem.add_runtime_dependency 'grpc', '~> 1.8.3'
   gem.add_runtime_dependency 'json', '~> 1.8'
 
   gem.add_development_dependency 'mocha', '~> 1.1'

data/lib/fluent/plugin/out_google_cloud.rb

@@ -195,7 +195,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.13.pre.memory.1'.freeze
+    PLUGIN_VERSION = '0.6.13.pre.memory.2'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -1798,16 +1798,6 @@ module Fluent
     end
 
     def init_api_client
-      return if @use_grpc
-      # TODO: Use a non-default ClientOptions object.
-      Google::Apis::ClientOptions.default.application_name = PLUGIN_NAME
-      Google::Apis::ClientOptions.default.application_version = PLUGIN_VERSION
-      @client = Google::Apis::LoggingV2::LoggingService.new
-      @client.authorization = Google::Auth.get_application_default(
-        LOGGING_SCOPE)
-    end
-
-    def api_client
       if @use_grpc
         ssl_creds = GRPC::Core::ChannelCredentials.new
         authentication = Google::Auth.get_application_default
@@ -1817,15 +1807,26 @@ module Fluent
           channel: GRPC::Core::Channel.new(
             'logging.googleapis.com', nil, creds))
       else
-        unless @client.authorization.expired?
-          begin
-            @client.authorization.fetch_access_token!
-          rescue MultiJson::ParseError
-            # Workaround an issue in the API client; just re-raise a more
-            # descriptive error for the user (which will still cause a retry).
-            raise Google::APIClient::ClientError, 'Unable to fetch access ' \
-              'token (no scopes configured?)'
-          end
+        # TODO: Use a non-default ClientOptions object.
+        Google::Apis::ClientOptions.default.application_name = PLUGIN_NAME
+        Google::Apis::ClientOptions.default.application_version = PLUGIN_VERSION
+        @client = Google::Apis::LoggingV2::LoggingService.new
+        @client.authorization = Google::Auth.get_application_default(
+          LOGGING_SCOPE)
+      end
+    end
+
+    def api_client
+      # For gRPC side, the Channel will take care of tokens and their renewal
+      # (https://grpc.io/docs/guides/auth.html#authentication-api).
+      if !@use_grpc && @client.authorization.expired?
+        begin
+          @client.authorization.fetch_access_token!
+        rescue MultiJson::ParseError
+          # Workaround an issue in the API client; just re-raise a more
+          # descriptive error for the user (which will still cause a retry).
+          raise Google::APIClient::ClientError,
+                'Unable to fetch access token (no scopes configured?)'
         end
       end
       @client

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.13.pre.memory.1
+  version: 0.6.13.pre.memory.2
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement