fluent-plugin-cloudwatch-logs 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3fc1e18139a9a9b3e08b6df6bf8b25e7c239d1031550e5eb5496f323cefcb0
-  data.tar.gz: 383fb66f3c5b081352d920d93688dacb4bb5e2ffb7b2acb323a26e4b3fb46525
+  metadata.gz: 7b005354b842b8dfcc7e1106d762a9b5db691f6d32c8a254910ab98c125ea62c
+  data.tar.gz: 6f7198ffd262247b2f600ae8b27cad5246954c2d050f10ce32b2e182adfd9cc6
 SHA512:
-  metadata.gz: e4c8e46ddcd8c9aea6576fcbf7bc05fc4125aa89f96e0fe2d1edf7f1b910195c59a1eda7fce229b25f6b909fd9abc02be8aaf7f6efe2cc0f66899ead811ada92
-  data.tar.gz: f30ac4839ff562af3daf90a5a93e326d9cc9922986957dd96da1d1e3b19f0fd463f6cdc482268486c8c3180674800492800ecf317ae18cfdc6add52ff15ce783
+  metadata.gz: 10b5035a2f3d3669c61e51cf4b3aed7fa6d001b26351228cc4eb1dff863ddd0c9846e09be519efadf2914b488fa7e6c471d9e86c199f167c1def428391e4493b
+  data.tar.gz: 3415f0bdb2bd70dcb1cb199ed1eb32d17998699ee519f0eba57ad67a379b7815d8648d7d2f31f9b84fdf10c6ac96d856661a9e4ba245dd734ba13e91cb5af933

data/README.md

@@ -8,7 +8,8 @@
 
 |fluent-plugin-cloudwatch-logs|     fluentd      |  ruby  |
 |-----------------------------|------------------|--------|
-|     >= 0.5.0                | >= 0.14.15       | >= 2.1 |
+|     >= 0.8.0                | >= 1.8.0         | >= 2.4 |
+|     >= 0.5.0 && < 0.8.0     | >= 0.14.15       | >= 2.1 |
 |     <= 0.4.5                | ~> 0.12.0 *      | >= 1.9 |
 
 * May not support all future fluentd features

data/fluent-plugin-cloudwatch-logs.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fluentd', '>= 0.14.15'
+  spec.add_dependency 'fluentd', '>= 1.8.0'
   spec.add_dependency 'aws-sdk-cloudwatchlogs', '~> 1.0'
 
   spec.add_development_dependency "bundler"

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.7.6"
+        VERSION = "0.8.0"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -1,4 +1,5 @@
 require 'fluent/plugin/output'
+require 'fluent/msgpack_factory'
 require 'thread'
 require 'yajl'
 
@@ -116,7 +117,7 @@ module Fluent::Plugin
 
     def format(tag, time, record)
       record = inject_values_to_record(tag, time, record)
-      msgpack_packer.pack([tag, time, record]).to_s
+      Fluent::MessagePackFactory.msgpack_packer.pack([tag, time, record]).to_s
     end
 
     def formatted_to_msgpack_binary?

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'test_helper'
+require_relative '../test_helper'
 require 'fileutils'
 require 'fluent/test/driver/output'
 require 'fluent/test/helpers'
@@ -544,7 +544,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
         end
       end
 
-      assert_match(/failed to set retention policy for Log group/, d.logs[0])
+      assert(d.logs.any?{|log| log.include?("failed to set retention policy for Log group")})
     end
 
     def test_log_group_aws_tags_key
@@ -652,12 +652,15 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     end
 
     def test_retrying_on_throttling_exception
-      resp = mock()
-      resp.expects(:rejected_log_events_info)
-      resp.expects(:next_sequence_token)
+      resp = Object.new
+      mock(resp).rejected_log_events_info {}
+      mock(resp).next_sequence_token {}
       client = Aws::CloudWatchLogs::Client.new
-      client.stubs(:put_log_events).
-        raises(Aws::CloudWatchLogs::Errors::ThrottlingException.new(nil, "error")).then.returns(resp)
+      @called = false
+      stub(client).put_log_events(anything) {
+        raise(Aws::CloudWatchLogs::Errors::ThrottlingException.new(nil, "error"))
+      }.once.ordered
+      stub(client).put_log_events(anything) { resp }.once.ordered
 
       d = create_driver
       time = event_time
@@ -674,8 +677,9 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     def test_retrying_on_throttling_exception_and_throw_away
       client = Aws::CloudWatchLogs::Client.new
-      client.stubs(:put_log_events).
-        raises(Aws::CloudWatchLogs::Errors::ThrottlingException.new(nil, "error"))
+      mock(client).put_log_events(anything).times(any_times) {
+        raise(Aws::CloudWatchLogs::Errors::ThrottlingException.new(nil, "error"))
+      }
       time = Fluent::Engine.now
       d = create_driver(<<-EOC)
         #{default_config}
@@ -708,7 +712,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
       end
 
       logs = d.logs
-      assert(logs.any?{|log| log.include?("Log event is discarded because it is too large: 262184 bytes exceeds limit of 262144")})
+      assert(logs.any?{|log| log =~ /Log event in .* discarded because it is too large: 262184 bytes exceeds limit of 262144/})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.15
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.15
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
   requirement: !ruby/object:Gem::Requirement