fluent-plugin-google-cloud 0.11.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20fc807b129dacab24357096d9ebf4d79ebeedc8b136494517c6d6f73cb83f1
-  data.tar.gz: 543297fac8896b6faa6ba1a1d2f40fae6298a420789942d23d6d052959d4570c
+  metadata.gz: 83b0e32d32c83f55717d184e69a8bb52a3f838d56a617a0f2d3ec54e7ec97f96
+  data.tar.gz: 3afd7c0508415c1c7a97021a793590917c50f2ba0a9e78feb9c5f1a881742cdf
 SHA512:
-  metadata.gz: 43be2b63c2c3514beca5303a227d473ffc7b1e999fca4b8f960071c1b952452706d61d4ce2fe88adf0ff27b7f5996efc632514db54da40bb8bc4c065069b5b8e
-  data.tar.gz: e2ec675fa37b390c90ec86e10f2eb9b402b7a0376fecb670bb451edbf69cc8ea58d0ad79457f33ffd7abda3bb170fc24afaea72c25b87cb24721d13b794f5792
+  metadata.gz: 178cbf9ef9050ccd19beaaf9c6849c259c5e5f9e64a7ad6e6068fb24e1a6d1d73e10531124ce69982b4cd8011a3e4ca2abbb711e238615c1757887ba80b771dd
+  data.tar.gz: 2cd2b195cce5ca9028ed1f30cfb968b5e9b00b004bce720c7d5939f09105019e87c18b409d8a1a3b7323ee1fbd10b0870b9f9187abaeabd3caaa0a7971bdc9bf

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.11.0)
-      fluentd (= 1.11.2)
+    fluent-plugin-google-cloud (0.12.2)
+      fluentd (= 1.13.3)
       google-api-client (= 0.30.8)
       google-cloud-logging (= 1.6.6)
       google-protobuf (= 3.15.8)
@@ -11,7 +11,7 @@ PATH
       grpc (= 1.31.1)
       json (= 2.2.0)
       opencensus (= 0.5.0)
-      opencensus-stackdriver (= 0.3.2)
+      opencensus-stackdriver (= 0.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -33,15 +33,17 @@ GEM
     docile (1.4.0)
     faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    fluentd (1.11.2)
+    fluentd (1.13.3)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
+      serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     gapic-common (0.3.4)
       google-protobuf (~> 3.12, >= 3.12.2)
@@ -62,32 +64,23 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
+    google-cloud-errors (1.2.0)
     google-cloud-logging (1.6.6)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.2)
       google-gax (~> 1.7)
       googleapis-common-protos-types (>= 1.0.2)
       stackdriver-core (~> 1.3)
-    google-cloud-monitoring (0.38.0)
-      google-gax (~> 1.8)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-    google-cloud-trace (0.41.3)
-      concurrent-ruby (~> 1.1)
-      google-cloud-core (~> 1.5)
-      google-cloud-trace-v1 (~> 0.0)
-      google-cloud-trace-v2 (~> 0.0)
-      stackdriver-core (~> 1.3)
-    google-cloud-trace-v1 (0.3.0)
+    google-cloud-monitoring-v3 (0.3.0)
       gapic-common (~> 0.3)
       google-cloud-errors (~> 1.0)
     google-cloud-trace-v2 (0.3.0)
       gapic-common (~> 0.3)
       google-cloud-errors (~> 1.0)
-    google-gax (1.8.1)
+    google-gax (1.8.2)
       google-protobuf (~> 3.9)
       googleapis-common-protos (>= 1.3.9, < 2.0)
+      googleapis-common-protos-types (>= 1.0.4, < 2.0)
       googleauth (~> 0.9)
       grpc (~> 1.24)
       rly (~> 0.2.3)
@@ -96,7 +89,7 @@ GEM
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (>= 1.0.5, < 2.0)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.1.0)
+    googleapis-common-protos-types (1.3.0)
       google-protobuf (~> 3.14)
     googleauth (0.9.0)
       faraday (~> 0.12)
@@ -109,28 +102,29 @@ GEM
       google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.0.1)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.7.0)
     httpclient (2.8.3)
     json (2.2.0)
-    jwt (2.2.3)
+    jwt (2.3.0)
     memoist (0.16.2)
     metaclass (0.0.4)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     opencensus (0.5.0)
-    opencensus-stackdriver (0.3.2)
+    opencensus-stackdriver (0.4.1)
       concurrent-ruby (~> 1.0)
-      google-cloud-monitoring (~> 0.32)
-      google-cloud-trace (~> 0.35)
+      google-cloud-env (~> 1.3)
+      google-cloud-monitoring-v3 (~> 0.1)
+      google-cloud-trace-v2 (~> 0.1)
       opencensus (~> 0.5)
-    os (1.1.1)
+    os (1.1.4)
     parser (2.7.2.0)
       ast (~> 2.4.1)
-    power_assert (2.0.0)
+    power_assert (2.0.1)
     powerpack (0.1.3)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
@@ -156,8 +150,8 @@ GEM
     serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    signet (0.15.0)
-      addressable (~> 2.3)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
@@ -177,17 +171,18 @@ GEM
     thor (1.1.0)
     tins (1.29.1)
       sync
-    trailblazer-option (0.1.1)
+    trailblazer-option (0.1.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     webmock (3.6.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -204,4 +199,4 @@ DEPENDENCIES
   webmock (= 3.6.2)
 
 BUNDLED WITH
-   2.2.23
+   2.2.28

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.11.0'
+  gem.version       = '0.12.2'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')
@@ -22,7 +22,7 @@ eos
   # Note: In order to update the Fluentd version, please update both here and
   # also the fluentd version in
   # https://github.com/GoogleCloudPlatform/google-fluentd/blob/master/config/software/fluentd.rb.
-  gem.add_runtime_dependency 'fluentd', '1.11.2'
+  gem.add_runtime_dependency 'fluentd', '1.13.3'
   gem.add_runtime_dependency 'googleapis-common-protos', '1.3.10'
   gem.add_runtime_dependency 'googleauth', '0.9.0'
   gem.add_runtime_dependency 'google-api-client', '0.30.8'
@@ -31,7 +31,7 @@ eos
   gem.add_runtime_dependency 'grpc', '1.31.1'
   gem.add_runtime_dependency 'json', '2.2.0'
   gem.add_runtime_dependency 'opencensus', '0.5.0'
-  gem.add_runtime_dependency 'opencensus-stackdriver', '0.3.2'
+  gem.add_runtime_dependency 'opencensus-stackdriver', '0.4.1'
 
   gem.add_development_dependency 'mocha', '1.9.0'
   # Keep this the same as in

data/lib/fluent/plugin/filter_analyze_config.rb

@@ -38,6 +38,8 @@ module Fluent
     helpers :timer
 
     module Constants
+      PREFIX = 'agent.googleapis.com/agent/internal/logging/config'.freeze
+
       # Built-in plugins that are ok to reference in metrics.
       KNOWN_PLUGINS = {
         'filter' => Set[
@@ -249,7 +251,12 @@ module Fluent
         @registry = Monitoring::MonitoringRegistryFactory.create(
           @monitoring_type, project_id, resource, @gcm_service_address)
         # Export metrics every 60 seconds.
-        timer_execute(:export_config_analysis_metrics, 60) { @registry.export }
+        timer_execute(:export_config_analysis_metrics, 60) do
+          if @registry.respond_to? :update_timestamps
+            @registry.update_timestamps(PREFIX)
+          end
+          @registry.export
+        end
 
         @log.info('analyze_config plugin: Registering counters.')
         enabled_plugins_counter = @registry.counter(
@@ -257,7 +264,7 @@ module Fluent
           [:plugin_name, :is_default_plugin,
            :has_default_config, :has_ruby_snippet],
           'Enabled plugins',
-          'agent.googleapis.com/agent/internal/logging/config',
+          PREFIX,
           'GAUGE')
         @log.info(
           'analyze_config plugin: registered enable_plugins counter. ' \
@@ -266,7 +273,7 @@ module Fluent
           :plugin_config,
           [:plugin_name, :param, :is_present, :has_default_config],
           'Configuration parameter usage for plugins relevant to Google Cloud.',
-          'agent.googleapis.com/agent/internal/logging/config',
+          PREFIX,
           'GAUGE')
         @log.info('analyze_config plugin: registered plugin_config counter. ' \
           "#{plugin_config_counter}")
@@ -274,7 +281,7 @@ module Fluent
           :config_bool_values,
           [:plugin_name, :param, :value],
           'Values for bool parameters in Google Cloud plugins',
-          'agent.googleapis.com/agent/internal/logging/config',
+          PREFIX,
           'GAUGE')
         @log.info('analyze_config plugin: registered config_bool_values ' \
           "counter. #{config_bool_values_counter}")

data/lib/fluent/plugin/monitoring.rb

@@ -161,6 +161,24 @@ module Monitoring
       raise e
     end
 
+    # Update timestamps for each existing AggregationData without altering tags
+    # or values.
+    # This is currently only used for config analysis metrics, because we want
+    # to repeatedly send the exact same metrics as created at start-up.
+    def update_timestamps(prefix)
+      new_time = Time.now.utc
+      recorder = @recorders[prefix]
+      recorder.views_data.each do |view_data|
+        view_data.data.each_value do |aggr_data|
+          # Apply this only to GAUGE metrics. This could fail if the metric uses
+          # Distribution or other fancier aggregators.
+          if aggr_data.is_a? OpenCensus::Stats::AggregationData::LastValue
+            aggr_data.add aggr_data.value, new_time
+          end
+        end
+      end
+    end
+
     def export
       @log.debug(
         "monitoring module: Exporting metrics for #{@exporters.keys}.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.2
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.3
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement