fluent-plugin-elb-access-log 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d58c50d53bc1439025b341a16b9074e0c6f58f
-  data.tar.gz: 54795fa12a9d1cf36bb74b1900f978e864201a4c
+  metadata.gz: 68de9fd1d38e805c278098de81d3b3e188a2c80c
+  data.tar.gz: 73a076c5d9e5c89b1d863e9bcbdd154347f616c7
 SHA512:
-  metadata.gz: 01be0d13bf848cee3166281aba86466b4c694c72d8134642a3af5792fd759aeb6a94a95ae1f9c00c00c9b42db66f5406a46bda5e273fd2b61d43dd6f62bbab60
-  data.tar.gz: f286515bbee08eef05c9f796b00c678a05d820722e395273ed36f8d104e57ce19d3d0007c92ac85142f9a00a5ce8edb096f38d814ce13da32e5d91c39a436b3f
+  metadata.gz: 43b6f515b2fbf176e4fc5c214d7bac53b379c0e30b1d3133ce627a00fd67035e093fac5a505db322f54d1185b756d80e80f4fa0d4051d8e824644767f02794be
+  data.tar.gz: d77132f90688bbec203f347a03da69ffe6c3bf0147055d4362a0266e7275386da27c31e2df7aa7af6e42d6481f32515e192f0f077ac61981e7e31bd4739ce792

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -221,7 +221,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
   def split_address_port!(record, prefix)
     address_port = record["#{prefix}_port"]
     return unless address_port
-    address, port = record["#{prefix}_port"].split(':', 2)
+    address, port = address_port.split(':', 2)
     record[prefix] = address
     record["#{prefix}_port"] = port.to_i
   end

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/in_elb_access_log_spec.rb

@@ -499,6 +499,22 @@ describe Fluent::ElbAccessLogInput do
     end
 
     it { is_expected.to eq expected_emits }
+
+    context 'when no user_agent' do
+      let(:today_access_log) do
+        <<-EOS
+  2015-05-24T19:55:36.000000Z hoge 14.14.124.20:57673 10.0.199.184:80 0.000053 0.000913 0.000036 200 200 0 3 "GET http://hoge-1876938939.ap-northeast-1.elb.amazonaws.com:80/ HTTP/1.1"
+        EOS
+      end
+
+      before do
+        expected_emits[0][2]['user_agent'] = nil
+        expected_emits[0][2]['ssl_cipher'] = nil
+        expected_emits[0][2]['ssl_protocol'] = nil
+      end
+
+      it { is_expected.to eq expected_emits }
+    end
   end
 
   context 'when access old log exists (timeout)' do
@@ -600,4 +616,66 @@ describe Fluent::ElbAccessLogInput do
       it { is_expected.to eq 100 }
     end
   end
+
+  context 'when no user_agent' do
+    let(:today_access_log) do
+      <<-EOS
+2015-05-24T19:55:36.000000Z hoge 14.14.124.20:57673 10.0.199.184:80 0.000053 0.000913 0.000036 200 200 0 3 "GET http://hoge-1876938939.ap-northeast-1.elb.amazonaws.com:80/ HTTP/1.1"
+      EOS
+    end
+
+    before do
+      expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: yesterday_prefix) { [] }
+      expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: tomorrow_prefix) { [] }
+
+      expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: today_prefix) do
+        [double('today_objects', contents: [double('today_object', key: today_object_key)])]
+      end
+
+      expect(client).to receive(:get_object).with(bucket: s3_bucket, key: today_object_key) do
+        double('today_s3_object', body: StringIO.new(today_access_log))
+      end
+
+      expect(driver.instance).to receive(:save_timestamp).with(today)
+      expect(driver.instance).to receive(:save_history)
+
+      driver.run
+    end
+
+    let(:expected_emits) do
+      [["elb.access_log",
+        Time.parse('2015-05-24 19:55:36 UTC').to_i,
+        {"timestamp"=>"2015-05-24T19:55:36.000000Z",
+         "elb"=>"hoge",
+         "client"=>"14.14.124.20",
+         "client_port"=>57673,
+         "backend"=>"10.0.199.184",
+         "backend_port"=>80,
+         "request_processing_time"=>5.3e-05,
+         "backend_processing_time"=>0.000913,
+         "response_processing_time"=>3.6e-05,
+         "elb_status_code"=>200,
+         "backend_status_code"=>200,
+         "received_bytes"=>0,
+         "sent_bytes"=>3,
+         "request"=>
+          "GET http://hoge-1876938939.ap-northeast-1.elb.amazonaws.com:80/ HTTP/1.1",
+         "user_agent"=>nil,
+         "ssl_cipher"=>nil,
+         "ssl_protocol"=>nil,
+         "request.method"=>"GET",
+         "request.uri"=>
+          "http://hoge-1876938939.ap-northeast-1.elb.amazonaws.com:80/",
+         "request.http_version"=>"HTTP/1.1",
+         "request.uri.scheme"=>"http",
+         "request.uri.user"=>nil,
+         "request.uri.host"=>"hoge-1876938939.ap-northeast-1.elb.amazonaws.com",
+         "request.uri.port"=>80,
+         "request.uri.path"=>"/",
+         "request.uri.query"=>nil,
+         "request.uri.fragment"=>nil}]]
+    end
+
+    it { is_expected.to eq expected_emits }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd