nadir 1.1.10 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9bdde9641cdde396db5ffc757bdad54d1e3a80bd5c50a5c0bfca0bd3b9eeb0a
-  data.tar.gz: c7f25aca2ade3a7173cf4dc71608236adc1353a94d3f2ef046e8d25b161b7a08
+  metadata.gz: b235c9afa93b3a535bb7317ea48c5b3849c150d76c9809450531491256c2227a
+  data.tar.gz: 464956272e4cb23a6ef4833e0d03b3eee1bd158a19e9ab5b7c867323749eba0e
 SHA512:
-  metadata.gz: a0c160705a8a8a094dd3636ea26ff7563c4b6ac877dfaa354c98e758ab515a724e1ebec4a5bce87184c9897372652853e284e0f1e8bfd984f638f734bb1f7033
-  data.tar.gz: 0d6a5cbe7eb77aa54bce15443d1a777c18599a90ea095f7075fbe55e54167186c8daec90ecde224c0b7697bd787f0f44984bd6b965844bd7ca44ce5b7f579707
+  metadata.gz: e1208b36987f3b92d6d4bca79c3d3702bb7353f5ffb4c5b641974edacc4915925ef9ff0007ffc0014be3eb76b0ac285e7a451c9cc3c08296b7ed79da2e471afe
+  data.tar.gz: fae7ea7924ccc62f1faa3d0df4dd9e0bedcf44f4ec7a433f822a4ef2b61e798068a8a72f13964367d88852b815c101468d0718aadd31d07e55f7404084ae93c9

data/lib/nadir/notification.rb

@@ -9,8 +9,8 @@ module Nadir
 
     def to_params
       {
-        class: @exception.class.name,
-        message: @exception.message,
+        class: notification_class,
+        message: message,
         location: location,
         backtrace: backtrace.join("\n"),
         environment: Nadir.config.env,
@@ -23,6 +23,7 @@ module Nadir
         request_headers: @params.dig(:request, :headers),
         user: @params.dig(:request, :user),
         job: @params.dig(:job),
+        context: @params.dig(:context),
         revision: revision
       }
     end
@@ -30,7 +31,29 @@ module Nadir
     private
 
     def location
-      @params[:location] || $PROGRAM_NAME
+      return @params[:location] if @params[:location].present?
+
+      if $PROGRAM_NAME =~ /sidekiq/
+        @params.dig(:job, :class) || "Background job (Sidekiq)"
+      else
+        $PROGRAM_NAME
+      end
+    end
+
+    def notification_class
+      if @exception.is_a?(StandardError)
+        @exception.class.name
+      else
+        "Message"
+      end
+    end
+
+    def message
+      if @exception.is_a?(StandardError)
+        @exception.message
+      else
+        @exception
+      end
     end
 
     def backtrace
@@ -43,14 +66,22 @@ module Nadir
           cleaner.add_filter { |line| line.sub(Nadir.config.root.to_s, '') }
           cleaner.add_filter { |line| line.start_with?('/') ? line.sub('/', '') : line }
           cleaner.add_filter { |line| line.start_with?('.') ? line.sub('.', '') : line  }
+          cleaner.add_silencer { |line| line.include?("nadir-rb/lib") }
+
+          stacktrace =
+            if @exception.is_a?(StandardError)
+              @exception.backtrace
+            else
+              caller
+            end
 
-          cleaner.clean(@exception.backtrace)
+          cleaner.clean(stacktrace)
         end
     end
 
     def fingerprint
       first_backtrace_line = backtrace.find { |trace| trace !~ /pry|irb/ }
-      checksum = [first_backtrace_line, @exception.class].join('|')
+      checksum = [first_backtrace_line, notification_class].join('|')
 
       Digest::SHA1.hexdigest checksum
     end

data/lib/nadir/version.rb

@@ -1,3 +1,3 @@
 module Nadir
-  VERSION = '1.1.10'
+  VERSION = '1.2.1'
 end

data/lib/nadir.rb

@@ -22,7 +22,7 @@ module Nadir
   def notify(exception, params = {})
     return false unless config.validate
 
-    notification = Notification.new exception, params
+    notification = Notification.new(exception, process_params(params))
 
     transport.deliver notification.to_params
 
@@ -33,6 +33,24 @@ module Nadir
     false
   end
 
+  def process_params(params)
+    ctx = Thread.current[:nadir_context]
+
+    if ctx
+      params[:job] = ctx.delete(:job) if ctx[:job]
+      params[:context] = ctx if ctx
+    end
+
+    params
+  end
+
+  def with_context(payload)
+    Thread.current[:nadir_context] = payload
+    yield
+  ensure
+    Thread.current[:nadir_context] = nil
+  end
+
   private
 
   def transport

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nadir
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.2.1
 platform: ruby
 authors:
 - Georgi Mitrev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -113,7 +113,7 @@ homepage: https://github.com/gmitrev/nadir-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Ruby library for Nadir
 test_files: []