fluent-plugin-heroku-syslog-http 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 232b9309f8c101e5ff0845ef5a8330661d98816d3c25068914a7e2dfbdf5566a
-  data.tar.gz: d5f49511ab61357336c8ef9d99936781709a044994c0af8f0cf0c5e22d537623
+SHA1:
+  metadata.gz: 532357c0144bd00b49441c441a413a1418857f42
+  data.tar.gz: 7d0804f14d7d041736c35d986f8c0db2fd6e34a8
 SHA512:
-  metadata.gz: 14d6c03abb519a8f07fbf2ba0e0f894aee8a9b20aa7c3ab2699b6c44317feff51f54b2ce4bd20d0f5e197cdd6090c8994406cb1651bd1e9f8071c731b3197fc2
-  data.tar.gz: 13bf91845d3591a7df8206ab1730c5db0d4350b92678ec393f60567956788da03e127dca649a423024db467929a7f43e6d3fdd35dd46f8f30f58088dfa61e9af
+  metadata.gz: fad8aed05a98d60e1e684ea0b9b3e99cdefcd296003a536d910ef0597fe77839b2c01f3fa3a0cfff2322209f6b5143b3d1ca3cde172ffd297d9c06440a1f6e62
+  data.tar.gz: 73df938e9c8a26fc7f53601631d633f5c4e852caf8973dd763f42f9f40b28a92e0c8d6fa173b834c8d561ff064672064903b0f32c027372042ada494fb50ded0

data/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '2.4.4'
+ruby '2.5.3'
 
 # Specify your gem's dependencies in fluent-plugin-heroku-syslog.gemspec
 gemspec

data/{fluent-plugin-heroku-syslog.gemspec → fluent-plugin-heroku-syslog-http.gemspec}

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-heroku-syslog-http'
-  gem.version       = '0.2.0'
+  gem.version       = '0.2.1'
   gem.authors       = ['Drivy', 'Kazuyuki Honda']
   gem.email         = ['sre@drivy.com']
   gem.description   = 'fluent plugin to drain heroku syslog'

data/lib/fluent/plugin/in_heroku_syslog_http.rb

@@ -18,8 +18,18 @@ module Fluent
         content = params[EVENT_RECORD_PARAMETER]
         raise "'#{EVENT_RECORD_PARAMETER}' parameter is required" unless content
 
+        messages = []
+        while payload = content.match(/^([0-9]+) (.*)$/) do
+          length = payload[1].to_i
+          raise "Invalid message length specified: #{length}" unless payload[2].size >= length
+
+          messages << payload[2][0...length]
+          content = payload[2][length..-1] || ''
+        end
+        content << content
+        raise "#{content.size} bytes left in payload" unless content.size == 0
+
         records = []
-        messages = content.split("\n")
         messages.each do |msg|
           @parser.parse(msg) do |time, record|
             raise "Could not parse event: #{content}" if record.nil?
@@ -34,6 +44,7 @@ module Fluent
             records << record
           end
         end
+
         [nil, records]
       end
     end

data/lib/fluent/plugin/parser_heroku_syslog_http.rb

@@ -8,7 +8,7 @@ module Fluent
     class HerokuSyslogHttpParser < RegexpParser
       Fluent::Plugin.register_parser('heroku_syslog_http', self)
 
-      SYSLOG_HTTP_REGEXP = %r{^([0-9]+) +\<(?<syslog.pri>[0-9]+)\>([0-9]+) (?<syslog.timestamp>[^ ]+) (?<syslog.hostname>[^ ]+) (?<syslog.appname>[^ ]+) (?<syslog.procid>[^ ]+) - *(?<message>.*)$}
+      SYSLOG_HTTP_REGEXP = %r{^\<(?<syslog.pri>[0-9]+)\>([0-9]+) (?<syslog.timestamp>[^ ]+) (?<syslog.hostname>[^ ]+) (?<syslog.appname>[^ ]+) (?<syslog.procid>[^ ]+) - *(?<message>.*)$}
 
       FACILITY_MAP = {
         0   => 'kern',

data/test/plugin/test_in_heroku_syslog_http.rb

@@ -67,8 +67,8 @@ class HerokuSyslogHttpInputTest < Test::Unit::TestCase
 
   def test_msg_size
     messages = [
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - ' + 'x' * 100,
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - ' + 'x' * 1024
+      '156 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - ' + 'x' * 100,
+      '1080 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - ' + 'x' * 1024
     ]
 
     d = create_driver
@@ -83,8 +83,8 @@ class HerokuSyslogHttpInputTest < Test::Unit::TestCase
 
   def test_accept_matched_drain_id_multiple
     messages = [
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - foo',
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - bar'
+      '59 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - foo',
+      '59 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - bar'
     ]
     d = create_driver(CONFIG + %(
       drain_ids ["abc", "d.fc6b856b-3332-4546-93de-7d0ee272c3bd"]
@@ -99,8 +99,8 @@ class HerokuSyslogHttpInputTest < Test::Unit::TestCase
 
   def test_ignore_unmatched_drain_id
     messages = [
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - foo',
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - bar'
+      '59 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - foo',
+      '59 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - bar'
     ]
     d = create_driver(CONFIG + %(
       drain_ids ["abc"]
@@ -115,7 +115,7 @@ class HerokuSyslogHttpInputTest < Test::Unit::TestCase
 
   def test_logplex_metas
     messages = [
-      '00 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - ' + 'x' * 100
+      '156 <13>1 2014-01-01T01:23:45.123456+00:00 host app web.1 - ' + 'x' * 100
     ]
     d = create_driver
     d.run(expect_records: 1, timeout: 5) do
@@ -138,7 +138,7 @@ class HerokuSyslogHttpInputTest < Test::Unit::TestCase
       'User-Agent' => 'Logplex/v49'
     }
     req = Net::HTTP::Post.new('/heroku', headers)
-    req.body = messages.join("\n")
+    req.body = messages.join('')
     http.request(req)
   end
 end

data/test/plugin/test_parser_heroku_syslog_http.rb

@@ -30,7 +30,7 @@ class HerokuSyslogHttpParseTest < Test::Unit::TestCase
   end
 
   def test_parsing_with_default_conf
-    text = '59 <13>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo'
+    text = '<13>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo'
     expected_time = Time.strptime('2014-01-29T07:25:52+01:00', '%Y-%m-%dT%H:%M:%S%z').to_i
     event = {
       'syslog.pri' => '13',
@@ -52,15 +52,15 @@ class HerokuSyslogHttpParseTest < Test::Unit::TestCase
   def test_parsing_pri_conf
     d = create_driver
 
-    d.instance.parse('00 <13>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo') do |_, record|
+    d.instance.parse('<13>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo') do |_, record|
       assert_equal 'notice', record['syslog.severity']
       assert_equal 'user', record['syslog.facility']
     end
-    d.instance.parse('00 <42>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo') do |_, record|
+    d.instance.parse('<42>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo') do |_, record|
       assert_equal 'crit', record['syslog.severity']
       assert_equal 'syslog', record['syslog.facility']
     end
-    d.instance.parse('00 <27>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo') do |_, record|
+    d.instance.parse('<27>1 2014-01-29T06:25:52.589365+00:00 host app web.1 - foo') do |_, record|
       assert_equal 'err', record['syslog.severity']
       assert_equal 'daemon', record['syslog.facility']
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-heroku-syslog-http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -67,7 +67,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- fluent-plugin-heroku-syslog.gemspec
+- fluent-plugin-heroku-syslog-http.gemspec
 - lib/fluent/plugin/in_heroku_syslog_http.rb
 - lib/fluent/plugin/parser_heroku_syslog_http.rb
 - test/helper.rb
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: fluent plugin to drain heroku syslog