test-opensearch 0.0.0.20 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e64802826ae07863828975be01dbb8fee1bc0e4d8fef81ad195fe658ede210e0
-  data.tar.gz: cd18ef4da46e20bd059a3fcf5d9b2791e630e4c37704cc4af17e2480e717113b
+  metadata.gz: 735233dd19333067fd99b45dbea9f11e850ffd51fe8f2b1d67314e01c1b1577f
+  data.tar.gz: 6f6ffe333f30cfba27e5f88136dea9fc211fdb1f12210d72f9b63700573b7111
 SHA512:
-  metadata.gz: d79fbfa7dd1f59e79db7c53e422cf3f6f4ad8d62b09f7b20566cfec33077230971083b2691dbb57b081344005b0ad09200a2916eba1a35628b18d3cbcf039858
-  data.tar.gz: ade76a78db35219afeb6cba5cd4db1bcfb14470c9a0f7d1daf82d9a7ae065602fcb9577d36f6e81448f456f2e773837ac48f35be70627c761f3dd6f76ba0108c
+  metadata.gz: 5ee989c6617a7d5962265b19c1758d566681249f0d91f64c467a0d221e32d37f5f6ffb6215a8ba9f1487bc9df7790d3be2282807191605586544728ec269eed3
+  data.tar.gz: 18931258decedc854123c1ae66bcadb3b73595796f7c2ab60fe4ff3597530084da0e74f525d98f26118db9665b33c1007068090d7daa3e2f0774ba4045d8d83d

data/README.OpenSearchInput.md

@@ -322,7 +322,7 @@ retry_max_times 5
 
 The parameter needs for how long need to wait (time in seconds) to retry again:
 `exponential_backoff`: wait in seconds will become large exponentially per failure,
-`periodic:` plugin will retry periodically with fixed intervals (configured via retry_wait). The default value is `:periodic`
+`periodic`: plugin will retry periodically with fixed intervals (configured via retry_wait). The default value is `:exponential_backoff`
 Periodic -> fixed :retry_wait
 Exponential backoff: k is number of retry times
 c: constant factor, @retry_wait
@@ -331,7 +331,7 @@ k: times
 total retry time: c + c * b^1 + (...) + c*b^k = c*b^(k+1) - 1
 
 ```
-retry_type :periodic
+retry_type exponential_backoff
 ```
 
 ### retry_wait
@@ -360,7 +360,7 @@ retry_max_interval nil
 
 ### retry_randomize
 
-The parameter If true, the output plugin will retry after randomized interval not to do burst retries. The default value is  `false`
+The parameter If true, the plugin will retry after randomized interval not to do burst retries. The default value is  `false`
 
 ```
 retry_randomize false

data/fluent-plugin-opensearch.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'test-opensearch'
-  s.version       = '0.0.0.20'
-  s.authors       = ['Oleh']
+  s.version       = '0.0.24'
+  s.authors       = ['imcotop']
   s.email         = ['imcotop@icloud.com']
-  s.description   = %q{test}
+  s.description   = %q{Opensearch output plugin for Fluent event collector}
   s.summary       = s.description
   s.homepage      = 'https://github.com/fluent/fluent-plugin-opensearch'
   s.license       = 'Apache-2.0'

data/lib/fluent/plugin/in_opensearch.rb

@@ -110,7 +110,7 @@ module Fluent::Plugin
 
       @timestamp_parser = create_time_parser
       @backend_options = backend_options
-      @retry = retry_state(@retry_randomize)
+      @retry = nil
 
       raise Fluent::ConfigError, "`password` must be present if `user` is present" if @user && @password.nil?
 
@@ -337,6 +337,23 @@ module Fluent::Plugin
       return true
     end
 
+    def update_retry_state(error=nil)
+      if error
+        unless @retry
+          @retry = retry_state(@retry_randomize)
+        end
+        @retry.step
+        #Raise error if the retry limit has been reached
+        raise "Hit limit for retries. retry_times: #{@retry.steps}, error: #{error.message}" if @retry.limit?
+        #Retry if the limit hasn't been reached
+        log.warn("failed to connect or search.", retry_times: @retry.steps, next_retry_time: @retry.next_time.round, error: error.message)
+        sleep(@retry.next_time - Time.now)
+      else
+        log.debug("retry succeeded.") unless @retry.nil?
+        @retry = nil unless @retry.nil?
+      end
+    end
+
     def run
       return run_slice if @num_slices <= 1
 
@@ -347,14 +364,8 @@ module Fluent::Plugin
           run_slice(slice_id)
         end
       end
-    rescue Faraday::ConnectionFailed, OpenSearch::Transport::Transport::Error => e
-      @retry.step
-      #Raise error if the retry limit has been reached
-      raise "Hit limit for retries. retry_times: #{@retry.limit?}, error: #{e.message}" if @retry.limit?
-
-      #Retry if the retry limit hasn't been reached
-      log.warn("failed to connect or search.", retry_times: @retry.steps, next_retry_time: @retry.next_time.round, error: e.message)
-      sleep(@retry.next_time - Time.now)
+    rescue Faraday::ConnectionFailed, OpenSearch::Transport::Transport::Error => error
+      update_retry_state(error)
       retry
     end
 
@@ -376,9 +387,7 @@ module Fluent::Plugin
 
       router.emit_stream(@tag, es)
       clear_scroll(scroll_id)
-      #reset steps and next_time if our function successful ends
-      @retry.instance_variable_set(:@steps, 0)
-      @retry.instance_variable_set(:@next_time, nil)
+      update_retry_state
     end
 
     def clear_scroll(scroll_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-opensearch
 version: !ruby/object:Gem::Version
-  version: 0.0.0.20
+  version: 0.0.24
 platform: ruby
 authors:
-- Oleh
+- imcotop
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -192,7 +192,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: test
+description: Opensearch output plugin for Fluent event collector
 email:
 - imcotop@icloud.com
 executables: []
@@ -272,7 +272,7 @@ requirements: []
 rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
-summary: test
+summary: Opensearch output plugin for Fluent event collector
 test_files:
 - test/helper.rb
 - test/plugin/datastream_template.json