fluent-plugin-detect-exceptions-xiniaoyun 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1058194be8d3fb52f3d199a9348f52810b836e2bae82842c17f59a7a922c44
-  data.tar.gz: c3b9dbef4a81ed1b601f3c3fc032cf4798c5170120cc1532280f0bbc000d765b
+  metadata.gz: 67783b7c9d06f991adfedd7244368bf2c28300d012357062043e65cf43ccf24d
+  data.tar.gz: fdd107cc14cc23711ef9582589eb895dc4cc0196e2e0c18f36dd173da391e00d
 SHA512:
-  metadata.gz: 995bdd40207983c5576b97ab82ee94f3bba8b4900523d59ec4155c95261d24d65895a0d27af786d949f9a051b2c6798b6c0002f371fa6ee38759e54bd7f8e8b8
-  data.tar.gz: a3129ca850b705c26bd7879deb57fc8adac3367708aa48af2ec08037d8d857caeb2b0a59bbf3bcdc9153d2c02c5548f7445fcf6be72ff4b955aa3db2b9b5b103
+  metadata.gz: 4fbd3b2611515e67a0a0ef1ce4baddddfdf829b107cc1af59f45ca410f07a43ebfc7ed9999bbfd1a2480e29574eebeef4ab46466a69ad3997954d5f637fc9fc1
+  data.tar.gz: 40e55ff0f11157bd5540b56a63e5b5c870854cc9437c0e700653c7b03e060b1ddb1f931c940c64baa19c9bd2de9213f7f1cc3ffb2672f0b7adf5bcfb9ae7a0cf

data/Gemfile.lock

@@ -0,0 +1,87 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-detect-exceptions-xiniaoyun (0.0.2)
+      fluentd (>= 0.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    cool.io (1.5.3-x86-mingw32)
+    dig_rb (1.0.1)
+    ffi (1.10.0-x86-mingw32)
+    ffi-win32-extensions (1.0.3)
+      ffi
+    flexmock (2.3.6)
+    fluentd (1.3.3-x86-mingw32)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 0.7.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.2, < 1.0.0)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      win32-event (~> 0.6.1)
+      win32-ipc (~> 0.6.1)
+      win32-service (~> 0.8.3)
+      windows-pr (~> 1.2.5)
+      yajl-ruby (~> 1.0)
+    http_parser.rb (0.6.0)
+    msgpack (1.2.6-x86-mingw32)
+    parser (2.6.0.0)
+      ast (~> 2.4.0)
+    power_assert (1.1.3)
+    powerpack (0.1.2)
+    rainbow (2.2.2)
+      rake
+    rake (10.5.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.0)
+    serverengine (2.1.0-x86-mingw32)
+      sigdump (~> 0.2.2)
+      windows-pr (~> 1.2.5)
+    sigdump (0.2.4)
+    strptime (0.2.3)
+    test-unit (3.3.0)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.9)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.4.1)
+    win32-api (1.8.0-universal-mingw32)
+    win32-event (0.6.3)
+      win32-ipc (>= 0.6.0)
+    win32-ipc (0.6.6)
+      ffi
+    win32-service (0.8.10)
+      ffi
+      ffi-win32-extensions
+    windows-api (0.4.4)
+      win32-api (>= 1.4.5)
+    windows-pr (1.2.6)
+      win32-api (>= 1.4.5)
+      windows-api (>= 0.4.0)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  flexmock (~> 2.0)
+  fluent-plugin-detect-exceptions-xiniaoyun!
+  rake (~> 10.3)
+  rubocop (= 0.42.0)
+  test-unit (~> 3.0)
+
+BUNDLED WITH
+   2.0.1

data/README.rdoc

@@ -95,6 +95,9 @@ The plugin supports the following parameters:
           This parameter is only applicable to structured (JSON) log streams.
           Default: ''.
 
+[join_separator] String used when joining multiple lines of the stack trace.
+                 Default: ''.
+
 Example configuration:
 
     <match **>

data/{fluent-plugin-detect-exceptions.gemspec → fluent-plugin-detect-exceptions-xiniaoyun.gemspec}

@@ -9,11 +9,11 @@ eos
   gem.summary       = \
     'fluentd output plugin for combining stack traces as multi-line JSON logs'
   gem.homepage      = \
-    'https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions'
+    'https://github.com/sunhao-java/fluent-plugin-detect-exceptions-xiniaoyun'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.0.1'
-  gem.authors       = ['Stackdriver Agents']
-  gem.email         = ['stackdriver-agents@google.com']
+  gem.version       = '0.0.2'
+  gem.authors       = ['SunHao']
+  gem.email         = ['sunhao.java@gmail.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
 
   gem.files         = Dir['**/*'].keep_if { |file| File.file?(file) }

data/lib/fluent/plugin/exception_detector.rb

@@ -237,10 +237,11 @@ module Fluent
     # The named parameters max_lines and max_bytes limit the maximum amount
     # of data to be buffered. The default value 0 indicates 'no limit'.
     def initialize(message_field, languages, max_lines: 0, max_bytes: 0,
-                   &emit_callback)
+                   join_separator: '', &emit_callback)
       @exception_detector = Fluent::ExceptionDetector.new(*languages)
       @max_lines = max_lines
       @max_bytes = max_bytes
+      @join_separator = join_separator
       @message_field = message_field
       @messages = []
       @buffer_start_time = Time.now
@@ -273,10 +274,7 @@ module Fluent
       when 1
         @emit.call(@first_timestamp, @first_record)
       else
-        combined_message = @messages.each_with_object([]) do |line, memo|
-          memo << LINE_SEPARATOR unless memo.empty? || memo[-1].end_with?("\n")
-          memo << line
-        end.join
+        combined_message = @messages.join(@join_separator)
         if @message_field.nil?
           output_record = combined_message
         else
@@ -336,7 +334,7 @@ module Fluent
 
     def add(time_sec, record, message)
       if @messages.empty?
-        @first_record = record
+        @first_record = record unless @message_field.nil?
         @first_timestamp = time_sec
         @buffer_start_time = Time.now
       end

data/lib/fluent/plugin/out_detect_exceptions.rb

@@ -25,7 +25,7 @@ module Fluent
     desc 'The field which contains the raw message text in the input JSON data.'
     config_param :message, :string, default: ''
     desc 'The prefix to be removed from the input tag when outputting a record.'
-    config_param :remove_tag_prefix, :string
+    config_param :remove_tag_prefix, :string, default: ''
     desc 'The interval of flushing the buffer for multiline format.'
     config_param :multiline_flush_interval, :time, default: nil
     desc 'Programming languages for which to detect exceptions. Default: all.'
@@ -36,12 +36,11 @@ module Fluent
     config_param :max_bytes, :integer, default: 0
     desc 'Separate log streams by this field in the input JSON data.'
     config_param :stream, :string, default: ''
+    desc 'String used when joining multiple lines of the stack trace'
+    config_param :join_separator, :string, default: ''
 
     Fluent::Plugin.register_output('detect_exceptions', self)
 
-    ERROR_EMPTY_REMOVE_TAG_PREFIX =
-      'remove_tag_prefix must not be empty.'.freeze
-
     def configure(conf)
       super
 
@@ -49,10 +48,6 @@ module Fluent
         @check_flush_interval = [multiline_flush_interval * 0.1, 1].max
       end
 
-      if remove_tag_prefix.empty?
-        raise ConfigError, ERROR_EMPTY_REMOVE_TAG_PREFIX
-      end
-
       @languages = languages.map(&:to_sym)
 
       # Maps log stream tags to a corresponding TraceAccumulator.
@@ -100,7 +95,8 @@ module Fluent
           @accumulators[log_id] =
             Fluent::TraceAccumulator.new(@message, @languages,
                                          max_lines: @max_lines,
-                                         max_bytes: @max_bytes) do |t, r|
+                                         max_bytes: @max_bytes,
+                                         join_separator: @join_separator) do |t, r|
               router.emit(out_tag, t, r)
             end
         end

data/test/plugin/test_exception_detector.rb

@@ -765,4 +765,17 @@ END
     # Check that the trace is flushed after the first part.
     assert_equal([JAVA_EXC_PART1] + JAVA_EXC_PART2.lines, out)
   end
+
+  def test_join_separator
+    # Custom join separator is used to join accumulated output
+    join_separator = ';'
+    out = []
+    buffer = Fluent::TraceAccumulator.new(nil,
+                                          [:all],
+                                          join_separator: join_separator) do |_, m|
+      out << m
+    end
+    feed_lines(buffer, JAVA_EXC)
+    assert_equal(JAVA_EXC.lines.length - 1, out[0].count(join_separator))
+  end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-detect-exceptions-xiniaoyun
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- Stackdriver Agents
+- SunHao
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -86,24 +86,25 @@ description: |2
      same stack trace into one multi-line message.
      This is an official Google Ruby gem.
 email:
-- stackdriver-agents@google.com
+- sunhao.java@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CONTRIBUTING
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- fluent-plugin-detect-exceptions.gemspec
+- fluent-plugin-detect-exceptions-xiniaoyun.gemspec
 - lib/fluent/plugin/exception_detector.rb
 - lib/fluent/plugin/out_detect_exceptions.rb
 - test/helper.rb
 - test/plugin/bench_exception_detector.rb
 - test/plugin/test_exception_detector.rb
 - test/plugin/test_out_detect_exceptions.rb
-homepage: https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions
+homepage: https://github.com/sunhao-java/fluent-plugin-detect-exceptions-xiniaoyun
 licenses:
 - Apache-2.0
 metadata: {}
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for combining stack traces as multi-line JSON logs