fluent-plugin-google-cloud 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89427f2aab235046a1d959d81d19a26fceeb0d4c54dae2df843d5fe70173066f
-  data.tar.gz: 6f79fae5f86701f8f5a1bf2bbb9cb591d8015bebe4e5265802fd082809d32ba7
+  metadata.gz: 290b02a112003353bd252ef93c3396da3365ccaaf526eba52714e7fce67237dc
+  data.tar.gz: b822671a321a196e99de4b4ca2d544d0d80b896e44c44329847ffe8b028f98e9
 SHA512:
-  metadata.gz: aa43b2f4f2e41bb8f8dcb47d1e02681c2e186227c8f88fcd3796187bf20e5f7896b59d1251123629172e6e2c5d11e3a390ff91adf92be54eaec19684176a6df7
-  data.tar.gz: beb857a9ef37a97ff7124bc35ac3de2108e0fa203a70165f36db09d49253285120a41c81028af5379480c379e66753e69f4f734fc7d945e757bf9f265df2e858
+  metadata.gz: 5ee271add74cdfd193f5ab944a9ee3d0e7e6af460d3ce7e52b2dbdccea087cfc675091fac1096beed80d798dbacde92e1aeb1c2bb778d33ccbf59f444be04c90
+  data.tar.gz: e30da388572c84243d5616701e4fb6ae8b282289c36eae355a3c8141afb72fe017bae2974c9c91504ef4cf42ef52d50457b400d8840ee79344281cc4fd9d5e95

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.7.25)
+    fluent-plugin-google-cloud (0.7.26)
       fluentd (= 1.6.3)
       google-api-client (= 0.30.8)
       google-cloud-logging (= 1.6.6)
@@ -131,7 +131,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
-    serverengine (2.1.1)
+    serverengine (2.2.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     signet (0.12.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.25'
+  gem.version       = '0.7.26'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')

data/lib/fluent/plugin/monitoring.rb

@@ -15,8 +15,7 @@
 module Monitoring
   # Base class for the counter.
   class BaseCounter
-    def increment(_by: 1, _labels: {})
-      nil
+    def increment(*)
     end
   end
 
@@ -54,7 +53,7 @@ module Monitoring
     end
 
     def counter(_name, _labels, _docstring)
-      nil
+      BaseCounter.new
     end
 
     def export

data/lib/fluent/plugin/out_google_cloud.rb

@@ -254,6 +254,7 @@ module Fluent
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
 
+    # Follows semver.org format.
     PLUGIN_VERSION = begin
       # Extract plugin version from file path.
       match_data = __FILE__.match(
@@ -268,7 +269,9 @@ module Fluent
           proc { |spec,| __FILE__.include?(spec.full_gem_path) }) do |spec,|
             spec.version.to_s
           end
-        matching_version
+        # If no matching version was found, return a valid but obviously wrong
+        # value.
+        matching_version || '0.0.0-unknown'
       end
     end.freeze
 
@@ -481,6 +484,7 @@ module Fluent
       @retried_entries_count = nil
 
       @ok_code = nil
+      @uptime_update_time = Time.now.to_i
     end
 
     def configure(conf)
@@ -553,6 +557,12 @@ module Fluent
                     .create(@monitoring_type, @project_id, @resource)
         # Export metrics every 60 seconds.
         timer_execute(:export_metrics, 60) { @registry.export }
+        # Uptime should be a gauge, but the metric definition is a counter and
+        # we can't change it.
+        @uptime_metric = @registry.counter(
+          :uptime, [:version], 'Uptime of Logging agent')
+        update_uptime
+        timer_execute(:update_uptime, 1) { update_uptime }
         @successful_requests_count = @registry.counter(
           :stackdriver_successful_requests_count,
           [:grpc, :code],
@@ -773,6 +783,18 @@ module Fluent
       true
     end
 
+    def self.version_string
+      @version_string ||= "google-fluentd/#{PLUGIN_VERSION}"
+    end
+
+    def update_uptime
+      now = Time.now.to_i
+      @uptime_metric.increment(
+        by: now - @uptime_update_time,
+        labels: { version: Fluent::GoogleCloudOutput.version_string })
+      @uptime_update_time = now
+    end
+
     private
 
     def write_html_response(data, conn, code, response)

data/test/plugin/base_test.rb

@@ -2046,6 +2046,30 @@ module BaseTest
     end
   end
 
+  def test_uptime_metric
+    setup_gce_metadata_stubs
+    [
+      [ENABLE_PROMETHEUS_CONFIG, method(:assert_prometheus_metric_value)],
+      [ENABLE_OPENCENSUS_CONFIG, method(:assert_opencensus_metric_value)]
+    ].each do |config, assert_metric_value|
+      clear_metrics
+      start_time = Time.now.to_i
+      d = create_driver(config)
+      d.run
+      begin
+        # Retry to protect from time races.
+        retries ||= 0
+        expected = Time.now.to_i - start_time
+        d.instance.update_uptime
+        assert_metric_value.call(
+          :uptime, expected, version: Fluent::GoogleCloudOutput.version_string)
+      rescue Test::Unit::AssertionFailedError
+        retry if (retries += 1) < 3
+      end
+      assert_not_equal 3, retries
+    end
+  end
+
   private
 
   def stub_metadata_request(metadata_path, response_body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd