fluent-plugin-kinesis 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2390ce24f4d7b54d0271ae6c7f4e90814961aa8b
-  data.tar.gz: 0101a6e0685efb9dfdfb58f78634ebcdf4b75b6c
+SHA256:
+  metadata.gz: 87249672c8b4c4b51c61c09275f9b0a4a3fd91ed730360c7b1d6f59114832bc4
+  data.tar.gz: ebafe8d59f1dd4e6321f7489c8df8ba5e012ecfc0ed6cab2ee22037b263cb5a1
 SHA512:
-  metadata.gz: 021a67078235969418ad03f166a3ffeafdb4559f1893828dfee7b7eaf4b4bd27b591c63729a1ee664a3a9b101422f638ec328454227f8b8f81eb77907ac21a2d
-  data.tar.gz: 86aac9dbe4fe9647659989d3e6591ecf350bf60b503352cbdde722f1131ac03e7c8d455124b47fb0e67b23b09c5b0a01fedcc3259a2691cdd2fd28183ef31d25
+  metadata.gz: 83eebfea01f821aaab9c8d9771253ed4b8e30c4c6430547696f19c462789c1bba51c36d9a2d57f63bb83c3f8d87379fe9d9f6561f6fc71bff01edb3f87f8ce5b
+  data.tar.gz: 82b7b17dc7b4960cb221bc2e69b603770c44334a08ce3643acdbe8c033ccd2871bd4136eaa614dec8ccd0c3a6ecee9576f14bc7ee2bb465d519889505ebd9a44

data/.gitignore

@@ -11,3 +11,4 @@
 /.cache/
 /amazon-kinesis-producer-native-binarie*
 /.ruby-version
+/fluent-plugin-kinesis-*.gem

data/.travis.yml

@@ -4,14 +4,16 @@ sudo: false
 
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile.td-agent-3.5.0
+  - gemfiles/Gemfile.td-agent-3.5.1
 
 # Test with supported td-agent versions
 # https://support.treasuredata.com/hc/en-us/articles/360001479187-The-td-agent-ChangeLog
 matrix:
   include:
+    - rvm: 2.6.5
+      gemfile: gemfiles/Gemfile.fluentd-1.9.1 # Latest Fluentd
     - rvm: 2.4.1
-      gemfile: gemfiles/Gemfile.fluentd-0.14.22
+      gemfile: gemfiles/Gemfile.fluentd-0.14.22 # Oldest supported Fluentd
     - rvm: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.0/config/projects/td-agent3.rb#L20
       gemfile: gemfiles/Gemfile.td-agent-3.1.0
     - rvm: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.1/config/projects/td-agent3.rb#L17
@@ -26,6 +28,8 @@ matrix:
       gemfile: gemfiles/Gemfile.td-agent-3.4.1
     - rvm: 2.4.6 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.5.0/config/projects/td-agent3.rb#L22
       gemfile: gemfiles/Gemfile.td-agent-3.5.0
+    - rvm: 2.4.9 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.5.1/config/projects/td-agent3.rb#L22
+      gemfile: gemfiles/Gemfile.td-agent-3.5.1
   fast_finish: true
 
 script: bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 3.2.1
+
+- Enhancement - Use Fluent::MessagePackFactory class methods instead of Mixin with Fluentd >= v1.8 : [#194](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/194) [#195](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/195)
+- Enhancement - Add td-agent 3.5.1 and Fluentd 1.9.1 to test cases
+
 ## 3.2.0
 
 - Feature - Add placeholder support for stream names to send records to multiple streams : [#165](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/165) [#174](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/174)

data/gemfiles/Gemfile.fluentd-1.9.1

@@ -0,0 +1,20 @@
+#
+# Copyright 2014-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+gem "fluentd", "1.9.1"

data/gemfiles/Gemfile.td-agent-3.5.1

@@ -0,0 +1,31 @@
+#
+# Copyright 2014-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v3.5.1
+# https://github.com/treasure-data/omnibus-td-agent/blob/v3.5.1/config/projects/td-agent3.rb#L27
+gem "fluentd", "1.7.4"
+# https://github.com/treasure-data/omnibus-td-agent/blob/v3.5.1/plugin_gems.rb#L16-L23
+gem "jmespath", "1.4.0"
+gem "aws-partitions", "1.230.0"
+gem "aws-sigv4", "1.1.0"
+gem "aws-sdk-core", "3.72.0"
+gem "aws-sdk-kms", "1.25.0"
+gem "aws-sdk-sqs", "1.23.0"
+gem "aws-sdk-s3", "1.52.0"
+gem "fluent-plugin-s3", "1.2.0"

data/lib/fluent/plugin/kinesis.rb

@@ -12,6 +12,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require 'fluent/version'
+require 'fluent/msgpack_factory'
 require 'fluent/plugin/output'
 require 'fluent/plugin/kinesis_helper/client'
 require 'fluent/plugin/kinesis_helper/api'
@@ -20,7 +22,6 @@ require 'zlib'
 module Fluent
   module Plugin
     class KinesisOutput < Fluent::Plugin::Output
-      include Fluent::MessagePackFactory::Mixin
       include KinesisHelper::Client
       include KinesisHelper::API
 
@@ -133,6 +134,14 @@ module Fluent
         ''
       end
 
+      if Gem::Version.new(Fluent::VERSION) >= Gem::Version.new('1.8.0')
+        def msgpack_unpacker(*args)
+          Fluent::MessagePackFactory.msgpack_unpacker(*args)
+        end
+      else
+        include Fluent::MessagePackFactory::Mixin
+      end
+
       def write_records_batch(chunk, &block)
         unique_id = chunk.dump_unique_id_hex(chunk.unique_id)
         chunk.open do |io|

data/lib/fluent_plugin_kinesis/version.rb

@@ -13,5 +13,5 @@
 # language governing permissions and limitations under the License.
 
 module FluentPluginKinesis
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kinesis
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -284,6 +284,7 @@ files:
 - benchmark/task.rake
 - fluent-plugin-kinesis.gemspec
 - gemfiles/Gemfile.fluentd-0.14.22
+- gemfiles/Gemfile.fluentd-1.9.1
 - gemfiles/Gemfile.td-agent-3.1.0
 - gemfiles/Gemfile.td-agent-3.1.1
 - gemfiles/Gemfile.td-agent-3.2.0
@@ -291,6 +292,7 @@ files:
 - gemfiles/Gemfile.td-agent-3.3.0
 - gemfiles/Gemfile.td-agent-3.4.1
 - gemfiles/Gemfile.td-agent-3.5.0
+- gemfiles/Gemfile.td-agent-3.5.1
 - lib/fluent/plugin/kinesis.rb
 - lib/fluent/plugin/kinesis_helper/aggregator.rb
 - lib/fluent/plugin/kinesis_helper/api.rb
@@ -318,8 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin that sends events to Amazon Kinesis.