fluent-plugin-detect-exceptions 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a062ab7c8327c6be24ebe4d3cea539f25e14f0
-  data.tar.gz: 634af7fd1eaa23b67201dbbef7f3d14dce6a2859
+  metadata.gz: ef4d82371017a4cc288bb5102634581367e87605
+  data.tar.gz: 408d49b121fba800e1a629f22fc1a33141effa9c
 SHA512:
-  metadata.gz: 739b621a840194dfa55b81ddc3be796f99c93555cc632e9c9bc26019414dd6a5d1953c042b4562df3cc7cabe2d3cb0af4ec840488054705747795867a13926d6
-  data.tar.gz: d46340cb11dd87d0e551090da0111f6ace115a07e946abb441f98b6fa63fc974315523db13d441e0da994ec1e5863cd5cba5b18f3e4be10228bf0136f3d28cf3
+  metadata.gz: e0e5493c81bf8dcf8feb7e7354e9dcef5d24e1cc7d2ead74d9280e2db5f67b73738e0ac9c5bf788ff4f6dbb12cb16532c7f47463f10eb2f9081a46f2205d4fe2
+  data.tar.gz: 6ab4f9257169fc87a9285e337051980ceebd1e6d3ffe4920d522cc4fcc00b2862dc18e7a361f86145e77468969e2ad1ac79411311609148d30e1445004e265d0

data/Gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-detect-exceptions (0.0.6)
+      fluentd (~> 0.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    cool.io (1.5.0)
+    flexmock (2.3.5)
+    fluentd (0.14.17)
+      cool.io (>= 1.4.5, < 2.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.1.7)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    http_parser.rb (0.6.0)
+    msgpack (1.1.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    power_assert (1.0.2)
+    powerpack (0.1.1)
+    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.8.1)
+    serverengine (2.0.5)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.1.9)
+    test-unit (3.2.4)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2017.2)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.2.1)
+    yajl-ruby (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  flexmock (~> 2.0)
+  fluent-plugin-detect-exceptions!
+  rake (~> 10.3)
+  rubocop (= 0.42.0)
+  test-unit (~> 3.0)
+
+BUNDLED WITH
+   1.15.0

data/fluent-plugin-detect-exceptions.gemspec

@@ -11,7 +11,7 @@ eos
   gem.homepage      = \
     'https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.0.6'
+  gem.version       = '0.0.7'
   gem.authors       = ['Thomas Schickinger', 'Igor Peshansky']
   gem.email         = ['schickin@google.com', 'igorp@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -25,4 +25,5 @@ eos
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rubocop', '= 0.42.0'
   gem.add_development_dependency 'test-unit', '~> 3.0'
+  gem.add_development_dependency 'flexmock', '~> 2.0'
 end

data/lib/fluent/plugin/exception_detector.rb

@@ -59,7 +59,7 @@ module Fluent
     ].freeze
 
     PYTHON_RULES = [
-      rule(:start_state, /Traceback \(most recent call last\)/, :python),
+      rule(:start_state, /^Traceback \(most recent call last\):$/, :python),
       rule(:python, /^[\t ]+File /, :python_code),
       rule(:python_code, /[^\t ]/, :python),
       rule(:python, /^(?:[^\s.():]+\.)*[^\s.():]+:/, :start_state)

data/test/plugin/test_exception_detector.rb

@@ -176,6 +176,7 @@ END
 END
 
   # The whitespace on the second line is significant.
+  # rubocop:disable TrailingWhitespace
   RAILS_EXC = <<END.freeze
  ActionController::RoutingError (No route matches [GET] "/settings"):
   

data/test/plugin/test_out_detect_exceptions.rb

@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'flexmock/test_unit'
 require_relative '../helper'
 require 'fluent/plugin/out_detect_exceptions'
+require 'json'
 
 class DetectExceptionsOutputTest < Test::Unit::TestCase
   def setup
@@ -36,6 +38,14 @@ Caused by: org.AnotherException
   at bar3
 END
 
+  PHP_EXC = <<END.freeze
+exception 'Exception' with message 'Custom exception' in /home/joe/work/test-php/test.php:5
+Stack trace:
+#0 /home/joe/work/test-php/test.php(9): func1()
+#1 /home/joe/work/test-php/test.php(13): func2()
+#2 {main}
+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__
@@ -43,6 +53,15 @@ Traceback (most recent call last):
 Exception: ('spam', 'eggs')
 END
 
+  RUBY_EXC = <<END.freeze
+examble.rb:18:in `thrower': An error has occurred. (RuntimeError)
+  from examble.rb:14:in `caller'
+  from examble.rb:10:in `helper'
+  from examble.rb:6:in `writer'
+  from examble.rb:2:in `runner'
+  from examble.rb:21:in `<main>'
+END
+
   def create_driver(conf = CONFIG, tag = DEFAULT_TAG)
     d = Fluent::Test::OutputTestDriver.new(Fluent::DetectExceptionsOutput, tag)
     d.configure(conf)
@@ -98,6 +117,62 @@ END
     assert_equal(make_logs(t, *messages), d.events)
   end
 
+  def test_ignore_nested_exceptions
+    test_cases = {
+      'php' => PHP_EXC,
+      'python' => PYTHON_EXC,
+      'ruby' => RUBY_EXC
+    }
+
+    test_cases.each do |language, exception|
+      cfg = "languages #{language}"
+      d = create_driver(cfg)
+      t = Time.now.to_i
+
+      # Convert exception to a single line to simplify the test case.
+      single_line_exception = exception.gsub("\n", '\\n')
+
+      # There is a nested exception within the body, we should ignore those!
+      json_line_with_exception = {
+        'timestamp' => {
+          'nanos' => 998_152_494,
+          'seconds' => 1_496_420_064
+        },
+        'message' => single_line_exception,
+        'thread' => 139_658_267_147_048,
+        'severity' => 'ERROR'
+      }.to_json + "\n"
+      json_line_without_exception = {
+        'timestamp' => {
+          'nanos' => 5_990_266,
+          'seconds' => 1_496_420_065
+        },
+        'message' => 'next line',
+        'thread' => 139_658_267_147_048,
+        'severity' => 'INFO'
+      }.to_json + "\n"
+
+      router_mock = flexmock('router')
+
+      # Validate that each line received is emitted separately as expected.
+      router_mock.should_receive(:emit)
+                 .once.with(DEFAULT_TAG, Integer,
+                            'message' => json_line_with_exception,
+                            'count' => 0)
+
+      router_mock.should_receive(:emit)
+                 .once.with(DEFAULT_TAG, Integer,
+                            'message' => json_line_without_exception,
+                            'count' => 1)
+
+      d.instance.router = router_mock
+
+      d.run do
+        feed_lines(d, t, json_line_with_exception + json_line_without_exception)
+      end
+    end
+  end
+
   def test_single_language_config
     cfg = 'languages java'
     d = create_driver(cfg)
@@ -183,7 +258,7 @@ END
     # exception. Then the rest is logged line-by-line.
     expected = [PYTHON_EXC.lines[0..1].join] + PYTHON_EXC.lines[2..-1] + \
                [JAVA_EXC.lines[0..1].join] + [JAVA_EXC.lines[2..3].join] + \
-               JAVA_EXC.lines[4.. -1]
+               JAVA_EXC.lines[4..-1]
     assert_equal(make_logs(t, *expected), d.events)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-detect-exceptions
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Thomas Schickinger
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
@@ -57,16 +57,30 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: |2
      Fluentd output plugin which detects exception stack traces in a stream of
      JSON log messages and combines all single-line messages that belong to the
@@ -80,13 +94,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CONTRIBUTING
-- fluent-plugin-detect-exceptions.gemspec
 - Gemfile
-- lib/fluent/plugin/exception_detector.rb
-- lib/fluent/plugin/out_detect_exceptions.rb
+- Gemfile.lock
 - LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
+- fluent-plugin-detect-exceptions.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
@@ -101,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for combining stack traces as multi-line JSON logs