fluent-plugin-google-cloud 0.5.3 → 0.5.4.grpc.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 799581f71590ea1a87c3759408ee4b75f6a57ea6
-  data.tar.gz: f74f2fd1580a55e4bcde081ae1e08863ed60f859
+  metadata.gz: 279a5869d141b67bf177d86ccef404872802947c
+  data.tar.gz: 74ece7ba6616ff4e510b06bcc9b2287d146c9c13
 SHA512:
-  metadata.gz: 4cf57aeaa8fae53674a1bafc73d0dc7a5e1558c2abc06b38616e8a696f1182d54f8b081747e55191848d72ebfa601629074ea0393ffb6c0bd086e99f145b2985
-  data.tar.gz: fef39d57aaf678fa775424ead370ed06cfa0e978cf750c5c64c31af59cd57174cc287040c1f612110de0df8bed13302792d577e25a1e6d437ed0848f8919f276
+  metadata.gz: c05545b62bc7103287f7d56107c067891cd0c60acce2966b8b2279ad509421608854ec58b7a02c1f8bc312e8e8a9b32c92e0dfa3c7b7a2e708467ba2f368ef7b
+  data.tar.gz: 270899d53a66a128760d965a32115ce9d23bda50e03b00c7bc06c49d0d81f3b79e3ccee26e1eeec5c7db48faaa9fb987acf4a9d938f73cfd68a368b470f3ec40

data/Gemfile.lock

@@ -0,0 +1,135 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-google-cloud (0.5.4.grpc.alpha.1)
+      fluentd (~> 0.10)
+      google-api-client (> 0.9)
+      googleapis-common-protos (~> 1.3)
+      googleauth (~> 0.4)
+      grpc (~> 1.0)
+      json (~> 1.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    ast (2.3.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
+    cool.io (1.4.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    faraday (0.10.1)
+      multipart-post (>= 1.2, < 3)
+    fluentd (0.14.11)
+      cool.io (~> 1.4.5)
+      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.1.7)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    google-api-client (0.9.20)
+      addressable (~> 2.3)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+    google-protobuf (3.0.2)
+    googleapis-common-protos (1.3.4)
+      google-protobuf (~> 3.0)
+      grpc (~> 1.0)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    grpc (1.0.1)
+      google-protobuf (~> 3.0.2)
+      googleauth (~> 0.5.1)
+    hashdiff (0.3.2)
+    http_parser.rb (0.6.0)
+    httpclient (2.8.3)
+    hurley (0.2)
+    json (1.8.3)
+    jwt (1.5.6)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.15.0)
+    metaclass (0.0.4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    msgpack (1.0.2)
+    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)
+    powerpack (0.1.1)
+    public_suffix (2.0.5)
+    rainbow (2.2.1)
+    rake (10.5.0)
+    representable (2.3.0)
+      uber (~> 0.0.7)
+    retriable (2.1.0)
+    rubocop (0.35.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.3.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
+    ruby-progressbar (1.8.1)
+    safe_yaml (1.0.4)
+    serverengine (2.0.4)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    signet (0.7.3)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
+    strptime (0.1.8)
+    test-unit (3.2.3)
+      power_assert
+    thread_safe (0.3.5)
+    tins (1.6.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2016.10)
+      tzinfo (>= 1.0.0)
+    uber (0.0.15)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yajl-ruby (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-google-cloud!
+  mocha (~> 1.1)
+  rake (~> 10.3)
+  rubocop (~> 0.35.0)
+  test-unit (~> 3.0)
+  webmock (~> 1.17)
+
+BUNDLED WITH
+   1.13.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.5.3'
+  gem.version       = '0.5.4.grpc.alpha.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.3'
+    PLUGIN_VERSION = '0.5.4.grpc.alpha.1'
 
     # Constants for service names.
     APPENGINE_SERVICE = 'appengine.googleapis.com'
@@ -1044,7 +1044,7 @@ module Fluent
     def struct_from_ruby(hash)
       ret = Google::Protobuf::Struct.new
       hash.each do |k, v|
-        ret.fields[k] ||= value_from_ruby(v)
+        ret.fields[convert_to_utf8(k.to_s)] ||= value_from_ruby(v)
       end
       ret
     end

data/test/plugin/base_test.rb

@@ -544,6 +544,36 @@ module BaseTest
     end
   end
 
+  def test_struct_payload_malformatted_log
+    setup_gce_metadata_stubs
+    message = 'test message'
+    setup_logging_stubs do
+      d = create_driver
+      d.emit(
+        'int_key' => { 1 => message },
+        'array_key' => { [1, 2, 3, 4] => message },
+        'hash_key' => { { 'some_key' => 'some_value' } => message },
+        'symbol_key' => { some_symbol: message },
+        'nil_key' => { nil => message }
+      )
+      d.run
+    end
+    verify_log_entries(1, COMPUTE_PARAMS, 'structPayload') do |entry|
+      fields = get_fields(entry['structPayload'])
+      assert_equal 5, fields.size, entry
+      assert_equal message, get_string(get_fields(get_struct(fields \
+                   ['int_key']))['1']), entry
+      assert_equal message, get_string(get_fields(get_struct(fields \
+                   ['array_key']))['[1, 2, 3, 4]']), entry
+      assert_equal message, get_string(get_fields(get_struct(fields \
+                   ['hash_key']))['{"some_key"=>"some_value"}']), entry
+      assert_equal message, get_string(get_fields(get_struct(fields \
+                   ['symbol_key']))['some_symbol']), entry
+      assert_equal message, get_string(get_fields(get_struct(fields \
+                   ['nil_key']))['']), entry
+    end
+  end
+
   def test_struct_payload_json_log
     setup_gce_metadata_stubs
     setup_logging_stubs do

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -131,6 +131,30 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     end
   end
 
+  def test_struct_payload_non_utf8_log
+    setup_gce_metadata_stubs
+    setup_logging_stubs do
+      d = create_driver
+      d.emit('msg' => log_entry(0),
+             'normal_key' => "test#{non_utf8_character}non utf8",
+             "non_utf8#{non_utf8_character}key" => 5000,
+             'nested_struct' => { "non_utf8#{non_utf8_character}key" => \
+                                  "test#{non_utf8_character}non utf8" },
+             'null_field' => nil)
+      d.run
+    end
+    verify_log_entries(1, COMPUTE_PARAMS, 'structPayload') do |entry|
+      fields = get_fields(entry['structPayload'])
+      assert_equal 5, fields.size, entry
+      assert_equal 'test log entry 0', get_string(fields['msg']), entry
+      assert_equal 'test non utf8', get_string(fields['normal_key']), entry
+      assert_equal 5000, get_number(fields['non_utf8 key']), entry
+      assert_equal 'test non utf8', get_string(get_fields(get_struct(fields \
+                   ['nested_struct']))['non_utf8 key']), entry
+      assert_equal null_value, fields['null_field'], entry
+    end
+  end
+
   private
 
   GRPC_MOCK_HOST = 'localhost:56789'
@@ -266,6 +290,11 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     verify_json_log_entries(n, params, payload_type, &block)
   end
 
+  # Use the right single quotation mark as the sample non-utf8 character.
+  def non_utf8_character
+    [0x92].pack('C*')
+  end
+
   # For an optional field with default values, Protobuf omits the field when it
   # is deserialized to json. So we need to add an extra check for gRPC which
   # uses Protobuf.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4.grpc.alpha.1
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -178,6 +178,7 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -211,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