fluent-plugin-vmware-log-intelligence 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21374b7d2282736b18991b81fdb7ec7aa200a0b696ba15007ceb0674670e27f1
-  data.tar.gz: 1a04df130e3016f62f71988829aec9163303ed01848078ab759bd78a85c80ebd
+  metadata.gz: 6bb5e6a75c4c18b3f33862ee57e5e07ea21407a3f1b6728962f435e9fe46c201
+  data.tar.gz: 45d0fc9bdbcda47173df89de75cb311343bf3d69a16192461032dc46480cde53
 SHA512:
-  metadata.gz: 33d87eb96bbe5119377803aab11eb1c24c27dfb8368b63c96e045177b3e64772fed645fed62ce4eb787792381786df75f34972527f7240dc977c1c5d71f4ef52
-  data.tar.gz: 36d9dfb51285104363a6bd65e7410f19d1d199e2e291213a4b8586d831c415c646fe5c552e94818bbf71e8c2aeaf34214c9506d555c669939c6b7b8e1b910622
+  metadata.gz: e373b4150896aa581c46ab9787e61c981bad42fa45189b1b134e73ca15f1e730ee511a4e74abd417936428fcbeb1b26afa9697b0d2c17ee682b6ea87711595c0
+  data.tar.gz: 9b0023ff195a46ed4cdbda009edf86e63ecdc9bb5d8e3f2d78b3b51429ff12d3f11a1d76bc081796609c0ed332d0f4c81d0bea919c2eadbc099c098a243e4e3d

data/VERSION

@@ -1 +1 @@
-2.0.7
+2.0.8

data/fluent-plugin-vmware-log-intelligence.gemspec

@@ -38,13 +38,13 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency "fluentd", ">= 0.14.20"
-  s.add_dependency "http", ">= 0.9.8"
+  s.add_dependency "http", ">= 4.0"
   s.add_dependency "myslog", "~> 0.0"
   s.add_dependency "fluent-plugin-mysqlslowquery", ">= 0.0.9"
-  s.add_development_dependency "rake", ">= 0.9.2"
-  s.add_development_dependency "bundler", ">= 1.3.4"
-  s.add_development_dependency 'test-unit', '~> 3.1.0'
-  s.add_development_dependency 'webmock', '~> 3.4.0'
+  s.add_development_dependency "rake", ">= 13.0.0"
+  s.add_development_dependency "bundler", ">= 2.4.0"
+  s.add_development_dependency 'test-unit', '~> 3.5.0'
+  s.add_development_dependency 'webmock', '~> 3.10.0'
   s.add_development_dependency 'fluent-plugin-detect-exceptions', '>= 0.0.12'
   s.add_development_dependency 'fluent-plugin-concat', '>= 2.0.0'
   s.add_development_dependency 'fluent-plugin-kubernetes_metadata_filter', '>= 2.0.0'

data/lib/fluent/plugin/http_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 VMware, Inc.
+# Copyright 2023 VMware, Inc.
 # SPDX-License-Identifier: MIT
 
 module Fluent::Plugin
@@ -20,6 +20,7 @@ module Fluent::Plugin
         :connect_timeout => open_timeout,
         :read_timeout => read_timeout
       }
+      @log.debug "VMware Log Intelligence - Timeout Options: connect timeout #{open_timeout}, read timeout #{read_timeout}"
         
       @conn = HTTP.persistent(endpoint_url)
         .headers(headers)
@@ -29,19 +30,21 @@ module Fluent::Plugin
       @last_429_time = nil
     end
 
-    def check_quota
+    def quota_reached
+      @log.debug "VMware Log Intelligence - Checking Rate Limit Quota"
       if @last_429_time
         if (Time.new - @last_429_time) < 600
-          return false
+          return true
         end
 
         @last_429_time = nil
       end
-      return true
+      return false
     end
 
     def post(data)
-      if !check_quota
+      if quota_reached
+        @log.debug "VMware Log Intelligence - Rate limit quota reached"
         return
       end
 
@@ -54,6 +57,7 @@ module Fluent::Plugin
         else
           @last_429_time = nil
         end
+        @log.debug "VMware Log Intelligence - Response code from VMware Log Intelligence: #{response.code}"
         
         if @statuses.include? response.code.to_i
           # Raise an exception so that fluent will retry based on the configurations.

data/lib/fluent/plugin/out_vmware_log_intelligence.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2013 ablagoev
-# Copyright 2018 VMware, Inc.
+# Copyright 2023 VMware, Inc.
 # SPDX-License-Identifier: MIT
 
 	
@@ -41,7 +41,7 @@ module Fluent::Plugin
     end
 
     def validate_uri(uri_string)
-      unless uri_string =~ /^#{URI.regexp}$/
+      unless uri_string =~ /^#{URI::DEFAULT_PARSER.make_regexp}$/
         fail Fluent::ConfigError, 'endpoint_url invalid'
       end
 
@@ -56,6 +56,7 @@ module Fluent::Plugin
       headers = {}
       conf.elements.each do |element|
         if @http_compress
+          @log.debug "VMware Log Intelligence Compression enabled"
           set_gzip_header(element)
         end
         if element.name == 'headers'
@@ -102,7 +103,8 @@ module Fluent::Plugin
           keys.push(key)
           key.force_encoding("utf-8")
 
-          if value.is_a?(String) 
+          if value.is_a?(String)
+            @log.debug "VMware Log Intelligence force encoding"
             value.force_encoding("utf-8")
           end
         end
@@ -130,7 +132,7 @@ module Fluent::Plugin
 
     def flatten_record(record, prefix=[])
       ret = {}
-
+      @log.debug "VMware Log Intelligence flattening record"
       case record
       when Hash
         record.each do |key, value|
@@ -170,10 +172,12 @@ module Fluent::Plugin
 
     def start
       super
+      @log.debug "Started VMware Log Intelligence Shipper.."
     end
 
     def shutdown
       super
+      @log.debug "Shutting Down VMware Log Intelligence Shipper.."
       begin
         @http_client.close if @http_client
       rescue
@@ -181,6 +185,7 @@ module Fluent::Plugin
     end
 
     def write(chunk)
+      @log.debug "VMware Log Intelligence writing message"
       is_rate_limited = (@rate_limit_msec != 0 and not @last_request_time.nil?)
       if is_rate_limited and ((Time.now.to_f - @last_request_time) * 1000.0 < @rate_limit_msec)
         @log.info('Dropped request due to rate limiting')
@@ -193,12 +198,15 @@ module Fluent::Plugin
       end
     
       if @http_compress
+        @log.debug "VMware Log Intelligence sending compressed message"
         gzip_body = Zlib::GzipWriter.new(StringIO.new)
-        gzip_body << data.to_json
+        gzip_body << Yajl.dump(data)
+        @last_request_time = Time.now.to_f
         @http_client.post(gzip_body.close.string)
-      else  
+      else
+        @log.debug "VMware Log Intelligence sending uncompressed message"
         @last_request_time = Time.now.to_f
-        @http_client.post(JSON.dump(data))
+        @http_client.post(Yajl.dump(data))
       end
     end
   end

data/test/helper.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2013 ablagoev
-# Copyright 2018 VMware, Inc.
+# Copyright 2023 VMware, Inc.
 # SPDX-License-Identifier: MIT
 
 require 'coveralls'

data/test/plugin/test_http_client.rb

@@ -10,13 +10,13 @@ class HttpClientTest < Test::Unit::TestCase
     stub_request(:post, url).to_return(:status => [429, "User out of ingestion quota."])
   end
 
-  def test_check_quota
+  def test_quota_reached
     http_client = create_http_client()
-    assert_equal http_client.check_quota, true
+    assert_equal http_client.quota_reached, false
 
     stub_server_out_of_quota
-    http_client.post(JSON.dump(sample_record()))
-    assert_equal http_client.check_quota, false
+    http_client.post(Yajl.dump(sample_record()))
+    assert_equal http_client.quota_reached, true
   end
 
   def stub_server_unavailable(url=DEFAULT_URL)
@@ -72,7 +72,7 @@ class HttpClientTest < Test::Unit::TestCase
     http_client = create_http_client()
     stub_server_returns_500
     assert_raise RuntimeError do
-      http_client.post(JSON.dump(sample_record()))
+      http_client.post(Yajl.dump(sample_record()))
     end
   end
 
@@ -80,16 +80,16 @@ class HttpClientTest < Test::Unit::TestCase
     http_client = create_http_client()
     stub_server_raise_error
     assert_raise IOError do
-      http_client.post(JSON.dump(sample_record()))
+      http_client.post(Yajl.dump(sample_record()))
     end
   end
 
   def test_post_logs
     stub_post_logs
     http_client = create_http_client()
-    http_client.post(JSON.dump(sample_record()))
+    http_client.post(Yajl.dump(sample_record()))
 
     stub_post_logs
-    http_client.post(JSON.dump(sample_record()))
+    http_client.post(Yajl.dump(sample_record()))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-vmware-log-intelligence
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Alexander Blagoev
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: myslog
   requirement: !ruby/object:Gem::Requirement
@@ -73,56 +73,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: fluent-plugin-detect-exceptions
   requirement: !ruby/object:Gem::Requirement