fluent-plugin-barito 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dddd5d0082d68458cba7621f2f4c01d0ed7f1fed479de55af65acd9b1e5f40be
-  data.tar.gz: e117c347df66acd103f72bb850cb882b5ab35391f1fecf947d68734636f39597
+  metadata.gz: ecf8a3646e7930f83602324b333be4399b4995455f061fa92c4a059b7e054c1d
+  data.tar.gz: f0abcd3652ba0ddbe029f59ed24332a87102bb2971a017577332418df60a9ffd
 SHA512:
-  metadata.gz: ace5ec573a0aca28a58f06ebd1406050a6989d317219441a7cf0a962510e2d745dae06219e469f6adf5ad78a2c3da0ce6b80df44a15c3e89fd53f6e960cd61d5
-  data.tar.gz: 4dd29b131547cd237c28f57a5f4c87a0223cb296e5381965f88dd07b750c83e8eecff3e77337ba8e777649ad822f4db4d4fc7b73d8578d94b2b029be0ec7618a
+  metadata.gz: cb971966ecb6feff749865a6cea6c5bdc812bb104fe2a6fa8a99aebf0711dae35268dd9066ffe1206794322484611351a47989b022a88e54648d1c84e947448c
+  data.tar.gz: a54188a399d3958707511c178b0555b24102965f181e39e0d421f8498532a2ff3ff39cfd76a101a6f7c6245725fdffaecf1317d50393af5374953c349ae0c95e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+**0.3.3**
+
+- Print verbose error on logs when receiving failed response from the server
+
 **0.3.2**
 
 - Handle batch produce (from k8s)

data/fluent-plugin-barito.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-barito"
-  spec.version = "0.3.2"
+  spec.version = "0.3.3"
   spec.authors = ["BaritoLog"]
   spec.email   = ["pushm0v.development@gmail.com", "iman.tung@gmail.com"]
 
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0'
   spec.add_development_dependency 'coveralls', '~> 0.8.21'
   spec.add_development_dependency 'test-unit', '~> 3.2'
+  spec.add_development_dependency 'webmock', '~> 3.4'
 
   spec.add_runtime_dependency "fluentd", "~> 0.12", ">= 0.12.0"
   spec.add_runtime_dependency "rest-client", "~> 2"

data/lib/fluent/plugin/barito_transport.rb

@@ -0,0 +1,20 @@
+require 'rest-client'
+
+class Fluent::Plugin::BaritoTransport
+
+  attr_accessor :produce_url, :logger
+
+  def initialize(produce_url, logger)
+    @produce_url = produce_url
+    @logger = logger
+  end
+
+  def send(timber, header)
+    begin
+      RestClient.post @produce_url, timber.to_json, header
+    rescue Exception => e
+      @logger.error [e.message, e.response, header].join(', ')
+    end
+  end
+
+end

data/lib/fluent/plugin/out_barito_batch_k8s.rb

@@ -1,7 +1,7 @@
 require 'fluent/output'
-require 'rest-client'
 require_relative 'barito_timber'
 require_relative 'barito_client_trail'
+require_relative 'barito_transport'
 
 module Fluent
   class BaritoBatchK8sOutput < BufferedOutput
@@ -30,6 +30,8 @@ module Fluent
       data = {
         'items' => []
       }
+
+      transport = Fluent::Plugin::BaritoTransport.new(@produce_url, log)
       chunk.msgpack_each do |tag, time, record|
 
         # Kubernetes annotations
@@ -62,7 +64,7 @@ module Fluent
         header = {content_type: :json, 'X-App-Secret' => @application_secret}
       end
 
-      response = RestClient.post @produce_url, data.to_json, header
+      transport.send(data, header)
     end
 
     def clean_attribute(record)

data/lib/fluent/plugin/out_barito_batch_vm.rb

@@ -1,7 +1,7 @@
 require 'fluent/output'
-require 'rest-client'
 require_relative 'barito_timber'
 require_relative 'barito_client_trail'
+require_relative 'barito_transport'
 
 module Fluent
   class BaritoBatchVMOutput < BufferedOutput
@@ -30,6 +30,7 @@ module Fluent
       data = {
         'items' => []
       }
+      transport = Fluent::Plugin::BaritoTransport.new(@produce_url, log)
       chunk.msgpack_each do |tag, time, record|
         trail = Fluent::Plugin::ClientTrail.new(false)
         timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
@@ -48,7 +49,7 @@ module Fluent
         header = {content_type: :json, 'X-App-Secret' => @application_secret}
       end
 
-      response = RestClient.post @produce_url, data.to_json, header
+      transport.send(data, header)
     end
   end
 end

data/lib/fluent/plugin/out_barito_k8s.rb

@@ -1,7 +1,7 @@
 require 'fluent/output'
-require 'rest-client'
 require_relative 'barito_timber'
 require_relative 'barito_client_trail'
+require_relative 'barito_transport'
 
 module Fluent
   class BaritoK8sOutput < BufferedOutput
@@ -53,6 +53,7 @@ module Fluent
         end
 
         record = clean_attribute(record)
+        transport = Fluent::Plugin::BaritoTransport.new(url, log)
         trail = Fluent::Plugin::ClientTrail.new(true)
         timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
         new_timber = merge_log_attribute(timber)
@@ -65,7 +66,7 @@ module Fluent
           'host' => k8s_metadata['host']
         }
 
-        RestClient.post url, new_timber.to_json, header
+        transport.send(new_timber, header)
       end
     end
 

data/lib/fluent/plugin/out_barito_vm.rb

@@ -1,7 +1,7 @@
 require 'fluent/output'
-require 'rest-client'
 require_relative 'barito_timber'
 require_relative 'barito_client_trail'
+require_relative 'barito_transport'
 
 module Fluent
   class BaritoVMOutput < BufferedOutput
@@ -28,6 +28,7 @@ module Fluent
     # Overide from BufferedOutput
     def write(chunk)
       chunk.msgpack_each do |tag, time, record|
+        transport = Fluent::Plugin::BaritoTransport.new(@produce_url, log)
         trail = Fluent::Plugin::ClientTrail.new(false)
         timber = Fluent::Plugin::TimberFactory::create_timber(tag, time, record, trail)
 
@@ -41,8 +42,7 @@ module Fluent
         else
           header = {content_type: :json, 'X-App-Secret' => @application_secret}
         end
-
-        RestClient.post @produce_url, timber.to_json, header
+        transport.send(timber, header)
       end
     end
   end

data/spec/lib/fluent/plugin/barito_transport_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'fluent/engine'
+require 'fluent/log'
+
+describe 'Fluent::Plugin::BaritoTransport' do
+  describe 'send' do
+    context 'exception' do
+      let(:user_agent) { 'Barito' }
+      let(:log) { Fluent::Test::DummyLogDevice.new }
+      let(:logger) { ServerEngine::DaemonLogger.new(log) }
+
+      it 'produce log' do
+        mock_host = 'localhost-not-exist'
+        uri_string = "http://#{mock_host}/"
+        stub_request(:post, uri_string).
+            with(
+                headers: {
+                    'Accept'=> '*/*',
+                    'Host'=> mock_host,
+                    'User-Agent'=>user_agent
+                }).
+            to_return(status: 404, body: "not-exist", headers: {'User-Agent': user_agent })
+
+        transport = Fluent::Plugin::BaritoTransport.new(uri_string, logger)
+        expect(logger).to receive(:error).with("404 Not Found, not-exist, {:\"User-Agent\"=>\"#{user_agent}\"}")
+        transport.send({},{'User-Agent': user_agent})
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -117,5 +117,7 @@ RSpec.configure do |config|
   require 'fluent/plugin/out_barito_batch_k8s'
   require 'fluent/plugin/barito_client_trail'
   require 'fluent/plugin/barito_timber'
+  require 'fluent/plugin/barito_transport'
   require 'timecop'
+  require 'webmock/rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-barito
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - BaritoLog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -162,11 +176,13 @@ files:
 - fluent-plugin-barito.gemspec
 - lib/fluent/plugin/barito_client_trail.rb
 - lib/fluent/plugin/barito_timber.rb
+- lib/fluent/plugin/barito_transport.rb
 - lib/fluent/plugin/out_barito_batch_k8s.rb
 - lib/fluent/plugin/out_barito_batch_vm.rb
 - lib/fluent/plugin/out_barito_k8s.rb
 - lib/fluent/plugin/out_barito_vm.rb
 - spec/lib/fluent/plugin/barito_timber_spec.rb
+- spec/lib/fluent/plugin/barito_transport_spec.rb
 - spec/lib/fluent/plugin/out_barito_batch_k8s_spec.rb
 - spec/lib/fluent/plugin/out_barito_k8s_spec.rb
 - spec/spec_helper.rb
@@ -196,6 +212,7 @@ specification_version: 4
 summary: Fluentd output plugin for BaritoLog
 test_files:
 - spec/lib/fluent/plugin/barito_timber_spec.rb
+- spec/lib/fluent/plugin/barito_transport_spec.rb
 - spec/lib/fluent/plugin/out_barito_batch_k8s_spec.rb
 - spec/lib/fluent/plugin/out_barito_k8s_spec.rb
 - spec/spec_helper.rb