fluent-plugin-google-cloud 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '05629ca0c7bd8bbf7a89676983ec9a4e009c4e3d'
-  data.tar.gz: 0fa156f9ed36e1dc612f51e39a5a800a3fb0be4d
+SHA256:
+  metadata.gz: 6d9571be109300197bc432ba7f561345addc0c2e9b477b676a05c0a56f661b46
+  data.tar.gz: b18d90aa70e5b25876fbe64912096225c21ad52e3bb81ad056fb0f5938d4efa4
 SHA512:
-  metadata.gz: dc7e3e2bb6443cb987c395f4140c8fa941711ec58060e6247b13c3400d220e57df03efc0e8309eaea13b58e9e6531aef2b54990b8486c92d672affc2bbc286a7
-  data.tar.gz: 4215112f753570d4f4bea4e26b37446a60730e7dbca69980c4835bf9c96eb68c012e8bf9ccb2e2b1137009b910424d1cfc6128f718b8d2873a36159c71b780e3
+  metadata.gz: c64ce586b924a3900ea389ab424cf5027e2e5df3703d23afde7f3076c805acc9da6c382256f722ba463e5af64f2dd8f4a311457ceb6276c76c203d2d115b3b8f
+  data.tar.gz: 144524c87fb2d803591d57fa0f62543a49121a4028ac2cba0efb1cf45a1f7a19a5ae094b0dc3d56651609efc36f143fe0e9aadf02700b88c93d39f0c353780f5

data/Gemfile.lock

@@ -0,0 +1,160 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-google-cloud (0.7.2)
+      fluentd (= 1.2.5)
+      google-api-client (= 0.23.9)
+      google-cloud-logging (= 1.5.4)
+      google-protobuf (= 3.6.1)
+      googleapis-common-protos (= 1.3.7)
+      googleauth (= 0.6.6)
+      grpc (= 1.8.3)
+      json (= 2.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
+    cool.io (1.5.3)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    dig_rb (1.0.1)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    fluentd (1.2.5)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 0.7.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.2, < 1.0.0)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    google-api-client (0.23.9)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.9)
+    google-cloud-core (1.2.7)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.5)
+      faraday (~> 0.11)
+    google-cloud-logging (1.5.4)
+      google-cloud-core (~> 1.2)
+      google-gax (~> 1.3)
+      googleapis-common-protos-types (>= 1.0.2)
+      stackdriver-core (~> 1.3)
+    google-gax (1.4.0)
+      google-protobuf (~> 3.2)
+      googleapis-common-protos (>= 1.3.5, < 2.0)
+      googleauth (~> 0.6.2)
+      grpc (>= 1.7.2, < 2.0)
+      rly (~> 0.2.3)
+    google-protobuf (3.6.1)
+    googleapis-common-protos (1.3.7)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos-types (~> 1.0)
+      grpc (~> 1.0)
+    googleapis-common-protos-types (1.0.2)
+      google-protobuf (~> 3.0)
+    googleauth (0.6.6)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
+    grpc (1.8.3)
+      google-protobuf (~> 3.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
+    hashdiff (0.3.7)
+    http_parser.rb (0.6.0)
+    httpclient (2.8.3)
+    json (2.1.0)
+    jwt (2.1.0)
+    memoist (0.16.0)
+    metaclass (0.0.4)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mocha (1.7.0)
+      metaclass (~> 0.0.1)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    os (1.0.0)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    power_assert (1.1.3)
+    powerpack (0.1.2)
+    prometheus-client (0.7.1)
+      quantile (~> 0.2.0)
+    public_suffix (3.0.3)
+    quantile (0.2.1)
+    rainbow (2.2.2)
+      rake
+    rake (10.5.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rly (0.2.3)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.0)
+    safe_yaml (1.0.4)
+    serverengine (2.1.0)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    signet (0.11.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    stackdriver-core (1.3.3)
+      google-cloud-core (~> 1.2)
+    strptime (0.2.3)
+    test-unit (3.2.8)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.7)
+      tzinfo (>= 1.0.0)
+    uber (0.1.0)
+    unicode-display_width (1.4.0)
+    webmock (2.3.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-google-cloud!
+  mocha (~> 1.1)
+  prometheus-client (~> 0.7.1)
+  rake (~> 10.3)
+  rubocop (~> 0.39.0)
+  test-unit (~> 3.0)
+  webmock (~> 2.3.1)
+
+BUNDLED WITH
+   1.16.6

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.0'
+  gem.version       = '0.7.2'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')

data/lib/fluent/plugin/filter_add_insert_ids.rb

@@ -73,7 +73,7 @@ module Fluent
       super
     end
 
-    # rubocop:disable Style/UnusedMethodArgument
+    # rubocop:disable Lint/UnusedMethodArgument
     def filter(tag, time, record)
       # Only generate and add an insertId field if the record is a hash and
       # the insert ID field is not already set (or set to an empty string).
@@ -82,7 +82,7 @@ module Fluent
       end
       record
     end
-    # rubocop:enable Style/UnusedMethodArgument
+    # rubocop:enable Lint/UnusedMethodArgument
 
     private
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -1679,6 +1679,7 @@ module Fluent
         begin
           payload_key = instance_variable_get(payload_key)
           fields = record[payload_key]
+          record.delete(payload_key) if fields.nil?
           next unless fields.is_a?(Hash)
 
           extracted_subfields = subfields.each_with_object({}) \

data/test/plugin/base_test.rb

@@ -387,7 +387,7 @@ module BaseTest
           d.emit('msg' => log_entry(0))
           d.run
           verify_log_entries(1, COMPUTE_PARAMS, 'jsonPayload') do |entry|
-            assert_nil entry['trace']
+            assert_false entry.key?('trace'), entry
           end
         end
       end
@@ -1255,6 +1255,18 @@ module BaseTest
     verify_subfields_when_not_hash(DEFAULT_OPERATION_KEY)
   end
 
+  def test_log_entry_http_request_field_when_nil
+    verify_subfields_when_nil(DEFAULT_HTTP_REQUEST_KEY)
+  end
+
+  def test_log_entry_source_location_field_when_nil
+    verify_subfields_when_nil(DEFAULT_SOURCE_LOCATION_KEY)
+  end
+
+  def test_log_entry_operation_field_when_nil
+    verify_subfields_when_nil(DEFAULT_OPERATION_KEY)
+  end
+
   def test_http_request_from_record_with_referer_nil_or_absent
     setup_gce_metadata_stubs
     [
@@ -2140,7 +2152,24 @@ module BaseTest
     verify_log_entries(1, COMPUTE_PARAMS, 'jsonPayload') do |entry|
       field = get_fields(entry['jsonPayload'])[payload_key]
       assert_equal 'a_string', get_string(field), entry
-      assert_nil entry[destination_key], entry
+      assert_false entry.key?(destination_key), entry
+    end
+  end
+
+  def verify_subfields_when_nil(payload_key)
+    destination_key = log_entry_subfields_params[payload_key][0]
+    @logs_sent = []
+    setup_gce_metadata_stubs
+    setup_logging_stubs do
+      d = create_driver
+      d.emit(payload_key => nil)
+      d.run
+    end
+
+    verify_log_entries(1, COMPUTE_PARAMS, 'jsonPayload') do |entry|
+      fields = get_fields(entry['jsonPayload'])
+      assert_false fields.key?(payload_key), entry
+      assert_false entry.key?(destination_key), entry
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -219,6 +219,7 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: fluentd plugins for the Stackdriver Logging API