fluent-plugin-sentry-ruby 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4418b05058672d2766e69e17dbd9bc40149e05d19428fced8c2b31b5a0b330d5
-  data.tar.gz: 6e3cb4a26b182a9dbe567b0213deba689c2c997480243efa5d03111310a1c9ae
+  metadata.gz: 2202b09a6ed7cd295bf07da12b78e70a65dabcd62fc22c7a62b1ac674641f19c
+  data.tar.gz: 1ea2340586a004bbdfcdb3b7c30de104e66614b3eaad155b6b29cc6f51a04db0
 SHA512:
-  metadata.gz: cdfe6dbe81b35df5b648c9c00730ecaad0b180c28d8e496e88b9cd7abacd87c388ea23cc041e7391fec7d0c7b7cd57073fe54ffea8ac59c9fcde7dfceb7e9cab
-  data.tar.gz: c8fce2612bb83622fef2b652811665064bab56b6e5fabf79ff088aa8162035f9d6b98d54ee654edc69d0dedc845f05a4450c42269ace1da9898a08ca024d94d0
+  metadata.gz: 2cdf16fb6fe880df9353a2387908cf4b2fde472707d2d05b6230c7f971065798739b10e5078f139b175b9d0d9f7e2f0b12984e9d308378a70492146d77371906
+  data.tar.gz: 5c30a2f555842a3c76708953c81a8ad4ae7d1ea0c28e2ad5e52827ba006395b47cc89ba70e24a7a421bda9bdcca36b50b94270654fae20ca3c5442d2949f9844

data/.gitignore

@@ -1,4 +1,5 @@
 log
 pkg
 tmp
+conf.d
 fluent.conf

data/fluent-plugin-sentry.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-sentry-ruby"
-  spec.version = "0.3.2"
+  spec.version = "0.4.1"
   spec.authors = ["buffalo"]
   spec.email   = ["buffalobigboy@gmail.com"]
 

data/lib/fluent/plugin/out_sentry.rb

@@ -7,7 +7,6 @@ module Fluent
       Fluent::Plugin.register_output("sentry", self)
 
       config_param :dsn, :string
-      config_param :title, :string, :default => 'test'
       config_param :level, :enum, list: [:fatal, :error, :warning, :info, :debug], :default => 'info'
       config_param :environment, :string, :default => 'local'
       config_param :type, :enum, list: [:event, :exception], :default => :event
@@ -49,27 +48,53 @@ module Fluent
             event.environment = record['env'] || @environment
 
             if @type === :event
-              event.message = record['message'] || @title
+              event.message = record['message'] || tag
               event.user = record.select{ |key| @user_keys.include?(key) }
-              event.extra = @keys.length() > 0 ? record.select{ |key| @keys.include?(key) } : record
+              event.extra = @data_keys.length() > 0 ? record.select{ |key| @data_keys.include?(key) } : record
               event.contexts = {'data' => { origin_data: record }}
-              event.tags = event.tags.merge({ :log_tag => tag })
-                .merge({ :timestamp => Time.at(time).strftime('%Y-%m-%d %H:%M:%S') })
+              event.tags = event.tags.merge({ :timestamp => Time.at(time).strftime('%Y-%m-%d %H:%M:%S %Z') })
                 .merge(record.select{ |key| (@tag_keys + @user_keys).include?(key) })
+              event = event.to_hash
+
+              event['logger'] = tag
             elsif @type === :exception
+              event.tags = { :timestamp => Time.at(time).strftime('%Y-%m-%d %H:%M:%S %Z') }
+                .merge(record.select{ |key| (@tag_keys + @user_keys).include?(key) })
+
               event = event.to_hash
+
+              event['logger'] = tag
+
+              frame = Array.new
+              if record.include?(@e_stack)
+                record[@e_stack].split("\n") do |value|
+                  match = value.match(/\#(?<no>\d+) (?<filename>.*?)\((?<lineno>\d+)\): (?<context_line>[\s\S]+)/)
+                  if match != nil
+                    frame.unshift(Sentry::CustomStacktraceFrame.new(
+                      filename: match[:filename],
+                      context_line: match[:context_line],
+                      pre_context: "//...\n",
+                      post_context: "//...\n",
+                      lineno: Integer(match[:lineno]),
+                    ))
+                  end
+                end
+              elsif
+                frame.push(Sentry::CustomStacktraceFrame.new(
+                  filename: record.include?(@e_filename) ? record[@e_filename] : '',
+                  context_line: record.include?(@e_describe) ? record[@e_describe] : '',
+                  pre_context: "//...\n",
+                  post_context: "//...\n",
+                  lineno: record.include?(@e_line) ? Integer(record[@e_line]) : 1
+                ))
+              end
+
               event['exception'] = Sentry::CustomExceptionInterface.new(
-                type: record['message'] || @title,
-                message: (record[@e_describe] + (record[@e_line] ? (' on line:' + record[@e_line]) : '')) || '',
-                stacktrace: Sentry::StacktraceInterface.new(frames: [Sentry::CustomStacktraceFrame.new(
-                  filename: record[@e_filename] || '',
-                  context_line: (record[@e_describe] + (record[@e_line] ? (' on line:' + record[@e_line]) : '')) || '',
-                  post_context: record[@e_stack] || (record[@e_describe] || ''),
-                )])
+                type: record['message'] || '',
+                message: record.include?(@e_describe) ? record[@e_describe] : '',
+                stacktrace: Sentry::StacktraceInterface.new(frames: frame)
               ).to_hash
-              event['tags'] = { :log_tag => tag }
-                .merge({ :timestamp => Time.at(time).strftime('%d-%b-%Y %H:%M:%S %Z') })
-                .merge(record.select{ |key| (@tag_keys + @user_keys).include?(key) })
+              event['message'] = record.include?(@e_describe) ? (record[@e_describe] + ' in ' + record[@e_filename] + ' on line ' + record[@e_line]) : ''
             end
 
             @client.send_event(event)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sentry-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - buffalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler