action_reporter 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9e1d1bcb3e0d357840b7067b944679d1cfa9833e1cfc9fdbabe035edd1f44a
-  data.tar.gz: 7a46f2699a6a7ef43dc9a9f90f638c95d289786009b688e4714c6b615d6a8743
+  metadata.gz: 32481c273e889f21cb750b677fdfd75fe7c1582b483e07a3024e79ecdbc14a44
+  data.tar.gz: d5b037711d2112362680f8f72483a9e3937985d8b06152e5839a777b36f118f7
 SHA512:
-  metadata.gz: a06f86134a8c2499ee2c282189984a9ae8ede582dcae5d03db9cdcba656ef4540283089f3dd7cf1b54c7a4910d28b35ce5a876ba012cfc8fd1e52ae27bc43cd9
-  data.tar.gz: 243a13b9eae0f41dab7bd49d0fad1c1538eea0b08d8d6f833daa90cbc2943ee73806012d4108e4100574508157f763fa30fc51cd9c7efeb545b308865ae6b1ad
+  metadata.gz: dcec530e56b6e82c019aff4475e970d6642d582620c37a1ca3f099163c3c3de0dde3a367e68de11a897edbf2f2c7ba00b057979b1ca71a1207f7b25549c94257
+  data.tar.gz: 1fad20c37845fb64fda7b4adfc81ba676b671bba8384b8d0e75752908fe5a3db1368e7d50ea808ea3cee3eb138fa19cd22064eec7f6384746ad1fea770de6116

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.0.5
+
+* Fix Sentry reporting and context setting
+
+# 1.0.4
+
+* Move `transform_context` to individual reporter classes
+
 # 1.0.3
 
 * Fix scoutapm notice method

data/action_reporter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "action_reporter"
-  s.version = "1.0.3"
+  s.version = "1.0.5"
 
   s.license = "MIT"
 

data/lib/action_reporter/audited_reporter.rb

@@ -2,10 +2,6 @@ module ActionReporter
   class AuditedReporter < Base
     class_accessor "Audited"
 
-    def transform_context?
-      false
-    end
-
     def notify(*)
     end
 
@@ -13,9 +9,6 @@ module ActionReporter
       Audited.store[:current_remote_address] = args[:remote_addr] if args[
         :remote_addr
       ].present?
-      Audited.store[:audited_user] = args[:audited_user] if args[
-        :audited_user
-      ].present?
     end
 
     def reset_context
@@ -26,5 +19,9 @@ module ActionReporter
     def audited_user
       Audited.store[:audited_user]
     end
+
+    def audited_user=(user)
+      Audited.store[:audited_user] = user
+    end
   end
 end

data/lib/action_reporter/base.rb

@@ -7,8 +7,14 @@ module ActionReporter
       const_set(const_name, Object.const_get(class_name))
     end
 
-    def transform_context?
-      true
+    def transform_context(context)
+      ActionReporter::Utils.deep_transform_values(context) do |value|
+        if value.respond_to?(:to_global_id)
+          value.to_global_id.to_s
+        else
+          value
+        end
+      end
     end
 
     def notify(*)

data/lib/action_reporter/honeybadger_reporter.rb

@@ -3,11 +3,13 @@ module ActionReporter
     class_accessor "Honeybadger"
 
     def notify(error, context: {})
-      Honeybadger.notify(error, context: context)
+      new_context = transform_context(context)
+      Honeybadger.notify(error, context: new_context)
     end
 
     def context(args)
-      Honeybadger.context(args)
+      new_context = transform_context(args)
+      Honeybadger.context(new_context)
     end
 
     def reset_context

data/lib/action_reporter/rails_reporter.rb

@@ -3,16 +3,15 @@ module ActionReporter
     class_accessor "Rails"
 
     def notify(error, context: {})
+      new_context = transform_context(context)
       Rails.logger.info(
-        "Reporter notification: #{error.inspect}, #{context.inspect}"
+        "Reporter notification: #{error.inspect}, #{new_context.inspect}"
       )
     end
 
     def context(args)
-      Rails.logger.info("Reporter context: #{args.inspect}")
-    end
-
-    def reset_context
+      new_context = transform_context(args)
+      Rails.logger.info("Reporter context: #{new_context.inspect}")
     end
   end
 end

data/lib/action_reporter/scout_apm_reporter.rb

@@ -9,7 +9,8 @@ module ActionReporter
     end
 
     def context(args)
-      ScoutApmContext.add(args)
+      new_context = transform_context(args)
+      ScoutApmContext.add(new_context)
     end
   end
 end

data/lib/action_reporter/sentry_reporter.rb

@@ -3,18 +3,24 @@ module ActionReporter
     class_accessor "Sentry"
 
     def notify(error, context: {})
-      self.context(context)
-      Sentry.capture_exception(error)
+      Sentry.with_scope do |temp_scope|
+        temp_scope.set_contexts(transform_context(context))
+
+        if error.is_a?(StandardError)
+          Sentry.capture_exception(error)
+        else
+          Sentry.capture_message(error)
+        end
+      end
     end
 
     def context(args)
-      args.each do |key, value|
-        Sentry.configure_scope { |scope| scope.set_context(key, value) }
-      end
+      new_context = transform_context(args)
+      Sentry.get_current_scope.set_contexts(new_context)
     end
 
-    def reset_context
-      Sentry.configure_scope { |scope| scope.clear_breadcrumbs }
+    def audited_user=(user)
+      Sentry.set_user(global_id: user.to_global_id.to_s) if user
     end
   end
 end

data/lib/action_reporter/version.rb

@@ -1,3 +1,3 @@
 module ActionReporter
-  VERSION = '1.0.3'
+  VERSION = '1.0.5'
 end

data/lib/action_reporter.rb

@@ -30,35 +30,37 @@ module ActionReporter
 
   def notify(error, context: {})
     enabled_reporters.each do |reporter|
-      new_context =
-        reporter.transform_context? ? transform_context(context) : context
-      reporter.notify(error, context: new_context)
+      next unless reporter.respond_to?(:notify)
+
+      reporter.notify(error, context: context)
     end
   end
 
   def context(args)
     enabled_reporters.each do |reporter|
-      new_args = reporter.transform_context? ? transform_context(args) : args
-      reporter.context(new_args)
+      next unless reporter.respond_to?(:context)
+
+      reporter.context(args)
     end
   end
 
   def reset_context
-    enabled_reporters.each(&:reset_context)
+    enabled_reporters.each do |reporter|
+      next unless reporter.respond_to?(:reset_context)
+
+      reporter.reset_context
+    end
   end
 
   def audited_user
     enabled_reporters.find { |r| r.respond_to?(:audited_user) }&.audited_user
   end
 
-  def transform_context(context)
-    filtered_context = context.reject { |k, _| k == :audited_user }
-    ActionReporter::Utils.deep_transform_values(filtered_context) do |value|
-      if value.respond_to?(:to_global_id)
-        value.to_global_id.to_s
-      else
-        value
-      end
+  def audited_user=(user)
+    enabled_reporters.each do |reporter|
+      next unless reporter.respond_to?(:audited_user=)
+
+      reporter.audited_user = user
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_reporter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Andrei Makarov