gitlab-fluent-plugin-detect-exceptions 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09ee87a8a03c6b398a42c0bcd4beedc92ed8ae0ea6a22ba5436d92485faeb27
-  data.tar.gz: 21fcb6d72a7d3df71d3087f7bfb0de17807df73670a554f58666049c65c7f81c
+  metadata.gz: 1bdccb9b31b1be4d791707fda73fb523fe5f34ae17f701c684b4f42ea546b61f
+  data.tar.gz: fbf55dc7e44428be31762c10995add753588e6a32398f5a8ff6a7d250339e63c
 SHA512:
-  metadata.gz: 8aff95c7c068ea0905735bfb76c4577a259cba60685ac25d7f7be3a0c62403c8c7e2bfd4ea4fa6fb7f03362a808da7d36b04305a2b0107c72669dc99615b87c0
-  data.tar.gz: 6b49f2acbc81beb5086fc9ea1190cde7fde9071c7725da812d9c27b932762efa58de30d78f173c2ddecd521342767d53468d19974db0b60693541cdaecb85fd5
+  metadata.gz: 277d2ce43ba487c1c30bec4986d02262be044804729b2e325ff275a2ec2c84ffc0985aef3f620bcb716e7fb6a8b5a24c8b69fa5f9ee35c855db5b08151db5f2d
+  data.tar.gz: 6a0d183a6c91ed70183e367442b2763ec36f2aec49cbf0e23fee1466081a671cc4c93e71fbd784b60415cbd4df82e8c44643d5c9838d2ab871156fee2d8f2445

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-detect-exceptions (0.0.14)
+    gitlab-fluent-plugin-detect-exceptions (0.0.15)
       fluentd (>= 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    byebug (11.1.3)
     concurrent-ruby (1.1.10)
     cool.io (1.7.1)
     flexmock (2.3.6)
@@ -39,7 +40,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.11.0)
-    serverengine (2.3.0)
+    serverengine (2.3.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
@@ -55,10 +56,12 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-22
 
 DEPENDENCIES
+  byebug
   flexmock (~> 2.0)
-  fluent-plugin-detect-exceptions!
+  gitlab-fluent-plugin-detect-exceptions!
   rake (~> 10.3)
   rubocop (= 0.42.0)
   test-unit (~> 3.0)

data/gitlab-fluent-plugin-detect-exceptions.gemspec

@@ -11,7 +11,7 @@ eos
   gem.homepage      = \
     'https://gitlab.com/gitlab-org/ruby/gems/gitlab-fluent-plugin-detect-exceptions'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.0.15'
+  gem.version       = '0.0.16'
   gem.authors       = ['Stackdriver Agents']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/exception_detector.rb

@@ -115,48 +115,48 @@ module Fluent
 
     RUBY_SEGFAULT_RULES = [
       rule(:start_state,
-           /:\d+:\s\[BUG\] Segmentation fault/, :ruby_description),
-      rule(:ruby_description, /^ruby\n*/, :ruby_description_end),
-      rule(:ruby_description_end, /\n$/, :ruby_control_frame_begin),
-      rule(:ruby_control_frame_begin,
+           /:\d+:\s\[BUG\] Segmentation fault/, :ruby_segfault),
+      rule(:ruby_segfault, /^ruby\n*/, :ruby_segfault),
+      rule(:ruby_segfault, /^\n$/, :ruby_segfault),
+      rule(:ruby_segfault,
            /^-- Control frame information --/, :ruby_control_frames),
       rule(:ruby_control_frames, /^c:/, :ruby_control_frames),
-      rule(:ruby_control_frames, /^\n$/, :ruby_level_backtrace_frame_start),
-      rule(:ruby_level_backtrace_frame_start,
-           /-- Ruby level backtrace information --/,
+      rule(:ruby_control_frames, /^\n$/, :ruby_segfault),
+      rule([:ruby_segfault, :ruby_control_frames],
+           /^-- Ruby level backtrace information --/,
            :ruby_level_backtrace_frames),
       rule(:ruby_level_backtrace_frames, /:\d+:in /,
            :ruby_level_backtrace_frames),
-      rule(:ruby_level_backtrace_frames, /^\n$/, :ruby_level_backtrace_end),
-      rule(:ruby_level_backtrace_end,
+      rule(:ruby_level_backtrace_frames, /^\n$/, :ruby_segfault),
+      rule([:ruby_segfault, :ruby_level_backtrace_frames],
            /^-- Machine register context --/, :ruby_machine_registers),
       rule(:ruby_machine_registers, /: /, :ruby_machine_registers),
-      rule(:ruby_machine_registers, /^\n$/, :ruby_machine_registers_end),
-      rule(:ruby_machine_registers_end,
+      rule(:ruby_machine_registers, /^\n*$/, :ruby_segfault),
+      rule([:ruby_segfault, :ruby_machine_registers],
            /^-- C level backtrace information --/,
            :ruby_c_level_backtrace_frames),
       rule(:ruby_c_level_backtrace_frames, /\[.*\]/,
            :ruby_c_level_backtrace_frames),
       rule(:ruby_c_level_backtrace_frames, / .*:\d+$/,
            :ruby_c_level_backtrace_frames),
-      rule(:ruby_c_level_backtrace_frames, /^\n$/,
-           :ruby_c_level_backtrace_end),
-      rule(:ruby_c_level_backtrace_end,
+      rule(:ruby_c_level_backtrace_frames, /^\n$/, :ruby_segfault),
+      rule([:ruby_segfault, :ruby_c_level_backtrace_frames],
            /^-- Other runtime information/, :ruby_other_runtime_info),
-      rule(:ruby_other_runtime_info, /^\n$/, :ruby_other_runtime_info),
+      rule(:ruby_other_runtime_info, /^\n*$/, :ruby_other_runtime_info),
       rule(:ruby_other_runtime_info, /^* Loaded script:/, :ruby_loaded_script),
       rule(:ruby_loaded_script, /^\n$/, :ruby_loaded_features),
-      rule(:ruby_loaded_features, /^* Loaded features:/, :ruby_loaded_features),
+      rule([:ruby_loaded_features, :ruby_loaded_script],
+           /^* Loaded features:/, :ruby_loaded_features),
       rule(:ruby_loaded_features, /^\n$/, :ruby_loaded_features_frames),
-      rule(:ruby_loaded_features_frames,
+      rule([:ruby_loaded_features_frames, :ruby_loaded_features],
            /\d/, :ruby_loaded_features_frames),
       rule(:ruby_loaded_features_frames,
            /^\n$/, :ruby_process_memory_map),
-      rule(:ruby_process_memory_map,
+      rule([:ruby_process_memory_map, :ruby_loaded_features_frames],
            /^* Process memory map:/, :ruby_process_memory_map),
       rule(:ruby_process_memory_map,
            /^\n$/, :ruby_process_memory_map_frames),
-      rule(:ruby_process_memory_map_frames,
+      rule([:ruby_process_memory_map_frames, :ruby_process_memory_map],
            /\-/, :ruby_process_memory_map_frames),
       rule(:ruby_process_memory_map_frames, /^\n$/, :start_state)
     ].freeze

data/test/plugin/test_exception_detector.rb

@@ -905,6 +905,7 @@ END
   def test_ruby
     check_exception(RUBY_EXC, false)
     check_exception(RUBY_SEGFAULT_EXC, true)
+    check_exception(strip_blank_lines(RUBY_SEGFAULT_EXC), true)
     check_exception(RAILS_EXC, false)
   end
 
@@ -980,6 +981,10 @@ END
     check_no_multiline(detector, JAVA_EXC_PART2)
   end
 
+  def strip_blank_lines(str)
+    str.split("\n").reject(&:empty?).join("\n") + "\n\n"
+  end
+
   def feed_lines(buffer, *messages)
     messages.each do |m|
       m.each_line do |line|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fluent-plugin-detect-exceptions
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Stackdriver Agents
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: fluentd output plugin for combining stack traces as multi-line JSON logs