fluent-plugin-logzio 0.0.21 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b850642fbf62e80b5033d03300ea4cbb3e600484836ae411877546785182a3
-  data.tar.gz: 2a40dc72118892e5bdf8bbf2becf44e6e2bf8688470034ae0152fb918b05a481
+  metadata.gz: de65dcc352aca420ba2469b1c31c0c3f135309b7728d501ca1eb27e09259e322
+  data.tar.gz: b92016ff7b59405e6e9d45b24ae87fb0d60d396b06bc6ae81b681991d45a56ea
 SHA512:
-  metadata.gz: b98047acec6ffededc5c44f22ac3f2b451da2fc5c3b6a9d0b32f7d1e1a5e838f06c5ab1cdb4754f30500817a74bfebcbf0e92d1583b14d48f085ce348a203e7b
-  data.tar.gz: c05ed2eb34bd102938d8b00708ffa6ac0978b5420d46001925dcf0a9042e9b46ec14868b42b6396eb0c0be80663d81579186c58ed1fb2650643bd6ce52f10fa1
+  metadata.gz: f167bd4d0d6c60612dff909d2490d734808eb07894c7396af321351ae741c8fc9b60193209ff92819a50f74089c4d72f91bf24393e27f74a2da3246fef22d5a3
+  data.tar.gz: ccb0be4ca90d64ac4626adc6efbc05f46fde74bad6b505535c298f6b824a6e4e8d349a21128cddd211c212f730f9501c75b76c5f9c02efed096ea05e44a967de

data/.pre-commit-config.yaml

@@ -0,0 +1,8 @@
+repos:
+  - repo: https://github.com/cycodehq-public/cycode-cli
+    rev: 0.1.6
+    hooks:
+      - id: cycode
+        language_version: python3
+        stages:
+          - commit

data/README.md

@@ -69,12 +69,15 @@ This is an **example** only. Your needs in production may vary!
 * **retry_sleep** How long to sleep initially between retries, exponential step-off. Initial default is 2s.
 * **bulk_limit** Limit to the size of the Logz.io upload bulk. Defaults to 1000000 bytes leaving about 24kB for overhead.
 * **bulk_limit_warning_limit** Limit to the size of the Logz.io warning message when a record exceeds bulk_limit to prevent a recursion when Fluent warnings are sent to the Logz.io output.  Defaults to nil (no truncation).
-* **proxy_uri** Your proxy uri. Default is nil
+* **proxy_uri** Your proxy uri. Default is nil. For example: "`my.ip:12345`".
 * **proxy_cert** Your proxy cert. Default is nil
 * **gzip** should the plugin ship the logs in gzip compression. Default is false
 
 
 ## Release Notes
+- **0.1.0**:
+  - Use fluentd's retry instead of retry in code (raise exception on non-2xx response).
+- 0.0.22: Update gem `net-http-persistent` to 4.x.
 - 0.0.21: Update gem `net-http-persistent` to 3.x.
 - 0.0.20: Support gzip compression
 - 0.0.18: Support proxy_uri and proxy_cert in the configuration file. Put logzio output plugin class under Fluent::Plugin module and thus work with multi workers.

data/fluent-plugin-logzio.gemspec

@@ -4,8 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-logzio'
-  s.version     = '0.0.21'
-  s.authors     = ['Yury Kotov', 'Roi Rav-Hon', 'Arcadiy Ivanov', 'Miri Ignatiev']
+  s.version     = '0.1.0'
+  s.authors     = ['Yury Kotov', 'Roi Rav-Hon', 'Arcadiy Ivanov', 'Miri Bar']
   s.email       = ['bairkan@gmail.com', 'roi@logz.io', 'arcadiy@ivanov.biz', 'miri.ignatiev@logz.io']
   s.homepage    = 'https://github.com/logzio/fluent-plugin-logzio'
   s.summary     = %q{Fluentd plugin for output to Logz.io}
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = Gem::Requirement.new('>= 2.1.0')
 
-  s.add_dependency 'net-http-persistent', '~> 3.0'
+  s.add_dependency 'net-http-persistent', '~> 4.0'
   s.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 2']
   s.add_development_dependency 'rake', '~> 12.3'
   s.add_development_dependency 'bundler', '~> 1.16'

data/lib/fluent/plugin/out_logzio_buffered.rb

@@ -131,45 +131,21 @@ module Fluent::Plugin
       if gzip
         post.body = compress(post.body)
       end
-      sleep_interval = @retry_sleep
 
       begin
-        @retry_count.times do |counter|
-          should_retry = true
-          begin
-            response = @http.request @uri, post
-            if response.code != '200'
-              if response.code == '401'
-                log.error "You are not authorized with Logz.io! Token OK? dropping logs..."
-                should_retry = false
-              elsif response.code == '400'
-                log.info "Got 400 code from Logz.io. This means that some of your logs are too big, or badly formatted. Response: #{response.body}"
-                should_retry = false
-              else
-                log.warn "Got HTTP #{response.code} from Logz.io, not giving up just yet (Try #{counter + 1}/#{@retry_count})"
-              end
-            else
-              log.debug "Successfully sent bulk of #{bulk_records.size} records, size #{bulk_size}B to Logz.io"
-              should_retry = false
-            end
-          rescue StandardError => e
-            log.warn "Error connecting to Logz.io. Got exception: #{e} (Try #{counter + 1}/#{@retry_count})"
-          end
+        response = @http.request @uri, post
+        rescue Net::HTTP::Persistent::Error => e
+          raise e.cause
+      end
 
-          if should_retry
-            if counter == @retry_count - 1
-              log.error "Could not send your bulk after #{retry_count} tries Sorry! Your bulk is: #{post.body}"
-              break
-            end
-            sleep(sleep_interval)
-            sleep_interval *= 2
-          else
-            return
-          end
-        end
-      rescue Exception => e
-        log.error "Got unexpected exception! Here: #{e}"
+      resp_err = response.code.to_s.start_with?('4') || response.code.to_s.start_with?('5')
+
+      if not response.code.start_with?('2')
+        log.debug "Failed request body: #{post.body}"
+        log.error "Error while sending POST to #{@uri}: #{response.body}"
       end
+
+      raise "Logzio listener returned (#{response.code}) for #{@uri}:  #{response.body}" if resp_err
     end
 
     def compress(string)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logzio
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.1.0
 platform: ruby
 authors:
 - Yury Kotov
 - Roi Rav-Hon
 - Arcadiy Ivanov
-- Miri Ignatiev
+- Miri Bar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".pre-commit-config.yaml"
 - ".rspec"
 - ".whitesource"
 - Gemfile
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin for output to Logz.io