fluent-plugin-http 0.4.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b6e59ff949dc9a5eeaa20178dadde90230e5d9d
-  data.tar.gz: 7d4f41c91f080e8200fdefbb846e15bd40520c39
+SHA256:
+  metadata.gz: 6618d3e9884d9b348147b57d84d2c13554ae87b323e1aa784cb5c3bf062e3ae7
+  data.tar.gz: a58e2cdd0e07ac75f929a74263d96e0848a5f2cab12e090d3b7aa7c04b9e50da
 SHA512:
-  metadata.gz: b4fdcc6ed77484081155defb69c1e8bbe443e2f47f77e5990c58ab46d3c5d9b02117fbbd8e60a8579037ae125f5c690e8f44cb4e45fb0911a1c28fe2ccd42e34
-  data.tar.gz: 637a4e31b5d14826981a4b34af799c56c53866abffb570d63443535538da1957cd9afb7f3892aa745d379a187baa1d564d2dd49cc463e58c560d4ae7e2c765c8
+  metadata.gz: 936fce15231ac524bc19bb872e4591137a0139d6b858d77f96499b7b2041942206e3d39f758d0d49f1723ad435bc42262390ad2a7a1ed3a3d04ce2b1a52c03cd
+  data.tar.gz: 7fcebcb3aadf1d406e51a05d303490ebae5758f6df70bc777200aade4b2cf01c9aeb68b6610519f864e1a27fdd21b042910194de7e600ef005c8c4132876c647

data/lib/fluent/plugin/out_http.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'fluent/output'
-require 'uri'
 require 'net/http'
-require 'json'
+require 'oj'
+require 'uri'
 
 # Fluentd
 module Fluent
   # The out_http buffered output plugin sends event records via HTTP.
-  class HTTPOutput < ObjectBufferedOutput
+  class HTTPOutput < ObjectBufferedOutput # rubocop:disable Metrics/ClassLength
     Fluent::Plugin.register_output('http', self)
 
     desc 'URL to send event records to'
@@ -20,6 +20,15 @@ module Fluent
     desc 'Authorization token'
     config_param :authorization_token, :string, default: nil, secret: true
 
+    desc 'Keep-alive timeout'
+    config_param :keep_alive_timeout, :float, default: 60.0
+
+    desc 'Basic auth username'
+    config_param :username, :string, default: nil
+
+    desc 'Basic auth password'
+    config_param :password, :string, default: nil, secret: true
+
     def initialize
       require 'fluent/plugin/http/error'
 
@@ -36,16 +45,9 @@ module Fluent
       @url = validate_url(url)
       @accept_status_code = validate_accept_status_code(accept_status_code)
       @authorization_token = validate_authorization_token(authorization_token)
-    end
-
-    # Hook method that is called at the startup
-    #
-    # @return void
-    def start
-      super
-
-      is_https = url.scheme == 'https'
-      @http = Net::HTTP.start(url.host, url.port, use_ssl: is_https)
+      @keep_alive_timeout = validate_keep_alive_timeout(keep_alive_timeout)
+      @username = validate_username(username)
+      @password = validate_password(password)
     end
 
     # Hook method that is called at the shutdown
@@ -54,7 +56,7 @@ module Fluent
     def shutdown
       super
 
-      http.finish
+      disconnect
     end
 
     # Serializes the event
@@ -73,6 +75,8 @@ module Fluent
     #   formatted events
     # @return void
     def write(chunk)
+      return if chunk.empty?
+
       records = []
 
       chunk.msgpack_each do |tag_time_record|
@@ -80,30 +84,43 @@ module Fluent
       end
 
       post_records = post_records_request(records)
-      response = http.request(post_records)
+      response = connect.request(post_records)
 
       return if accept_status_code.include?(response.code)
+
       raise ResponseError.error(post_records, response)
     end
 
     private
 
-    attr_reader :http
+    def connect
+      @http ||= Net::HTTP.start(
+        url.host,
+        url.port,
+        use_ssl: url.scheme == 'https',
+        keep_alive_timeout: keep_alive_timeout
+      )
+    end
 
-    JSON_MIME_TYPE = 'application/json'
-    USER_AGENT = 'FluentPluginHTTP'
+    def disconnect
+      return unless defined?(@http)
+      return unless @http
 
-    private_constant :USER_AGENT, :JSON_MIME_TYPE
+      @http.finish
+    end
 
     def post_records_request(records)
       Net::HTTP::Post.new(url).tap do |request|
-        request.body = JSON.dump(records)
-        request.content_type = JSON_MIME_TYPE
-        request['User-Agent'] = USER_AGENT
+        request.body = Oj.dump(records)
+
+        request.content_type = 'application/json'
+        request['User-Agent'] = 'FluentPluginHTTP'
 
         if authorization_token
           request['Authorization'] = "Token token=#{authorization_token}"
         end
+
+        request.basic_auth(username, password) if username
       end
     end
 
@@ -113,8 +130,8 @@ module Fluent
 
       raise Fluent::ConfigError,
             "Unacceptable URL scheme, expected HTTP or HTTPs: #{test_url}"
-    rescue URI::InvalidURIError => invalid_uri_error
-      raise Fluent::ConfigError, invalid_uri_error
+    rescue URI::InvalidURIError => e
+      raise Fluent::ConfigError, e
     end
 
     def validate_accept_status_code(status_codes)
@@ -138,5 +155,30 @@ module Fluent
 
       raise Fluent::ConfigError, "Invalid authorization token: #{value.inspect}"
     end
+
+    def validate_keep_alive_timeout(value)
+      return value if value >= 0
+
+      raise Fluent::ConfigError, "Invalid keep-alive timeout: #{value.inspect}"
+    end
+
+    def validate_username(value)
+      return value if value.nil?
+
+      if authorization_token
+        raise Fluent::ConfigError,
+              'Mutually exclusive: authorization_token and username'
+      end
+
+      return value unless value.empty?
+
+      raise Fluent::ConfigError, "Invalid username: #{value.inspect}"
+    end
+
+    def validate_password(value)
+      return value if value.nil? || username
+
+      raise Fluent::ConfigError, 'Password requires a username'
+    end
   end
 end

metadata

@@ -1,143 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Konstantin
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDGjCCAgKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDDA9lZmly
+  L0RDPXNveWxlbnQwHhcNMjAwMzA3MDEzNzUwWhcNMjEwMzA3MDEzNzUwWjAaMRgw
+  FgYDVQQDDA9lZmlyL0RDPXNveWxlbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+  ggEKAoIBAQC2DMbzgA39U+3VTMjXn+0jnOQyLdmXQ5EXgSLKCgBLIcFTc9J47Th0
+  7Yb/f4RzWh49/EkDBiDtLqFeKBYsj3q0e8tRCAs32NtVyl/4FDyJvWsK3R2tcXOV
+  qxs48J3CgG+rFLOcMC9YF4FPTkz4p3EYGFVjZTbiqyVVuIZzWtrwdZesBVgpBRyN
+  8sEyNoi8vcDiOmEwf9/TVMTDf/wu6a+i3LNVGYWlvgMJRssaAnj/IbFFtPTz30Hx
+  eTUdfJu8YbwRspfFzcJGLf32E7vXfmHHqNzqjh4zD9sVpvTHbqLLsgVa+nYHPHAe
+  dzSZ5gZjG1oZ7hZDCJoEPj0oCHT0qkuXAgMBAAGjazBpMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBSsvp1HAfA+QTjOg/ehyhv7adp0FjAXBgNVHREE
+  EDAOgQxlZmlyQHNveWxlbnQwFwYDVR0SBBAwDoEMZWZpckBzb3lsZW50MA0GCSqG
+  SIb3DQEBCwUAA4IBAQBsJ7htnm3RB5xQwzC2agRAgG2ax5uaD6lCEPWshGJbfT6v
+  jaRrwrPSbaxBTD2v8QpXJe/fALJKWHUbNZilZU2t7HyQkfSyVQyLYcjo7lWFoHA1
+  z0YB3dCGcMkvLa7r73ynEtYbnYfesbXVlcRJG7SgJqWvZMnj1HnYfBevlcjSBFy2
+  5xZKSwreHM+va8McxpEZmG3ecdefRQ1u+xZabamN2hhel3nKF1BUBqgxYWXYRkZP
+  VIAqJBK/gwFlRxVYjmi2w4Ouc4wL8HtX104yQqOuD9gVPN6PJecue66As7i2I/2q
+  EARmnubhy24GUdxEooHV6pOs1mLLRuFepMgBnHfs
+  -----END CERTIFICATE-----
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '3.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
-description: 
-email: 
+        version: '2.1'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/fluent/plugin/http/error.rb
 - lib/fluent/plugin/out_http.rb
-homepage: 
+homepage: https://github.com/soylent/fluent-plugin-http
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Fluentd output plugin that sends event records via HTTP
 test_files: []

metadata.gz.sig

@@ -0,0 +1 @@
+'?tXs�����y�=�oUMI���]r`�B�*%'.����<���Բ��D��Η̃l^