memolog 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e99e3c68b6d46dff6769d0526a9b9638d6ddf479665929a8e03dddb5eeddf618
-  data.tar.gz: f7221b929323ff44066403d01a3f02eefb6dd8302c882a2a78df43776acdc03b
+  metadata.gz: a4c3d9289bf4c0378b3050613589595dbf2c1d1e5a25a0fa9f0c3d2302a2963e
+  data.tar.gz: 0b56db61731b0e1bd1c293216cf0a0fab009ea8eb70be2b85601a27b70cdf284
 SHA512:
-  metadata.gz: 35f308119cb2c44d09974ce1f9fda973e648212aefb36d6256678d0b281de6784be265bc87781b55f3aa05d5a3d6ddfdd60beb86e77420f629fab02e72e87be7
-  data.tar.gz: 3a82f19378b63f47ffcd9ad512ee44a2daa4769ffdaed6b01cd90e867e3cea31c200d264820f91af8307f0e43bb3a2c03944aa0d107bd2beeb6e6464a46cb8c7
+  metadata.gz: 6a25437819058d1330f195a7dbbeea54d728face25790bc83c6fcba84500e18b459a8d50730c79e598b86c4c7a0f953d5ab804c2d71bb38c3d2f898a08097761
+  data.tar.gz: 0b90e159e40b2a0e4a7fb0c0aa84e96a8de0fb3b4538346e5614f894f001574c7c0157963273d50081aa36fc732085f46bd97afa9991d42085235e393a3d5e93

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    memolog (0.3.0)
+    memolog (0.3.1)
       logger (~> 1.4.3)
       securerandom (~> 0.1.0)
 

data/lib/memolog/init.rb

@@ -14,22 +14,24 @@ class Memolog::Init
     return unless Object.const_defined?("Rails")
     return if Object.const_defined?("Sidekiq") && Sidekiq.server?
 
-    Rails.application.middleware.insert_before(0, Memolog::Middleware)
+    Rails.application.middleware.insert_before(0, Memolog::RailsMiddleware)
   end
 
   def init_sentry!
     return unless Memolog.config.initializers.include?(:sentry)
-    return unless Object.const_defined?("Sentry::Scope")
+    return unless Object.const_defined?("Sentry")
 
-    Sentry::Scope.prepend(Memolog::SentryScopeExtension)
+    Sentry.prepend(Memolog::SentryExtension)
   end
 
   def init_sidekiq!
     return unless Memolog.config.initializers.include?(:sidekiq)
-    return unless Object.const_defined?("Sentry::Sidekiq::SentryContextServerMiddleware")
+    return unless Object.const_defined?("Sidekiq")
 
-    Sentry::Sidekiq::SentryContextServerMiddleware.prepend(
-      Memolog::SentrySidekiqMiddlewareExtension,
-    )
+    Sidekiq.configure_server do |config|
+      config.server_middleware do |chain|
+        chain.prepend(Memolog::SidekiqMiddleware)
+      end
+    end
   end
 end

data/lib/memolog/{middleware.rb → rails_middleware.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Memolog::Middleware
+class Memolog::RailsMiddleware
   def initialize(app)
     @app = app
   end

data/lib/memolog/sentry_extension.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Memolog::SentryExtension
+  def self.prepended(base)
+    base.singleton_class.send(:prepend, ClassMethods)
+  end
+
+  module ClassMethods
+    def capture_exception(exception, **options, &block)
+      add_memolog_to_current_scope!
+      super
+    end
+
+    def capture_message(message, **options, &block)
+      add_memolog_to_current_scope!
+      super
+    end
+
+    def add_memolog_to_current_scope!
+      dump = Memolog.dump
+      return unless dump
+
+      scope = get_current_scope
+      scope.set_extras(Memolog.config.sentry_key => dump) if scope # rubocop:disable Style/SafeNavigation
+    end
+  end
+end

data/lib/memolog/sidekiq_middleware.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Memolog::SidekiqMiddleware
+  def call(*)
+    Memolog.run { yield } # rubocop:disable Style/ExplicitBlockArgument
+  end
+end

data/lib/memolog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Memolog
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/memolog.rb

@@ -9,9 +9,9 @@ require "memolog/config"
 require "memolog/extension"
 require "memolog/formatter"
 require "memolog/init"
-require "memolog/middleware"
-require "memolog/sentry_scope_extension"
-require "memolog/sentry_sidekiq_middleware_extension"
+require "memolog/rails_middleware"
+require "memolog/sentry_extension"
+require "memolog/sidekiq_middleware"
 
 module Memolog
   extend self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memolog
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -64,9 +64,9 @@ files:
 - lib/memolog/extension.rb
 - lib/memolog/formatter.rb
 - lib/memolog/init.rb
-- lib/memolog/middleware.rb
-- lib/memolog/sentry_scope_extension.rb
-- lib/memolog/sentry_sidekiq_middleware_extension.rb
+- lib/memolog/rails_middleware.rb
+- lib/memolog/sentry_extension.rb
+- lib/memolog/sidekiq_middleware.rb
 - lib/memolog/version.rb
 homepage: https://github.com/skirushkin/memolog
 licenses:

data/lib/memolog/sentry_scope_extension.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Memolog::SentryScopeExtension
-  def apply_to_event(scope, hint = nil)
-    memolog_dump = Memolog.dump
-    set_extras(Memolog.config.sentry_key => memolog_dump) if memolog_dump
-
-    super
-  end
-end

data/lib/memolog/sentry_sidekiq_middleware_extension.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Memolog::SentrySidekiqMiddlewareExtension
-  def call(worker, job, queue)
-    Memolog.run { super }
-  end
-end