fluent-plugin-cloudwatch-logs 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe6a24bcdd46ff8092270e4d257ca0685831956
-  data.tar.gz: 321b8cd1212f101edf40cf1ff6c7196aee8a18d9
+  metadata.gz: e8dbf3d1910a3b9441394ff31f94fb1ce16813b3
+  data.tar.gz: 12284873b4ead473926e40db48a7b356cd82a7e7
 SHA512:
-  metadata.gz: 8433c77b1bac37ea1df22c61d77346a1d302d6f314830ec6fd7aa3998b63a71d3d74d61f797b59d0fa2c98a7fd4008d40a80d8b2483acce92d8b19daf014f71d
-  data.tar.gz: 5de5518728d7cdbe4ca65a0308c7bb6f9634b5701f2f43cca23e370272eb25b62ce7079a04911e4371b908b0352d96a8fce3c2880039e8be0b45cd7daae46fd6
+  metadata.gz: 3844ad5b634e937af8843426fada5ff7d7f3dc4ebea0ecd86936862e981ec582373f20108e8013758922340961b4a9e99a591aa049887a9129eee2e994be62e4
+  data.tar.gz: c695b70a2e4a2f4ebf14adc0181f667a04e35cf3996405e397ec6d3480f8ad3604cefb4b1f8f38bc2f62364a93e3fdd32e41d1137d70eb339313e0d2bd6319db

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-cloudwatch-logs.gemspec
+gem 'fluentd', '~> 0.12.0'
 gemspec

data/lib/fluent/plugin/cloudwatch/logs/version.rb

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.3.2"
+        VERSION = "0.3.3"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -126,16 +126,13 @@ module Fluent
         rs.each do |t, time, record|
           time_ms = time * 1000
 
+          scrub_record!(record)
           if @message_keys
             message = @message_keys.split(',').map {|k| record[k].to_s }.join(' ')
           else
             message = record.to_json
           end
 
-          # CloudWatchLogs API only accepts valid UTF-8 strings
-          # so we should encode the message to UTF-8
-          message.encode('UTF-8', :invalid => :replace)
-
           if @max_message_length
             message = message.slice(0, @max_message_length)
           end
@@ -150,6 +147,17 @@ module Fluent
     end
 
     private
+    def scrub_record!(record)
+      case record
+      when Hash
+        record.each_value {|v| scrub_record!(v) }
+      when Array
+        record.each {|v| scrub_record!(v) }
+      when String
+        record.scrub!
+      end
+    end
+
     def next_sequence_token(group_name, stream_name)
       @sequence_tokens[group_name][stream_name]
     end

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -366,6 +366,25 @@ log_stream_name #{log_stream_name}
     assert_match(/Log event is discarded because it is too large: 262184 bytes exceeds limit of 262144$/, d.instance.log.logs[0])
   end
 
+  def test_scrub_record
+    record = {
+      "hash" => {
+        "str" => "\xAE",
+      },
+      "array" => [
+        "\xAE",
+      ],
+      "str" => "\xAE",
+    }
+
+    d = create_driver
+    d.instance.send(:scrub_record!, record)
+
+    assert_equal("�", record["hash"]["str"])
+    assert_equal("�", record["array"][0])
+    assert_equal("�", record["str"])
+  end
+
   private
   def default_config
     <<-EOC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd