fluent-plugin-google-cloud 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8ff06da0025190972720ffd13b941d21f79329
-  data.tar.gz: 5c6253b111461fca1d2435f835d6bff911c4241f
+  metadata.gz: 357b0cf2cba57aafc6011c911419b746cc7103b2
+  data.tar.gz: 91941e153f05ff927e8f83d342b651219075ebc8
 SHA512:
-  metadata.gz: 38a1fe0c31f761690a9328ca4fc1d94c50a19f0701893fb74873db17456c65e15ca0dd159a6dde731705f151976565ed709719ff755c4ff516cea2fc821314cb
-  data.tar.gz: ea3d462b54d1c1a3bf8a76526d77b2c4b0590a510a89f6b969c6ae36923a3d4ae2847f89e52e6b3287383e8b911ec691aac1c53c53fedcde51708ce51ecf868d
+  metadata.gz: 10cfc826b705a84b017571b34b759ee9013f416436e6fcd79c632b8e6daa7a016e87c1630a6d5e03a23b7627abb2e46bd32709957a7fdb7589c91af8b2b4f3bc
+  data.tar.gz: 915d378471e6b055f8eef48e73c7d27300d9fcadf420b2029efdf5a73e46eb83f674e3b631e1257986cae43e9e2603148d61707363ad53e4d3cdb81fe575f1ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.1)
+    fluent-plugin-google-cloud (0.6.2)
       fluentd (~> 0.10)
       google-api-client (~> 0.9.0)
       google-cloud-logging (~> 0.23.2)
@@ -21,9 +21,9 @@ GEM
     cool.io (1.4.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    faraday (0.12.0.1)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.14.14)
+    fluentd (0.14.15)
       cool.io (~> 1.4.5)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
@@ -57,7 +57,7 @@ GEM
       googleauth (~> 0.5.1)
       grpc (~> 1.0)
       rly (~> 0.2.3)
-    google-protobuf (3.2.0.2)
+    google-protobuf (3.3.0)
     googleapis-common-protos (1.3.5)
       google-protobuf (~> 3.2)
       grpc (~> 1.0)
@@ -69,10 +69,10 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.2)
+    grpc (1.2.5)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     hurley (0.2)
@@ -96,10 +96,11 @@ GEM
     os (0.9.6)
     parser (2.4.0.0)
       ast (~> 2.2)
-    power_assert (1.0.1)
+    power_assert (1.0.2)
     powerpack (0.1.1)
     public_suffix (2.0.5)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (10.5.0)
     representable (2.3.0)
       uber (~> 0.0.7)

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.1'
+  gem.version       = '0.6.2'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -73,7 +73,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.6.1'
+    PLUGIN_VERSION = '0.6.2'
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'
@@ -243,6 +243,8 @@ module Fluent
         (?:\[(?<execution_id>[^\]]+)\])?
         [ ](?<text>.*)$/x
 
+      @http_latency_regexp = /^\s*(?<seconds>\d+)(?<decimal>\.\d+)?\s*s\s*$/
+
       # set attributes from metadata (unless overriden by static config)
       @vm_name = Socket.gethostname if @vm_name.nil?
       @platform = detect_platform
@@ -927,6 +929,8 @@ module Fluent
       end
     end
 
+    NANOS_IN_A_SECOND = 1000 * 1000 * 1000
+
     def set_http_request(record, entry)
       return nil unless record['httpRequest'].is_a?(Hash)
       input = record['httpRequest']
@@ -961,6 +965,33 @@ module Fluent
       output.cache_validated_with_origin_server = \
         cache_validated_with_origin_server \
         unless cache_validated_with_origin_server.nil?
+
+      latency = input.delete('latency')
+      unless latency.nil?
+        # Parse latency. If no valid format is detected, skip setting latency.
+        # Format: whitespace (optional) + integer + point & decimal (optional)
+        #       + whitespace (optional) + "s" + whitespace (optional)
+        # e.g.: "1.42 s"
+        match = @http_latency_regexp.match(latency)
+        if match
+          # Split the integer and decimal parts in order to calculate seconds
+          # and nanos.
+          latency_seconds = match['seconds'].to_i
+          latency_nanos = (match['decimal'].to_f * NANOS_IN_A_SECOND).round
+          if @use_grpc
+            output.latency = Google::Protobuf::Duration.new(
+              seconds: latency_seconds,
+              nanos: latency_nanos
+            )
+          else
+            output.latency = {
+              seconds: latency_seconds,
+              nanos: latency_nanos
+            }.delete_if { |_, v| v == 0 }
+          end
+        end
+      end
+
       record.delete('httpRequest') if input.empty?
       entry.http_request = output
     end

data/test/plugin/base_test.rb

@@ -1368,6 +1368,43 @@ module BaseTest
     end
   end
 
+  def test_http_request_with_latency
+    setup_gce_metadata_stubs
+    latency_conversion.each do |input, expected|
+      setup_logging_stubs do
+        d = create_driver
+        @logs_sent = []
+        d.emit('httpRequest' => HTTP_REQUEST_MESSAGE.merge('latency' => input))
+        d.run
+      end
+      verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
+        assert_equal HTTP_REQUEST_MESSAGE.merge('latency' => expected),
+                     entry['httpRequest'], entry
+        assert_nil get_fields(entry['jsonPayload'])['httpRequest'], entry
+      end
+    end
+  end
+
+  # Skip setting latency when the field is null or has invalid format.
+  def test_http_request_skip_setting_latency
+    setup_gce_metadata_stubs
+    [
+      '', ' ', nil, 'null', '123', '1.23 seconds',
+      ' 123 s econds ', '1min', 'abc&^!$*('
+    ].each do |input|
+      setup_logging_stubs do
+        d = create_driver
+        @logs_sent = []
+        d.emit('httpRequest' => HTTP_REQUEST_MESSAGE.merge('latency' => input))
+        d.run
+      end
+      verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
+        assert_equal HTTP_REQUEST_MESSAGE, entry['httpRequest'], entry
+        assert_nil get_fields(entry['jsonPayload'])['httpRequest'], entry
+      end
+    end
+  end
+
   private
 
   def stub_metadata_request(metadata_path, response_body)
@@ -1592,6 +1629,27 @@ module BaseTest
     end
   end
 
+  # The conversions from user input to output.
+  def latency_conversion
+    {
+      '32 s' => { 'seconds' => 32 },
+      '32s' => { 'seconds' => 32 },
+      '0.32s' => { 'nanos' => 320_000_000 },
+      ' 123 s ' => { 'seconds' => 123 },
+      '1.3442 s' => { 'seconds' => 1, 'nanos' => 344_200_000 },
+
+      # Test whitespace.
+      # \t: tab. \r: carriage return. \n: line break.
+      # \v: vertical whitespace. \f: form feed.
+      "\t123.5\ts\t" => { 'seconds' => 123, 'nanos' => 500_000_000 },
+      "\r123.5\rs\r" => { 'seconds' => 123, 'nanos' => 500_000_000 },
+      "\n123.5\ns\n" => { 'seconds' => 123, 'nanos' => 500_000_000 },
+      "\v123.5\vs\v" => { 'seconds' => 123, 'nanos' => 500_000_000 },
+      "\f123.5\fs\f" => { 'seconds' => 123, 'nanos' => 500_000_000 },
+      "\r123.5\ts\f" => { 'seconds' => 123, 'nanos' => 500_000_000 }
+    }
+  end
+
   # This module expects the methods below to be overridden.
 
   # Create a Fluentd output test driver with the Google Cloud Output plugin.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for the Stackdriver Logging API