fluent-plugin-syslog-tls-with-backoff-test 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63360e8ba81c074c2a2e97ba6fc1992c1266a3f343be95e906ca0720c0e50ef
-  data.tar.gz: 50cd80391373d67d4df98686a15d182eb2706eef8987894356748414f65b6f70
+  metadata.gz: 472ffd61e55f71d65601e4c51cea49441d492c57e8739f7a4d7a9851d651a1a2
+  data.tar.gz: c7453eb9f6101914200bc34d772d53177b6cc415ed4a0c8bbd24be400e567c50
 SHA512:
-  metadata.gz: 8bef8e2ced5f69828b8df0e54298e1405c8353d86716277450effb68c52b5e86d8ec2da4a9681a877b196ce15daeffe9fb3cbcfbb747baf807bd5ba975bea4c9
-  data.tar.gz: 2b75cfea01bd9e1d5e85b609e49de3445d52f27e87977a85602c491179afbe2fea877c4959a124bdf1e14012ba8ebd8599f06f8750ec85754568abc9640e8a71
+  metadata.gz: 885508abe507408daf1b191e092dac11e5ab93ad64fde054bf1768b091bacb99b3f92adbf507692dbc11e6a544760c837b1eff067a27ad4d1655604b3e1a0912
+  data.tar.gz: ac388020d61421c4a8d9042be0683e1d672f4c8f13ad0a870ac177a480d77a737fb2476cffe81bb306d3ccc8776fe78b4d87e1ae48d5e0ad5ec8e11c1a438790

data/.gitignore

@@ -37,3 +37,4 @@ build/
 
 ## System
 .DS_Store
+.vscode

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-syslog-tls (2.1.0.rc1)
+    fluent-plugin-syslog-tls-with-backoff (2.1.0)
       fluentd (>= 0.14.0, < 2)
 
 GEM
@@ -9,35 +9,41 @@ GEM
   specs:
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    concurrent-ruby (1.1.10)
-    cool.io (1.7.1)
+    base64 (0.2.0)
+    concurrent-ruby (1.2.3)
+    cool.io (1.8.0)
     crack (0.4.5)
       rexml
+    csv (3.3.0)
     docile (1.4.0)
-    fluentd (1.15.3)
+    drb (2.2.1)
+    fluentd (1.17.0)
+      base64 (~> 0.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
+      csv (~> 3.2)
+      drb (~> 2.2)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.3.0, < 3.0.0)
-      sigdump (~> 0.2.2)
+      serverengine (>= 2.3.2, < 3.0.0)
+      sigdump (~> 0.2.5)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
-      webrick (>= 1.4.2, < 1.8.0)
+      webrick (~> 1.4)
       yajl-ruby (~> 1.0)
     hashdiff (1.0.1)
     http_parser.rb (0.8.0)
     minitest (5.17.0)
     minitest-stub_any_instance (1.0.3)
-    msgpack (1.6.0)
+    msgpack (1.7.2)
     power_assert (2.0.3)
     public_suffix (5.0.1)
     rake (13.0.6)
     rexml (3.2.5)
-    serverengine (2.3.1)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
-    sigdump (0.2.4)
+    sigdump (0.2.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -47,22 +53,22 @@ GEM
     strptime (0.2.5)
     test-unit (3.5.7)
       power_assert
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fluent-plugin-syslog-tls!
+  fluent-plugin-syslog-tls-with-backoff!
   minitest (~> 5.8)
   minitest-stub_any_instance (~> 1.0.0)
   rake

data/fluent-plugin-syslog-tls.gemspec

@@ -20,11 +20,11 @@ require 'syslog_tls/version'
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-syslog-tls-with-backoff-test'
   s.version       = SyslogTls::VERSION
-  s.authors       = ['thomas morgan']
-  s.email         = ['tm@iprog.com']
+  s.authors       = ['thomas morgan', 'muhammad adil ghaffar']
+  s.email         = ['tm@iprog.com', 'muhammad.sdil.ghaffar@est.tech']
   s.summary       = %q{Fluent Syslog TLS output plugin}
-  s.description   = %q{Syslog TLS output plugin with formatting support, for Fluentd}
-  s.homepage      = 'https://github.com/zarqman/fluent-plugin-syslog-tls'
+  s.description   = %q{Syslog TLS output plugin with formatting support, for Fluentd. This is cutom version backoff.}
+  s.homepage      = 'https://github.com/Nordix/fluent-plugin-syslog-tls/tree/add-expo-backoff/adil'
   s.license       = 'Apache v2'
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/plugin/out_syslog_tls.rb

@@ -16,6 +16,70 @@
 require 'socket'
 require 'syslog_tls/logger'
 require 'fluent/plugin/output'
+require 'syslog_tls/host_backoff_specs'
+require 'pp'
+
+$host_backoff_specs_list = []
+
+def add_host_backoff_spec(retries_to_do, host_ip_port)
+  # Check if an element with the same hostIPport already exists
+  return if $host_backoff_specs_list.any? { |spec| spec.hostIPport == host_ip_port }
+
+  # If not, add a new HostBackoffSpecs instance to the global array
+  $host_backoff_specs_list << ::SyslogTls::HostBackoffSpecs.new(retries_to_do, host_ip_port)
+end
+
+def can_write(host_ip_port)
+  if !conatins_host(host_ip_port)
+    add_host_backoff_spec(0, host_ip_port)
+  end
+  begin
+    $host_backoff_specs_list.each do |backoff_specs|
+      if backoff_specs.hostIPport == host_ip_port
+        return backoff_specs.canwrite
+      end
+    end
+  rescue => e
+    pp "Error in can_write: #{e.message}"
+    return 0
+  end
+  return 1
+end
+
+def increase_retry(host_ip_port)
+  if !conatins_host(host_ip_port)
+    add_host_backoff_spec(0, host_ip_port)
+  end
+  begin
+    $host_backoff_specs_list.each do |backoff_specs|
+      if backoff_specs.hostIPport == host_ip_port
+        backoff_specs.failtowrite
+      end
+    end
+  rescue => e
+    pp "Error in increase_retry: #{e.message}"
+  end
+end
+
+def reset_tries(host_ip_port)
+  if !conatins_host(host_ip_port)
+    add_host_backoff_spec(0, host_ip_port)
+  end
+  $host_backoff_specs_list.each do |backoff_specs|
+    if backoff_specs.hostIPport == host_ip_port
+      backoff_specs.resetRetries
+    end
+  end
+end
+
+def conatins_host(host_ip_port)
+  $host_backoff_specs_list.each do |backoff_specs|
+    if backoff_specs.hostIPport == host_ip_port
+      return true
+    end
+  end
+  return false
+end
 
 module Fluent::Plugin
   class SyslogTlsOutput < Output
@@ -82,6 +146,8 @@ module Fluent::Plugin
         @mappings[key_name] = conf[conf_key] if conf.key?(conf_key)
       end
 
+      add_host_backoff_spec(0, conf['host']+":"+conf['port'])
+
       @formatter = formatter_create(conf: conf.elements('format').first, default_type: DEFAULT_FORMAT_TYPE)
     end
 

data/lib/syslog_tls/host_backoff_specs.rb

@@ -0,0 +1,48 @@
+require 'pp'
+
+module SyslogTls
+  class HostBackoffSpecs
+    attr_accessor :retriesToDo, :hostIPport
+
+    def initialize(retries_to_do, host_ip_port)
+      @retriesToDo = retries_to_do
+      @hostIPport = host_ip_port
+      @failTime = nil
+      @baseThreshold = 2
+    end
+
+    def canwrite
+      time_passed_since_failure = -1
+      if @failTime != nil
+        pp "canwrite :: @failTime != nil :: retriesToDo :: " + @retriesToDo.to_s + " failTime :: " + @failTime.to_s
+        time_passed_since_failure = Time.now - @failTime
+        time_passed_since_failure = time_passed_since_failure.round(2)
+      end
+      if time_passed_since_failure == -1
+        return 1
+      end
+      backoffTime = @baseThreshold ** @retriesToDo
+      if backoffTime > 1800
+        backoffTime = 1800
+      end
+      if time_passed_since_failure > backoffTime
+        pp "canwrite writting after backoff :: time_passed_since_failure" + time_passed_since_failure.to_s + " time :: " + Time.now.to_s
+        return 1
+      else
+        return 0
+      end
+    end
+
+    def failtowrite
+      @retriesToDo += 1
+      @failTime = Time.now
+      pp "failtowrite :: retriesToDo :: " + @retriesToDo.to_s + " failTime :: " + Time.now.to_s
+    end
+
+    def resetRetries
+      @retriesToDo = 0
+      @failTime = nil
+      pp "resetRetries :: retriesToDo :: " + @retriesToDo.to_s + " failTime :: " + @failTime.to_s
+    end
+  end
+end

data/lib/syslog_tls/ssl_transport.rb

@@ -15,6 +15,7 @@
 
 require 'socket'
 require 'openssl'
+require 'pp'
 
 module SyslogTls
   # Supports SSL connection to remote host
@@ -43,6 +44,7 @@ module SyslogTls
     end
 
     def connect
+      timwnow = Time.now
       @socket = get_ssl_connection
       begin
         begin
@@ -50,6 +52,7 @@ module SyslogTls
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
           select_with_timeout(@socket, :connect_read) && retry
         rescue IO::WaitWritable
+          pp "connect :: select_with_timeout(@socket, :connect_write) && retry  time :: " + Time.now.to_s
           select_with_timeout(@socket, :connect_write) && retry
         end
       rescue Errno::ETIMEDOUT
@@ -73,6 +76,7 @@ module SyslogTls
         tcp.setsockopt(Socket::SOL_SOCKET, Socket::Constants::SO_REUSEPORT, true)
         tcp.connect_nonblock(sock_addr)
       rescue Errno::EINPROGRESS
+        pp "get_tcp_connection ::  select_with_timeout(tcp, :connect_write)  time :: " + Time.now.to_s
         select_with_timeout(tcp, :connect_write)
         begin
           tcp.connect_nonblock(sock_addr)
@@ -156,6 +160,7 @@ module SyslogTls
           if e.is_a?(OpenSSL::SSL::SSLError) && e.message !~ /write would block/
             raise e
           else
+            pp "do_write :: select_with_timeout(@socket, :write)  time :: " + Time.now.to_s
             select_with_timeout(@socket, :write) && retry
           end
         end
@@ -166,6 +171,9 @@ module SyslogTls
     end
 
     def select_with_timeout(tcp, type)
+      host_ip_port = host + ":" + port.to_s
+      pp "select_with_timeout :: time :: " + Time.now.to_s + " :: host_ip_port :: " + host_ip_port
+      pp "select_with_timeout :: type :: " + type.to_s
       case type
       when :connect_read
         args = [[tcp], nil, nil, CONNECT_TIMEOUT]
@@ -178,7 +186,25 @@ module SyslogTls
       else
         raise "Unknown select type #{type}"
       end
-      IO.select(*args) || raise("Socket timeout during #{type}")
+      if type.to_s == "connect_write"
+        pp "select_with_timeout :: if :: time :: " + Time.now.to_s + " :: host_ip_port :: " + host_ip_port
+        if can_write(host_ip_port) == 1
+          io_select_return = IO.select(*args)
+          ready_sockets, _, _ = io_select_return
+          if !ready_sockets.empty?
+            reset_tries(host_ip_port)
+            io_select_return
+          else
+            increase_retry(host_ip_port)
+            io_select_return || raise("Socket timeout during #{type}")
+          end
+        # else
+        #   raise("Failed to write #{type}")
+        end
+      else
+        pp "select_with_timeout :: else :: time :: " + Time.now.to_s + " :: host_ip_port :: " + host_ip_port
+        IO.select(*args) || raise("Socket timeout during #{type}")
+      end
     end
 
     # Forward any methods directly to SSLSocket

data/lib/syslog_tls/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module SyslogTls
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-tls-with-backoff-test
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - thomas morgan
+- muhammad adil ghaffar
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -114,9 +115,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-description: Syslog TLS output plugin with formatting support, for Fluentd
+description: Syslog TLS output plugin with formatting support, for Fluentd. This is
+  cutom version backoff.
 email:
 - tm@iprog.com
+- muhammad.sdil.ghaffar@est.tech
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -134,6 +137,7 @@ files:
 - fluent-plugin-syslog-tls.gemspec
 - lib/fluent/plugin/out_syslog_tls.rb
 - lib/syslog_tls/facility.rb
+- lib/syslog_tls/host_backoff_specs.rb
 - lib/syslog_tls/logger.rb
 - lib/syslog_tls/lookup_from_const.rb
 - lib/syslog_tls/protocol.rb
@@ -146,7 +150,7 @@ files:
 - test/syslog_tls/test_logger.rb
 - test/syslog_tls/test_protocol.rb
 - test/syslog_tls/test_ssl_transport.rb
-homepage: https://github.com/zarqman/fluent-plugin-syslog-tls
+homepage: https://github.com/Nordix/fluent-plugin-syslog-tls/tree/add-expo-backoff/adil
 licenses:
 - Apache v2
 metadata: {}