Use Net::HTTP + fix msgpack string encoding (#1)

* 🚧 Use native HTTP client

* 🐛 Fix msgpack string encoding

* 📦 Bump version. number

Author: simonrozsival

fluent-plugin-logtail.gemspec

@@ -3,7 +3,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-logtail'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.date        = Date.today.to_s
   s.summary     = 'Logtail.com plugin for Fluentd'
   s.description = 'Streams Fluentd logs to the Logtail.com logging service.'
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 2.4.0".freeze)
 
   s.add_runtime_dependency('fluentd', '> 1', '< 2')
-  s.add_runtime_dependency('http', '~> 2.0', '>= 2.0.3')
 
   s.add_development_dependency('rspec', '~> 3.4')
   s.add_development_dependency('test-unit', '~> 3.3.9')

lib/fluent/plugin/out_logtail.rb

@@ -1,44 +1,29 @@
 require 'fluent/output'
+require 'net/https'
 
 module Fluent
   class LogtailOutput < Fluent::BufferedOutput
     Fluent::Plugin.register_output('logtail', self)
 
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.1".freeze
     CONTENT_TYPE = "application/msgpack".freeze
-    HOST = "https://in.logtail.com".freeze
+    HOST = "in.logtail.com".freeze
+    PORT = 443
     PATH = "/".freeze
     MAX_ATTEMPTS = 3.freeze
     RETRYABLE_CODES = [429, 500, 502, 503, 504].freeze
-    USER_AGENT = "Logtail Logstash/#{VERSION}".freeze
+    USER_AGENT = "Logtail Fluentd/#{VERSION}".freeze
 
     config_param :source_token, :string, secret: true
     config_param :ip, :string, default: nil
 
     def configure(conf)
-      source_token = conf["source_token"]
-      @headers = {
-        "Authorization" => "Bearer #{source_token}",
-        "Content-Type" => CONTENT_TYPE,
-        "User-Agent" => USER_AGENT
-      }
-      super
-    end
-
-    def start
-      super
-      require 'http'
-      HTTP.default_options = {:keep_alive_timeout => 29}
-      @http_client = HTTP.persistent(HOST)
-    end
-
-    def shutdown
-      @http_client.close if @http_client
+      @source_token = conf["source_token"]
       super
     end
 
     def format(tag, time, record)
-      record.merge("dt" => Time.at(time).utc.iso8601).to_msgpack
+      force_utf8_string_values(record.merge("dt" => Time.at(time).utc.iso8601)).to_msgpack
     end
 
     def write(chunk)
@@ -52,11 +37,19 @@ def deliver(chunk, attempt)
           return false
         end
 
+        http = build_http_client
         body = chunk.read
-        response = @http_client.headers(@headers).post(PATH, body: body)
-        response.flush
-        code = response.code
 
+        begin
+          resp = http.start do |conn|
+            req = build_request(body)
+            conn.request(req)
+          end
+        ensure
+          http.finish if http.started?
+        end
+
+        code = resp.code.to_i
         if code >= 200 && code <= 299
           true
         elsif RETRYABLE_CODES.include?(code)
@@ -76,5 +69,38 @@ def sleep_for_attempt(attempt)
         sleep_for = sleep_for <= 60 ? sleep_for : 60
         (sleep_for / 2) + (rand(0..sleep_for) / 2)
       end
+
+      def force_utf8_string_values(data)
+        data.transform_values do |val|
+          if val.is_a?(Hash)
+            force_utf8_string_values(val)
+          elsif val.respond_to?(:force_encoding)
+            val.force_encoding('UTF-8')
+          else
+            val
+          end
+        end
+      end
+
+      def build_http_client
+        http = Net::HTTP.new(HOST, PORT)
+        http.use_ssl = true
+        # Verification on Windows fails despite having a valid certificate.
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.read_timeout = 30
+        http.ssl_timeout = 10
+        http.open_timeout = 10
+        http
+      end
+
+      def build_request(body)
+        path = '/'
+        req = Net::HTTP::Post.new(path)
+        req["Authorization"] = "Bearer #{@source_token}"
+        req["Content-Type"] = CONTENT_TYPE
+        req["User-Agent"] = USER_AGENT
+        req.body = body
+        req
+      end
   end
 end

spec/fluent/plugin/out_logtail_spec.rb

@@ -32,9 +32,9 @@ def format(tag, time, record)
       stub = stub_request(:post, "https://in.logtail.com/").
         with(
           :body => start_with("\x85\xA3age\x1A\xAArequest_id\xA242\xA9parent_id\xA6parent\xAArouting_id\xA7routing\xA2dt\xB4".force_encoding("ASCII-8BIT")),
-          :headers => {'Authorization'=>'Bearer abcd1234', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Logstash/0.1.0'}
+          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Fluentd/0.1.1'}
         ).
-        to_return(:status => 200, :body => "", :headers => {})
+        to_return(:status => 202, :body => "", :headers => {})
 
       driver.emit(record)
       driver.run