fluent-plugin-gcloud-pubsub-custom 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8daf09e1eeb0af707c9fc9fda10284540c73555
-  data.tar.gz: c61879a204d49e5c1e11a630e5274916d3b8e507
+  metadata.gz: ce4671f1f14d950d6c5eed9b5c86fab28c0c0e4e
+  data.tar.gz: d6b615131cdf7f4a3e64d4f37918f22aafe18c57
 SHA512:
-  metadata.gz: 3de06b045e2f552038d2102c35cc127af05ee67d97138c428c5159f34db5f6f2d552215f8f3f882bab8c1c462f242bc7de21c723ee82e0f9a0e202af6802f0f9
-  data.tar.gz: 17502d7a5df5570848fcfb40de28522618825b5f31dc51674c2ded054827a0082a18b36e373ec375398a2c3ca3797dc11559755fc213996bc58fb054096c23c6
+  metadata.gz: 5e0d49b85278cf8f9faa5fbf9f490930131e769130fb7124aa8cf6991eedb0fc68c5ece236c54047f117ce698de75fa225279e760f1a33e1d7be2fd9261aa766
+  data.tar.gz: a83690434bc3b5ee2a45c2bd0a244fbb1f21ec0d81516fe42661a33f0d1e08452b4df5ead99201bf2b27ba51125b5fe15f9eeec23e344d05ef06ae3a10eae704

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## ChangeLog
 
+### Release 0.4.1 - 2017/02/02
+
+- Bump up google-cloud-pubsub to v0.22.x
+- Input plugin
+  - Rescue 50x errors on acknowledge api
+
 ### Release 0.4.0 - 2017/01/21
 
 - Input plugin

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.v0.12

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'fluentd', '~> 0.12.0'
 

data/fluent-plugin-gcloud-pubsub-custom.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.homepage    = "https://github.com/mia-0032/fluent-plugin-gcloud-pubsub-custom"
   gem.summary     = gem.description
-  gem.version     = "0.4.0"
+  gem.version     = "0.4.1"
   gem.authors     = ["Yoshihiro MIYAI"]
   gem.email       = "msparrow17@gmail.com"
   gem.has_rdoc    = false
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency "fluentd", [">= 0.10.58", "< 2"]
-  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.21.0"
+  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.22.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

data/lib/fluent/plugin/gcloud_pubsub/client.rb

@@ -37,11 +37,13 @@ module Fluent
       def pull(immediate, max)
         @client.pull immediate: immediate, max: max
       rescue Google::Cloud::UnavailableError, Google::Cloud::DeadlineExceededError, Google::Cloud::InternalError => ex
-        raise RetryableError.new "Google api returns error:#{ex.class.to_s} message:#{ex.to_s}"
+        raise RetryableError.new "Google pull api returns error:#{ex.class.to_s} message:#{ex.to_s}"
       end
 
       def acknowledge(messages)
         @client.acknowledge messages
+      rescue Google::Cloud::UnavailableError, Google::Cloud::DeadlineExceededError, Google::Cloud::InternalError => ex
+        raise RetryableError.new "Google acknowledge api returns error:#{ex.class.to_s} message:#{ex.to_s}"
       end
     end
   end

data/test/plugin/test_in_gcloud_pubsub.rb

@@ -236,11 +236,11 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
       assert_equal(true, d.emits.empty?)
     end
 
-    test 'retry if raised RetryableError' do
+    test 'retry if raised RetryableError on pull' do
       @subscriber.pull(immediate: true, max: 100).twice { raise Google::Cloud::UnavailableError.new('TEST') }
       @subscriber.acknowledge.times(0)
 
-      d = create_driver(CONFIG + 'pull_interval 0.5')
+      d = create_driver("#{CONFIG}\npull_interval 0.5")
       d.run {
         sleep 0.1 # + 0.5s
       }
@@ -249,6 +249,25 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
       assert_equal(true, d.emits.empty?)
     end
 
+    test 'retry if raised RetryableError on acknowledge' do
+      messages = Array.new(1, DummyMessage.new)
+      @subscriber.pull(immediate: true, max: 100).twice { messages }
+      @subscriber.acknowledge(messages).twice { raise Google::Cloud::UnavailableError.new('TEST') }
+
+      d = create_driver("#{CONFIG}\npull_interval 0.5")
+      d.run {
+        sleep 0.1 # + 0.5s
+      }
+      emits = d.emits
+
+      # not acknowledged, but already emitted to engine.
+      assert_equal(2, emits.length)
+      emits.each do |tag, time, record|
+        assert_equal("test", tag)
+        assert_equal({"foo" => "bar"}, record)
+      end
+    end
+
     test 'stop by http rpc' do
       messages = Array.new(1, DummyMessage.new)
       @subscriber.pull(immediate: true, max: 100).once { messages }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-pubsub-custom
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yoshihiro MIYAI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement