fluent-plugin-detect-exceptions-with-error 0.0.1 → 0.0.2a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdad2bb8cb784d7f9b0505ad0b21e481cc75cdcf
-  data.tar.gz: 4489bd8269ad9cbe898894a94bfd15113a4255a9
+  metadata.gz: 709478f4d3cf9404cd6f99da3b8cf8e1f9b8cd35
+  data.tar.gz: fdf9499a67bb8fa7f7922a957800fe7fa58e410d
 SHA512:
-  metadata.gz: 994f976bf4295c7859aae7ece3948bf615c5a03563a2a5c5f399d09a05bd60155005ebe39050e5479a1ea27ae6f01ea24afda9449faf276d50e77adf23471c2d
-  data.tar.gz: 8f53ddf7186c68e8b45a23996cd60069533b1676f654af891b311225fba64594b69e23a18953155958383127786263eaa8b319108869ab11253d35632b8e6d36
+  metadata.gz: ce8c8665fb2e0803feb588f63df1c8ff045589a9f6fff75edb82d70b21058cdccbfd69201e6ef2c51d4649879c3e674bd26a018abf052be0f911ac6dc44887b6
+  data.tar.gz: 90894b33d49e72df19f9b4e93c5f1c68da857f76087e92e9bac1697cd6a0d1fd6bf350dd145febd67276ff3cc60d62784ebd08435a6e01d1f599995a49b9816e

data/Gemfile.lock

@@ -0,0 +1,60 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-detect-exceptions-with-error (0.0.2)
+      fluentd (~> 0.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    cool.io (1.4.6)
+    fluentd (0.12.33)
+      cool.io (>= 1.2.2, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      json (>= 1.4.3)
+      msgpack (>= 0.5.11, < 2)
+      sigdump (~> 0.2.2)
+      string-scrub (>= 0.0.3, <= 0.0.5)
+      tzinfo (>= 1.0.0)
+      tzinfo-data (>= 1.0.0)
+      yajl-ruby (~> 1.0)
+    http_parser.rb (0.6.0)
+    json (2.0.3)
+    msgpack (1.1.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    power_assert (1.0.1)
+    powerpack (0.1.1)
+    rainbow (2.2.1)
+    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.8.1)
+    sigdump (0.2.4)
+    string-scrub (0.0.5)
+    test-unit (3.2.3)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2017.1)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.1.3)
+    yajl-ruby (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-detect-exceptions-with-error!
+  rake (~> 10.3)
+  rubocop (= 0.42.0)
+  test-unit (~> 3.0)
+
+BUNDLED WITH
+   1.14.6

data/README.rdoc

@@ -1,110 +1,21 @@
 = Exception detector plugin for {fluentd}[http://github.com/fluent/fluentd]
 
-fluent-plugin-detect-exceptions is an
-{output plugin for fluentd}[http://docs.fluentd.org/articles/output-plugin-overview]
-which scans a log stream text messages or JSON records for multi-line exception
-stack traces: If a consecutive sequence of log messages forms an exception stack
-trace, the log messages are forwarded as a single, combined log message.
-Otherwise, the input log data is forwarded as is.
+fluent-plugin-detect-exceptions-with-error is a fork of {fluent-plugin-detect-exceptions}[https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions] which
+- includes an ERROR message line preceding the stack trace in the combined exception message
+- handles additional types of line found in Java stack traces, such as 'common frames omitted'
 
-Text log messages are assumed to contain single lines and are combined by
-concatenating them.
-
-For JSON records, the log message is taken from a configurable message field
-of the log record. The message field is assumed to contain a single line of
-text. If the message fields of a consecutive sequence of logs records
-form an exception stack, they are combined to a single log record by taking
-the first log record of the sequence and replacing the content of the message
-field with the concatenated content of all message fields in the sequence.
-Note that the content of other fields in the records of the sequence are thus
-not reflected in the combined output. This plugin is intended to be used in
-cases where the content of log records that belong to a single exception stack
-are so similar (e.g. because they contain the timestamp of the log entry) that
-this loss of information is irrelevant.
-
-This is NOT an official Google product.
-
-{<img src="https://badge.fury.io/rb/fluent-plugin-detect-exceptions.svg" alt="Gem Version" />}[http://badge.fury.io/rb/fluent-plugin-detect-exceptions]
-{<img src="https://secure.travis-ci.org/GoogleCloudPlatform/fluent-plugin-detect-exceptions.png" alt="Build Status" />}[https://travis-ci.org/GoogleCloudPlatform/fluent-plugin-detect-exceptions]
 
 == Installation
 
 This gem is hosted at
-{RubyGems.org}[https://rubygems.org/gems/fluent-plugin-detect-exceptions]
+{RubyGems.org}[https://rubygems.org/gems/fluent-plugin-detect-exceptions-with-error]
 and can be installed using:
 
     $ gem install fluent-plugin-detect-exceptions-with-error
 
-Installing {google-fluentd}[https://cloud.google.com/logging/docs/agent/]
-will also install and configure the gem.
-
 == Configuration
 
-The plugin supports the following parameters:
-
-[message]  Name of the field in the JSON record that contains the
-           single-line log messages that shall be scanned for exceptions.
-           If this is set to '', the plugin will try 'message' and 'log',
-           in that order.
-           This parameter is only applicable to structured (JSON) log streams.
-           Default: ''.
-
-[remove_tag_prefix]  The prefix to remove from the input tag when outputting
-                     a record. A prefix has to be a complete tag part.
-                     Example: If remove_tag_prefix is set to 'foo', the input
-                     tag foo.bar.baz is transformed to bar.baz and the input tag
-                     'foofoo.bar' is not modified. Default: empty string.
-
-[languages]  A list of language for which exception stack traces shall be
-             detected. The values in the list can be separated by commas or
-             written as JSON list.
-             Supported values: java, js, csharp, python, go, ruby, php, all.
-             Default: all.
-
-[multiline_flush_interval]  Interval in seconds after which a (possibly not
-                            yet complete) buffered exception stack shall be
-                            forwarded. If not set, incomplete exceptions stacks
-                            are not flushed.
-
-[max_lines]  Maximum number of lines in a detected exception stack trace.
-             If this maximum number is exceeded, the exception stack trace
-             that has been detected so far will be output as a single
-             log message and the detection will start from scratch.
-             This is intended as a safeguard against buffering very large
-             amounts of data before outputting them to the log stream.
-             Zero means no limit.
-             Default: 1000.
-
-[max_bytes]  Maximum number of bytes in a detected exception stack trace.
-             If this maximum number is exceeded, the exception stack trace
-             that has been detected so far will be output as a single
-             log message and the detection will start from scratch.
-             This is intended as a safeguard against buffering very large
-             amounts of data before outputting them to the log stream.
-             Zero means no limit.
-             Default: 0.
-
-[stream]  Name of the field in the JSON record that contains the name of a
-          logical log stream within the "real" log stream.
-          The exception detection is handled separately for each logical
-          log stream, i.e., exceptions will be detected even if the messages
-          for the logical log streams are interleaved in the "real" log stream.
-          Consequently, only records in the same logical stream will be
-          combined.
-          This parameter is ignored if set to ''.
-          This parameter is only applicable to structured (JSON) log streams.
-          Default: ''.
-
-Example configuration:
+The plugin supports the same parameters as {fluent-plugin-detect-exceptions}[https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions]
 
-    <match **>
-      remove_tag_prefix foo
-      message log
-      languages java, python
-      multiline_flush_interval 0.1
-    </match>
 
-== Copyright
 
-Copyright:: Copyright 2016 Google Inc. All rights reserved.
-License::   Apache License, Version 2.0

data/fluent-plugin-detect-exceptions-with-error.gemspec

@@ -6,8 +6,8 @@ eos
   gem.summary       = \
     'fluentd output plugin for combining error messages and stack traces as multi-line JSON logs'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.0.1'
-  gem.authors       = ['Vincent Vega']
+  gem.version       = '0.0.2a'
+  gem.authors       = ['Paul Boocock']
   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

@@ -50,12 +50,12 @@ module Fluent
     end
 
     JAVA_RULES = [
-      rule(:start_state,
-           /(?:Exception|Error|Throwable|V8 errors stack trace)[:\r\n]/,
-           :java),
+      rule(:start_state, /(?:Exception|Error|Throwable|V8 errors stack trace)[:\r\n]/, :java),
+      rule(:start_state, /^ERROR /, :java_stack_begin),
+      rule(:java_stack_begin, /(?:Exception|Error|Throwable|V8 errors stack trace)[:\r\n]/, :java),
       rule(:java, /^[\t ]+(?:eval )?at /, :java),
       rule(:java, /^[\t ]*(?:Caused by|Suppressed):/, :java),
-      rule(:java, /^[\t ]*... \d+\ more/, :java)
+      rule(:java, /^[\t ]*... \d+\ (more|common frames omitted)/, :java)
     ].freeze
 
     PYTHON_RULES = [

data/test/plugin/test_out_detect_exceptions.rb

@@ -33,6 +33,22 @@ Exception: foo
   at bar
 END
 
+  JAVA_EXC_WITH_ERROR = <<END.freeze
+ERROR Something nasty
+Exception: foo
+  at bar
+END
+
+  JAVA_EXC_WITH_ERROR_CAUSE_MORE = <<END.freeze
+ERROR Something nasty
+SomeException: foo
+  at bar
+  ... 26 common frames omitted
+Caused by: org.AnotherException
+  at bar2
+  at bar3
+END
+
   PYTHON_EXC = <<END.freeze
 Traceback (most recent call last):
   File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1535, in __call__
@@ -95,6 +111,26 @@ END
     assert_equal(make_logs(t, *messages), d.events)
   end
 
+  def test_exception_detection_with_error
+    d = create_driver
+    t = Time.now.to_i
+    messages = [ARBITRARY_TEXT, JAVA_EXC_WITH_ERROR, ARBITRARY_TEXT]
+    d.run do
+      feed_lines(d, t, *messages)
+    end
+    assert_equal(make_logs(t, *messages), d.events)
+  end
+
+  def test_exception_detection_with_error_and_cause
+    d = create_driver
+    t = Time.now.to_i
+    messages = [ARBITRARY_TEXT, JAVA_EXC_WITH_ERROR_CAUSE_MORE, ARBITRARY_TEXT]
+    d.run do
+      feed_lines(d, t, *messages)
+    end
+    assert_equal(make_logs(t, *messages), d.events)
+  end
+
   def test_single_language_config
     cfg = 'languages java'
     d = create_driver(cfg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-detect-exceptions-with-error
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2a
 platform: ruby
 authors:
-- Vincent Vega
+- Paul Boocock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -74,8 +74,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CONTRIBUTING
+- fluent-plugin-detect-exceptions-with-error-0.0.2.gem
 - fluent-plugin-detect-exceptions-with-error.gemspec
 - Gemfile
+- Gemfile.lock
 - lib/fluent/plugin/exception_detector.rb
 - lib/fluent/plugin/out_detect_exceptions.rb
 - LICENSE
@@ -100,9 +102,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1