fluent-plugin-google-cloud 0.7.23 → 0.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9750420a63d27c1e40553ca6f4a81cfc372e5ad88b72b838136e24deb3f15b1e
-  data.tar.gz: c8b06e1d2e0c47b59127393ad90e7c846956708b0137b86b568a697b91a58e9a
+  metadata.gz: 527f693c53835e46491da82100bf40d63c512ff8bbc1a5d087c9b3371ed11df8
+  data.tar.gz: 293ae1af2b793cbc199a112bffe3491f4ef7dbb1e99776ffe4cb3268db662186
 SHA512:
-  metadata.gz: 6fd32eccca522aa89331bbf553bcd1efd9d09d3f8f4e1f4632257a45f5f29007630eda81956c702c3ee4db32a804c8e51864d70a6f2a9c86b5b3c4c9f2eb60ca
-  data.tar.gz: 4f1b6d55766b0938d2c71f6f26bc76b9294448fc2d341be769a7f61dfc68d88940d2e85174a5d54d6db865f1b8d7d1e8d8226dffad5e113156b407e25d23a199
+  metadata.gz: 410f93cf504d5fb3aada4121cf4531ff9e8aa152ab71bdb6f6a35e9d42394bd5becd69352cdb21fcf6b08a86c94a23e8782dfaca016415e8b22a1b6e008080e7
+  data.tar.gz: a9665e0d2755ceb29cf1ea5a83e9f21a67384c4cf4d582cb4ef6db64d8931178325c6a94fa811c12e9c0e6b4d54d2a2cb7cd2334bf9e3b3f568a7a93a9d24a4e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.7.23)
+    fluent-plugin-google-cloud (0.7.24)
       fluentd (= 1.6.3)
       google-api-client (= 0.30.8)
       google-cloud-logging (= 1.6.6)
@@ -45,7 +45,7 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.10)
-    google-cloud-core (1.4.0)
+    google-cloud-core (1.4.1)
       google-cloud-env (~> 1.0)
     google-cloud-env (1.3.0)
       faraday (~> 0.11)

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.23'
+  gem.version       = '0.7.24'
   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

@@ -33,13 +33,15 @@ module Monitoring
 
   # OpenCensus implementation of counters.
   class OpenCensusCounter < BaseCounter
-    def initialize(recorder, measure)
+    def initialize(recorder, measure, translator)
       raise ArgumentError, 'measure must not be nil' if measure.nil?
       @recorder = recorder
       @measure = measure
+      @translator = translator
     end
 
     def increment(by: 1, labels: {})
+      labels = @translator.translate_labels(labels)
       tag_map = OpenCensus::Tags::TagMap.new(
         labels.map { |k, v| [k.to_s, v.to_s] }.to_h)
       @recorder.record(@measure.create_measurement(value: by, tags: tag_map))
@@ -74,8 +76,12 @@ module Monitoring
     end
 
     # Exception-driven behavior to avoid synchronization errors.
-    def counter(name, labels, docstring)
-      return PrometheusCounter.new(@registry.counter(name, docstring, labels))
+    def counter(name, _labels, docstring)
+      # When we upgrade to Prometheus client 0.10.0 or higher, pass the
+      # labels in the metric constructor. The 'labels' field in
+      # Prometheus client 0.9.0 has a different function and will not
+      # work as intended.
+      return PrometheusCounter.new(@registry.counter(name, docstring))
     rescue Prometheus::Client::Registry::AlreadyRegisteredError
       return PrometheusCounter.new(@registry.get(name))
     end
@@ -105,48 +111,28 @@ module Monitoring
     end
 
     def counter(name, labels, docstring)
-      name = OpenCensusMonitoringRegistry.translate_metric_name(name)
-      measure = OpenCensus::Stats::MeasureRegistry.get(name)
+      translator = MetricTranslator.new(name, labels)
+      measure = OpenCensus::Stats::MeasureRegistry.get(translator.name)
       if measure.nil?
         measure = OpenCensus::Stats.create_measure_int(
-          name: name,
+          name: translator.name,
           unit: OpenCensus::Stats::Measure::UNIT_NONE,
           description: docstring
         )
       end
       OpenCensus::Stats.create_and_register_view(
-        name: name,
+        name: translator.name,
         measure: measure,
         aggregation: OpenCensus::Stats.create_sum_aggregation,
         description: docstring,
-        columns: labels.map(&:to_s)
+        columns: translator.view_labels.map(&:to_s)
       )
-      OpenCensusCounter.new(@recorder, measure)
+      OpenCensusCounter.new(@recorder, measure, translator)
     end
 
     def export
       @exporter.export @recorder.views_data
     end
-
-    class << self
-      # Translate the internal metrics to the curated metrics in Stackdriver.
-      # The Prometheus metrics are collected by Google Kubernetes Engine's
-      # monitoring, so we can't redefine them.
-      def translate_metric_name(name)
-        case name
-        when :stackdriver_successful_requests_count,
-             :stackdriver_failed_requests_count
-          :request_count
-        when :stackdriver_ingested_entries_count,
-             :stackdriver_dropped_entries_count
-          :log_entry_count
-        when :stackdriver_retried_entries_count
-          :log_entry_retry_count
-        else
-          name
-        end
-      end
-    end
   end
 
   # Factory that is used to create a monitoring registry based on
@@ -168,4 +154,39 @@ module Monitoring
       registry.new(project_id, monitored_resource)
     end
   end
+
+  # Translate the internal metrics to the curated metrics in Stackdriver.  The
+  # Prometheus metrics are collected by Google Kubernetes Engine's monitoring,
+  # so we can't redefine them.
+  # Avoid this mechanism for new metrics by defining them in their final form,
+  # so they don't need translation.
+  class MetricTranslator
+    attr_reader :name
+    attr_reader :view_labels
+
+    def initialize(name, metric_labels)
+      @legacy = true
+      case name
+      when :stackdriver_successful_requests_count,
+           :stackdriver_failed_requests_count
+        @name = :request_count
+      when :stackdriver_ingested_entries_count,
+           :stackdriver_dropped_entries_count
+        @name = :log_entry_count
+      when :stackdriver_retried_entries_count
+        @name = :log_entry_retry_count
+      else
+        @name = name
+        @legacy = false
+      end
+      # Collapsed from [:response_code, :grpc]
+      @view_labels = @legacy ? [:response_code] : metric_labels
+    end
+
+    def translate_labels(labels)
+      return labels unless @legacy
+      translation = { code: :response_code, grpc: :grpc }
+      labels.map { |k, v| [translation[k], v] }.to_h
+    end
+  end
 end

data/test/plugin/base_test.rb

@@ -2734,8 +2734,15 @@ module BaseTest
   end
 
   def assert_opencensus_metric_value(metric_name, expected_value, labels = {})
-    metric_name = Monitoring::OpenCensusMonitoringRegistry
-                  .translate_metric_name(metric_name)
+    translator = Monitoring::MetricTranslator.new(metric_name, labels)
+    metric_name = translator.name
+    labels = translator.translate_labels(labels)
+    # The next line collapses the labels to assert against the aggregated data,
+    # which can have some labels removed. Without this, it would test against
+    # the raw data. The view is more representative of the user experience, even
+    # though both tests should work because currently we only aggregate away one
+    # label that never changes during runtime.
+    labels.select! { |k, _| translator.view_labels.include? k }
     labels = labels.map { |k, v| [k.to_s, v.to_s] }.to_h
     stats_recorder = OpenCensus::Stats.ensure_recorder
     view_data = stats_recorder.view_data metric_name

metadata

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