fluent-plugin-google-cloud 0.5.4 → 0.5.5.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11ddeb5380debeeb3ea6482ba8fce07cce1ac0c
-  data.tar.gz: fa3f075528735a79e0b01f6a9fac777d735146af
+  metadata.gz: 04347e11378a890ae709eb943fae378e4c653948
+  data.tar.gz: 48f4f8d264c03eb6d4fe6d16cc19f29bbf64b4fb
 SHA512:
-  metadata.gz: 79f01033d4a357c9ba361fd19e102e40e74b1f166c05ad62d90159497e1d4c3cc7546e72d7887cb13088992afcc69152be5947a70c1fcdf32cfd041d30ad8e5e
-  data.tar.gz: e700a183f766bd8137e852fb3e17888f40a4fa68be0142a113530424aa962e343af0b18149a4e5eb54132abad0e3d9bb40f818db2fa1b60ae3c383c17781d316
+  metadata.gz: 9a1baec70a6600ef0b3f086ec1b21ccce2159252da2ff820eaad55a83a8a12eafed606b9336fa43fbaa6ffdc9e5061738f3d74327c4d59e3a79e8267457e3d81
+  data.tar.gz: d50f6e7f48c8117b6183d8adb91c5b329f9ec58b48c023f4665412f7c293dcd6be50ce7c8bcd3763c17cfb108d5027b131f82270830e1920a34f0c16f660d0af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.5.4)
+    fluent-plugin-google-cloud (0.5.5.pre.1)
       fluentd (~> 0.10)
       google-api-client (> 0.9)
       googleapis-common-protos (~> 1.3)
@@ -17,12 +17,12 @@ GEM
     ast (2.3.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    cool.io (1.4.5)
+    cool.io (1.4.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.14.11)
+    fluentd (0.14.12)
       cool.io (~> 1.4.5)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
@@ -32,7 +32,7 @@ GEM
       tzinfo (~> 1.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
-    google-api-client (0.9.23)
+    google-api-client (0.9.26)
       addressable (~> 2.3)
       googleauth (~> 0.5)
       httpclient (~> 2.7)
@@ -73,13 +73,13 @@ GEM
     mime-types-data (3.2016.0521)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
-    msgpack (1.0.2)
+    msgpack (1.0.3)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     os (0.9.6)
     parser (2.3.3.1)
       ast (~> 2.2)
-    power_assert (0.4.1)
+    power_assert (1.0.1)
     powerpack (0.1.1)
     public_suffix (2.0.5)
     rainbow (2.2.1)
@@ -132,4 +132,4 @@ DEPENDENCIES
   webmock (~> 1.17)
 
 BUNDLED WITH
-   1.14.2
+   1.14.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.5.4'
+  gem.version       = '0.5.5.pre.1'
   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

@@ -39,7 +39,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.5.4'
+    PLUGIN_VERSION = '0.5.5.pre.1'
 
     # Constants for service names.
     APPENGINE_SERVICE = 'appengine.googleapis.com'
@@ -437,10 +437,17 @@ module Fluent
 
           ts_secs, ts_nanos = compute_timestamp(record, time)
           if @use_grpc
-            entry.metadata.timestamp = Google::Protobuf::Timestamp.new(
-              seconds: ts_secs,
-              nanos: ts_nanos
-            )
+            # If "seconds" is null or not an integer, we will omit the timestamp
+            # field and defer the decision on how to handle it to the downstream
+            # Logging API. If "nanos" is null or not an integer, it will be set
+            # to 0.
+            if ts_secs.is_a?(Integer)
+              ts_nanos = 0 unless ts_nanos.is_a?(Integer)
+              entry.metadata.timestamp = Google::Protobuf::Timestamp.new(
+                seconds: ts_secs,
+                nanos: ts_nanos
+              )
+            end
 
             entry.metadata.severity =
               grpc_severity(compute_severity(record, entry))

data/test/plugin/test_out_google_cloud.rb

@@ -191,6 +191,30 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_equal('DEFAULT', test_obj.parse_severity('er'))
   end
 
+  def test_non_integer_timestamp
+    setup_gce_metadata_stubs
+    time = Time.now
+    [
+      { 'seconds' => nil, 'nanos' => nil },
+      { 'seconds' => nil, 'nanos' => time.tv_nsec },
+      { 'seconds' => 'seconds', 'nanos' => time.tv_nsec },
+      { 'seconds' => time.tv_sec, 'nanos' => 'nanos' },
+      { 'seconds' => time.tv_sec, 'nanos' => nil }
+    ].each do |timestamp|
+      setup_logging_stubs do
+        d = create_driver
+        @logs_sent = []
+        d.emit('message' => log_entry(0), 'timestamp' => timestamp)
+        d.run
+      end
+      verify_log_entries(1, COMPUTE_PARAMS) do |entry|
+        assert_equal timestamp, entry['metadata']['timestamp'],
+                     "Test with timestamp '#{timestamp}' failed for " \
+                     "entry: '#{entry}'."
+      end
+    end
+  end
+
   private
 
   def rename_key(hash, old_key, new_key)

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -155,6 +155,32 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     end
   end
 
+  def test_non_integer_timestamp
+    setup_gce_metadata_stubs
+    time = Time.now
+    {
+      { 'seconds' => nil, 'nanos' => nil } => nil,
+      { 'seconds' => nil, 'nanos' => time.tv_nsec } => nil,
+      { 'seconds' => 'seconds', 'nanos' => time.tv_nsec } => nil,
+      { 'seconds' => time.tv_sec, 'nanos' => 'nanos' } => \
+        { 'seconds' => time.tv_sec },
+      { 'seconds' => time.tv_sec, 'nanos' => nil } => \
+        { 'seconds' => time.tv_sec }
+    }.each do |input, expected|
+      setup_logging_stubs do
+        d = create_driver
+        @logs_sent = []
+        d.emit('message' => log_entry(0), 'timestamp' => input)
+        d.run
+      end
+      verify_log_entries(1, COMPUTE_PARAMS) do |entry|
+        assert_equal expected, entry['metadata']['timestamp'],
+                     "Test with timestamp '#{input}' failed for " \
+                     "entry: '#{entry}'."
+      end
+    end
+  end
+
   private
 
   GRPC_MOCK_HOST = 'localhost:56789'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5.pre.1
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -212,9 +212,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8