fluent-plugin-google-cloud 0.7.20 → 0.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5a49758ff48df5fb9499fd2969929a06976101ba55744791f383566f5a6894
-  data.tar.gz: 9c8e4b89ad96bdd53e2556c7e18a25c12903bd641d8d8e568453cb76e2b9bddf
+  metadata.gz: 5c02beaaa9eb340a7d8cc14d8306adbf706734056c1cf8bd5737e5a4dcf36db8
+  data.tar.gz: b3747ea4d2a10db6b9eb5b2a4b27ad6231e35d339d36a2571f02b803229b7aaf
 SHA512:
-  metadata.gz: 8425e10d33f31d5322783e0a74653c096f9d48f6c2ad988973506808d9c60af6d4dc007489dc473ad7be530e82879b8aa158a220049fb22b14179b75a4b8ca82
-  data.tar.gz: edc9190d392aa9d124842ffa0991a8de832c5621aadbde82bb3038fcc8c8288cd12f875bdc19ca9b68107f4f645810b1b46729a5b01f1c46e18cae4eabb1778f
+  metadata.gz: fc9e660a5b707978a7b910a7df0f815509c92a5e5477f7cd0d9697fdb52d785e4d8a75601c8defcd3f2d97b6a32acc61ee0e1b1f93741f8b8301cf9468bafe6e
+  data.tar.gz: 8dceed3247b00d18d60dd2a222a320d444000ebef37a563de037b41c36ee4a5ef912865ac098c7e1f47c80dc8d21885438bab4867ae87c4785f53375a769c8e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.7.20)
+    fluent-plugin-google-cloud (0.7.21)
       fluentd (= 1.6.3)
       google-api-client (= 0.30.8)
       google-cloud-logging (= 1.6.6)
@@ -24,7 +24,7 @@ GEM
     declarative (0.0.10)
     declarative-option (0.1.0)
     dig_rb (1.0.1)
-    faraday (0.16.2)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     fluentd (1.6.3)
       cool.io (>= 1.4.5, < 2.0.0)
@@ -120,7 +120,7 @@ GEM
     serverengine (2.1.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    signet (0.11.0)
+    signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -149,7 +149,7 @@ PLATFORMS
 DEPENDENCIES
   fluent-plugin-google-cloud!
   mocha (= 1.9.0)
-  prometheus-client (= 0.9.0)
+  prometheus-client (< 0.10)
   rake (= 10.5.0)
   rubocop (= 0.39.0)
   test-unit (= 3.3.3)

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.20'
+  gem.version       = '0.7.21'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')
@@ -29,7 +29,9 @@ eos
   gem.add_runtime_dependency 'json', '2.2.0'
 
   gem.add_development_dependency 'mocha', '1.9.0'
-  gem.add_development_dependency 'prometheus-client', '0.9.0'
+  # Keep this the same as in
+  # https://github.com/fluent/fluent-plugin-prometheus/blob/master/fluent-plugin-prometheus.gemspec
+  gem.add_development_dependency 'prometheus-client', '< 0.10'
   # TODO(qingling128): Upgrade rake to 11.0+ after the following issues are
   # fixed because rake (11.0+) requires ALL variables to be explicitly
   # initialized.

data/lib/fluent/plugin/monitoring.rb

@@ -13,9 +13,27 @@
 # limitations under the License.
 
 module Monitoring
+  # Base class for the counter.
+  class BaseCounter
+    def increment(_by: 1, _labels: {})
+      nil
+    end
+  end
+
+  # Prometheus implementation of counters.
+  class PrometheusCounter < BaseCounter
+    def initialize(prometheus_counter)
+      @counter = prometheus_counter
+    end
+
+    def increment(by: 1, labels: {})
+      @counter.increment(labels, by)
+    end
+  end
+
   # Base class for the monitoring registry.
   class BaseMonitoringRegistry
-    def counter(_name, _desc)
+    def counter(_name, _labels, _docstring)
       nil
     end
   end
@@ -33,10 +51,10 @@ module Monitoring
     end
 
     # Exception-driven behavior to avoid synchronization errors.
-    def counter(name, desc)
-      return @registry.counter(name, desc)
+    def counter(name, labels, docstring)
+      return PrometheusCounter.new(@registry.counter(name, docstring, labels))
     rescue Prometheus::Client::Registry::AlreadyRegisteredError
-      return @registry.get(name)
+      return PrometheusCounter.new(@registry.get(name))
     end
   end
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -508,22 +508,27 @@ module Fluent
         registry = Monitoring::MonitoringRegistryFactory.create @monitoring_type
         @successful_requests_count = registry.counter(
           :stackdriver_successful_requests_count,
+          [:grpc, :code],
           'A number of successful requests to the Stackdriver Logging API')
         @failed_requests_count = registry.counter(
           :stackdriver_failed_requests_count,
-          'A number of failed requests to the Stackdriver Logging API,'\
-            ' broken down by the error code')
+          [:grpc, :code],
+          'A number of failed requests to the Stackdriver Logging '\
+          'API, broken down by the error code')
         @ingested_entries_count = registry.counter(
           :stackdriver_ingested_entries_count,
+          [:grpc, :code],
           'A number of log entries ingested by Stackdriver Logging')
         @dropped_entries_count = registry.counter(
           :stackdriver_dropped_entries_count,
+          [:grpc, :code],
           'A number of log entries dropped by the Stackdriver output plugin')
         @retried_entries_count = registry.counter(
           :stackdriver_retried_entries_count,
-          'The number of log entries that failed to be ingested by the'\
-            ' Stackdriver output plugin due to a transient error and were'\
-            ' retried')
+          [:grpc, :code],
+          'The number of log entries that failed to be ingested by '\
+          'the Stackdriver output plugin due to a transient error '\
+          'and were retried')
         @ok_code = @use_grpc ? GRPC::Core::StatusCodes::OK : 200
       end
 
@@ -2363,36 +2368,40 @@ module Fluent
     # Increment the metric for the number of successful requests.
     def increment_successful_requests_count
       return unless @successful_requests_count
-      @successful_requests_count.increment(grpc: @use_grpc, code: @ok_code)
+      @successful_requests_count.increment(
+        labels: { grpc: @use_grpc, code: @ok_code })
     end
 
     # Increment the metric for the number of failed requests, labeled by
     # the provided status code.
     def increment_failed_requests_count(code)
       return unless @failed_requests_count
-      @failed_requests_count.increment(grpc: @use_grpc, code: code)
+      @failed_requests_count.increment(
+        labels: { grpc: @use_grpc, code: code })
     end
 
     # Increment the metric for the number of log entries, successfully
     # ingested by the Stackdriver Logging API.
     def increment_ingested_entries_count(count)
       return unless @ingested_entries_count
-      @ingested_entries_count.increment({ grpc: @use_grpc, code: @ok_code },
-                                        count)
+      @ingested_entries_count.increment(
+        labels: { grpc: @use_grpc, code: @ok_code }, by: count)
     end
 
     # Increment the metric for the number of log entries that were dropped
     # and not ingested by the Stackdriver Logging API.
     def increment_dropped_entries_count(count, code)
       return unless @dropped_entries_count
-      @dropped_entries_count.increment({ grpc: @use_grpc, code: code }, count)
+      @dropped_entries_count.increment(
+        labels: { grpc: @use_grpc, code: code }, by: count)
     end
 
     # Increment the metric for the number of log entries that were dropped
     # and not ingested by the Stackdriver Logging API.
     def increment_retried_entries_count(count, code)
       return unless @retried_entries_count
-      @retried_entries_count.increment({ grpc: @use_grpc, code: code }, count)
+      @retried_entries_count.increment(
+        labels: { grpc: @use_grpc, code: code }, by: count)
     end
   end
 end

data/test/plugin/test_driver.rb

@@ -16,6 +16,19 @@ require 'fluent/engine'
 require 'fluent/event'
 require 'fluent/test/input_test'
 
+module Fluent
+  module Test
+    # rubocop:disable Style/ClassVars
+    class BufferedOutputTestDriver < InputTestDriver
+      @@run_method = BufferedOutputTestDriver.instance_method(:run)
+      def run(num_waits = 0)
+        @@run_method.bind(self).call(num_waits)
+      end
+    end
+    # rubocop:enable Style/ClassVars
+  end
+end
+
 module Fluent
   module Test
     # Similar to the standard BufferedOutputTestDriver, but allows multiple tags
@@ -33,7 +46,7 @@ module Fluent
         self
       end
 
-      def run(num_waits = 10)
+      def run(num_waits = 0)
         result = nil
         super(num_waits) do
           chunk = @instance.buffer.generate_chunk(

data/test/plugin/test_out_google_cloud.rb

@@ -87,16 +87,12 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     d.run
     assert_prometheus_metric_value(
       :stackdriver_successful_requests_count, 1, grpc: false, code: 200)
-    assert_prometheus_metric_value(
-      :stackdriver_failed_requests_count, 0, grpc: false)
     assert_prometheus_metric_value(
       :stackdriver_ingested_entries_count, 1, grpc: false, code: 200)
     assert_prometheus_metric_value(
       :stackdriver_dropped_entries_count, 2, grpc: false, code: 3)
     assert_prometheus_metric_value(
       :stackdriver_dropped_entries_count, 1, grpc: false, code: 7)
-    assert_prometheus_metric_value(
-      :stackdriver_retried_entries_count, 0, grpc: false)
     assert_requested(:post, WRITE_LOG_ENTRIES_URI, times: 1)
   end
 
@@ -120,8 +116,6 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       :stackdriver_ingested_entries_count, 0, grpc: false, code: 200)
     assert_prometheus_metric_value(
       :stackdriver_dropped_entries_count, 1, grpc: false, code: 400)
-    assert_prometheus_metric_value(
-      :stackdriver_retried_entries_count, 0, grpc: false)
     assert_requested(:post, WRITE_LOG_ENTRIES_URI, times: 1)
   end
 

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -112,8 +112,6 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       assert_prometheus_metric_value(
         :stackdriver_dropped_entries_count, 1,
         grpc: true, code: GRPC::Core::StatusCodes::PERMISSION_DENIED)
-      assert_prometheus_metric_value(
-        :stackdriver_retried_entries_count, 0, grpc: true)
     end
   end
 
@@ -140,8 +138,6 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       assert_prometheus_metric_value(
         :stackdriver_dropped_entries_count, 1,
         grpc: true, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT)
-      assert_prometheus_metric_value(
-        :stackdriver_retried_entries_count, 0, grpc: true)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.21
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -140,16 +140,16 @@ dependencies:
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement