fluent-plugin-google-cloud 0.6.11.pre.memory.4 → 0.6.11.pre.memory.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd955541152f073cb50a4a498a52576711b93ef6
-  data.tar.gz: 33428753b4acf5789e06255b6ede9c82da202027
+  metadata.gz: 903a5c262eaacad2451507c794d26267229ccf8c
+  data.tar.gz: 0ba356652e9471fddd2c766e68268d0919ec5967
 SHA512:
-  metadata.gz: df9e9e4f685d96fb1b30f082e981c00487239490fb84acfb7530295e01b877e960c384fc3ac2762e0fa57354c5c756e337d0641379930ab68492b8c30eea0b4f
-  data.tar.gz: 25a06238933c029af630fd546707b263da38763233b668e8fb2568eab448e727865ca30d2bfd23653f1af9b250f95e9bf54af6e703b58142e5084f914806f131
+  metadata.gz: c8999f8a324fb4f44c03dfc0a27a8ef7f98fd8397a59983eef303e6741ede5e281bac8e19ab635ed977e883c2e7c9f3d6d4f6b94e61c08cd12727fd4b4c14543
+  data.tar.gz: a968571c3db6792d3984842b4ef8eb04768967bf8ace7146ed04eec95a6eae3f91a2fccc28206dfa289f97d47bb6eebcbcd2476b6439d3087cc2eddc4f37cafb

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.11.pre.memory.4)
+    fluent-plugin-google-cloud (0.6.11.pre.memory.5)
       fluentd (~> 0.10)
       google-api-client (~> 0.14)
-      google-cloud-logging (= 1.2.3)
+      google-cloud-logging (~> 1.2.3)
       googleapis-common-protos (~> 1.3)
       googleauth (~> 0.5)
-      grpc (= 1.2.5)
+      grpc (~> 1.2.5)
       json (~> 1.8)
 
 GEM

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.11.pre.memory.4'
+  gem.version       = '0.6.11.pre.memory.5'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -22,9 +22,9 @@ eos
   gem.add_runtime_dependency 'fluentd', '~> 0.10'
   gem.add_runtime_dependency 'googleapis-common-protos', '~> 1.3'
   gem.add_runtime_dependency 'google-api-client', '~> 0.14'
-  gem.add_runtime_dependency 'google-cloud-logging', '1.2.3'
+  gem.add_runtime_dependency 'google-cloud-logging', '~> 1.2.3'
   gem.add_runtime_dependency 'googleauth', '~> 0.5'
-  gem.add_runtime_dependency 'grpc', '1.2.5'
+  gem.add_runtime_dependency 'grpc', '~> 1.2.5'
   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.11.pre.memory.4'.freeze
+    PLUGIN_VERSION = '0.6.11.pre.memory.5'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -598,7 +598,6 @@ module Fluent
           rescue Google::Gax::GaxError => gax_error
             # GRPC::BadStatus is wrapped in error.cause.
             error = gax_error.cause
-            increment_failed_requests_count(error.code)
 
             # See the mapping between HTTP status and gRPC status code at:
             # https://github.com/grpc/grpc/blob/master/src/core/lib/transport/status_conversion.cc
@@ -644,12 +643,14 @@ module Fluent
                 # This decision is made to avoid retrying forever due to client
                 # errors.
                 GRPC::Unknown
+              increment_failed_requests_count(error.code)
               increment_dropped_entries_count(entries_count, error.code)
               @log.warn "Dropping #{entries_count} log message(s)",
                         error: error.to_s, error_code: error.code.to_s
 
             else
               # Assume it is a problem with the request itself and don't retry.
+              increment_failed_requests_count(error.code)
               increment_dropped_entries_count(entries_count, error.code)
               @log.error "Unknown response code #{error.code} from the "\
                          "server, dropping #{entries_count} log message(s)",
@@ -666,16 +667,10 @@ module Fluent
                 partial_success: @partial_success,
                 entries: entries)
             entries_count = entries.length
-
-            begin
-              client.write_entry_log_entries(
-                write_request,
-                options: { api_format_version: '2' }
-              )
-            rescue Google::Apis::Error => error
-              increment_failed_requests_count(error.status_code)
-              raise error
-            end
+            client.write_entry_log_entries(
+              write_request,
+              options: { api_format_version: '2' }
+            )
 
             increment_successful_requests_count
             increment_ingested_entries_count(entries_count)
@@ -698,6 +693,7 @@ module Fluent
             # 401 authorization error.
             # These are usually solved via a `gcloud auth` call, or by modifying
             # the permissions on the Google Cloud project.
+            increment_failed_requests_count(error.status_code)
             increment_dropped_entries_count(entries_count, error.status_code)
             @log.warn "Dropping #{entries_count} log message(s)",
                       error_class: error.class.to_s, error: error.to_s
@@ -707,6 +703,7 @@ module Fluent
             # request itself and should not be retried.
             error_details_map = construct_error_details_map(error)
             if error_details_map.empty?
+              increment_failed_requests_count(error.status_code)
               increment_dropped_entries_count(entries_count, error.status_code)
               @log.warn "Dropping #{entries_count} log message(s)",
                         error_class: error.class.to_s, error: error.to_s
@@ -719,6 +716,8 @@ module Fluent
                           error_code: "google.rpc.Code[#{error_code}]",
                           error: error_message
               end
+              # Consider partially successful requests successful.
+              increment_successful_requests_count
               increment_ingested_entries_count(entries_count)
             end
           end

data/test/plugin/test_out_google_cloud.rb

@@ -66,9 +66,9 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     end
     d.run
     assert_prometheus_metric_value(
-      :stackdriver_successful_requests_count, 0, grpc: false, code: 200)
+      :stackdriver_successful_requests_count, 1, grpc: false, code: 200)
     assert_prometheus_metric_value(
-      :stackdriver_failed_requests_count, 1, grpc: false, code: root_error_code)
+      :stackdriver_failed_requests_count, 0, grpc: false)
     assert_prometheus_metric_value(
       :stackdriver_ingested_entries_count, 1, grpc: false, code: 200)
     assert_prometheus_metric_value(
@@ -115,7 +115,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       [401, 1, 1, [0, 1, 0, 1, 0]],
       # Single failed request that escalates without logs being dropped with
       # several entries.
-      [500, 1, 2, [0, 1, 0, 0, 2]]
+      [500, 1, 2, [0, 0, 0, 0, 2]]
     ].each do |code, request_count, entry_count, metric_values|
       setup_prometheus
       # TODO: Do this as part of setup_logging_stubs.

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -92,7 +92,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       [true, 16, 1, 1, [0, 1, 0, 1, 0]],
       # Single failed request that escalates without logs being dropped with
       # several entries.
-      [true, 13, 1, 2, [0, 1, 0, 0, 2]]
+      [true, 13, 1, 2, [0, 0, 0, 0, 2]]
     ].each do |should_fail, code, request_count, entry_count, metric_values|
       setup_prometheus
       (1..request_count).each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.11.pre.memory.4
+  version: 0.6.11.pre.memory.5
 platform: ruby
 authors:
 - Todd Derr
@@ -57,14 +57,14 @@ dependencies:
   name: google-cloud-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
@@ -85,14 +85,14 @@ dependencies:
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.5
 - !ruby/object:Gem::Dependency