fluent-plugin-google-cloud 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66acba1fe70f426b7ee4aa89bb1451404971f76a0af963c639b239f67db280f3
-  data.tar.gz: 391bc3714af4c0a474bb630458e9a073f4c3b4298bd7818e90c83d32c7c82cf9
+  metadata.gz: 7deed85b438bb17342217bdf9b4c849577217a70702005b8912f07e854e2b62f
+  data.tar.gz: 37f6366b74c5f59d1a5ded992cb16d79eeb16ed61e7f99d50b28d68527e488f5
 SHA512:
-  metadata.gz: 3adaecad447e1cf9c0665c11468578e7f0808ab76044b491b2314972bcf60fe56afe94e7f442d4d92db93c206e77d80bd9ef05841491da1d76bbd49c951d2830
-  data.tar.gz: a34643f3e4693041280192de7586f363d14f204dc88964fb25b3022e96a4e25e064072672286720f02e5685db001088ca9549c534c9049ec5be689735a53ab0e
+  metadata.gz: 9ec2439d5df4db5196e11680d2d28da15a7602e234272536622bc24389c69c46361a07694b76dd77c2a7fb285c2bdfaf18153b9c0b692e99bc2c931d498042ba
+  data.tar.gz: 0be1859cd6518819843caf5ab391e3e406f13a60d7c91672bcad79ecbd9242f45875bd1199a47758a6bfed8a957687c9d977771a07e0afe389ec7533bac55672

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.7.14)
+    fluent-plugin-google-cloud (0.7.15)
       fluentd (= 1.4.2)
       google-api-client (= 0.28.4)
       google-cloud-logging (= 1.6.0)
@@ -55,7 +55,7 @@ GEM
       google-gax (~> 1.3)
       googleapis-common-protos-types (>= 1.0.2)
       stackdriver-core (~> 1.3)
-    google-gax (1.6.3)
+    google-gax (1.7.0)
       google-protobuf (~> 3.2)
       googleapis-common-protos (>= 1.3.5, < 2.0)
       googleauth (>= 0.6.2, < 0.10.0)
@@ -100,7 +100,7 @@ GEM
     powerpack (0.1.2)
     prometheus-client (0.7.1)
       quantile (~> 0.2.0)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
     quantile (0.2.1)
     rainbow (2.2.2)
       rake
@@ -135,7 +135,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2019.1)
+    tzinfo-data (1.2019.2)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     unicode-display_width (1.6.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.7.14'
+  gem.version       = '0.7.15'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -40,12 +40,25 @@ module Google
   end
 end
 
-# Patch the gcloud command used by googleauth to avoid spamming stderr.
 module Google
   module Auth
+    # Disable gcloud lookup in googleauth to avoid picking up its project id.
     module CredentialsLoader
-      GCLOUD_CONFIG_COMMAND =
-        'config config-helper --format json --verbosity none'.freeze
+      # Set $VERBOSE to nil to mute the "already initialized constant" warnings.
+      warn_level = $VERBOSE
+      begin
+        $VERBOSE = nil
+        # These constants are used to invoke gcloud on Linux and Windows,
+        # respectively. Ideally, we would have overridden
+        # CredentialsLoader.load_gcloud_project_id, but we cannot catch it
+        # before it's invoked via "require 'googleauth'". So we override the
+        # constants instead.
+        GCLOUD_POSIX_COMMAND = '/bin/true'.freeze
+        GCLOUD_WINDOWS_COMMAND = 'cd .'.freeze
+        GCLOUD_CONFIG_COMMAND = ''.freeze
+      ensure
+        $VERBOSE = warn_level
+      end
     end
   end
 end
@@ -1236,8 +1249,10 @@ module Fluent
 
       {}
     rescue StandardError => e
-      @log.error "Failed to set monitored resource labels for #{type}: ",
-                 error: e
+      if [Platform::GCE, Platform::EC2].include?(@platform)
+        @log.error "Failed to set monitored resource labels for #{type}: ",
+                   error: e
+      end
       {}
     end
 
@@ -1411,12 +1426,12 @@ module Fluent
           resource.type = 'container' if resource.type == 'gke_container'
           return resource
         end
+        @log.debug('Failed to retrieve monitored resource from Metadata' \
+                   " Agent with local_resource_id #{local_resource_id}.")
       end
       # Fall back to constructing monitored resource locally.
       # TODO(qingling128): This entire else clause is temporary until we
       # implement buffering and caching.
-      @log.debug('Failed to retrieve monitored resource from Metadata' \
-                 " Agent with local_resource_id #{local_resource_id}.")
       construct_k8s_resource_locally(local_resource_id)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd