memolog 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef343d2ff0a1ab1ab1332a21933ae4d61c8f886eb7cb6915bc02b7f32b1a76a5
-  data.tar.gz: 5b30e29938609d8f4d6e4c2eedeca67abc1c8489af5031734f18336a6adaaa7e
+  metadata.gz: e99e3c68b6d46dff6769d0526a9b9638d6ddf479665929a8e03dddb5eeddf618
+  data.tar.gz: f7221b929323ff44066403d01a3f02eefb6dd8302c882a2a78df43776acdc03b
 SHA512:
-  metadata.gz: 76117086fd0ab8d3de08e545281812d7fdf7c0f222271210ef9ebcd8b32cb6b6d862bed851673c30b933672632d6541b722c3062bee9a3b98218e8d6e79ace16
-  data.tar.gz: 7a0e09ad5f7998eacdc9adfd55927b660d585c003ef12fc9aea44fb7920f4f306441dfe0d95b69a0b7264a4086cf183b551b3704baf3133ac8f3b3aa387829b7
+  metadata.gz: 35f308119cb2c44d09974ce1f9fda973e648212aefb36d6256678d0b281de6784be265bc87781b55f3aa05d5a3d6ddfdd60beb86e77420f629fab02e72e87be7
+  data.tar.gz: 3a82f19378b63f47ffcd9ad512ee44a2daa4769ffdaed6b01cd90e867e3cea31c200d264820f91af8307f0e43bb3a2c03944aa0d107bd2beeb6e6464a46cb8c7

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.0
+
+- Apply a prepend patch with `Sentry::Scope#apply_to_event` method.
+- Check constant definition via `Object.const_defined?`
+- Moving `Sentry::Sidekiq` scheme to monkey patch `Sentry::Sidekiq::SentryContextServerMiddleware`
+- More specs
+
+## 0.2.2
+
+- Do not init Rails middleware in Sidekiq server.
+
 ## 0.2.1
 
 - Better Rails middleware initialization.

data/Gemfile

@@ -11,4 +11,5 @@ gem "rake"
 gem "rspec"
 gem "rubocop-config-umbrellio"
 gem "sentry-ruby"
+gem "sentry-sidekiq"
 gem "sidekiq"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    memolog (0.2.2)
+    memolog (0.3.0)
       logger (~> 1.4.3)
       securerandom (~> 0.1.0)
 
@@ -98,7 +98,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    logger (1.4.3)
+    logger (1.4.4)
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -202,7 +202,7 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    securerandom (0.1.0)
+    securerandom (0.1.1)
     sentry-ruby (4.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       faraday (>= 1.0)
@@ -210,6 +210,9 @@ GEM
     sentry-ruby-core (4.7.3)
       concurrent-ruby
       faraday
+    sentry-sidekiq (4.7.3)
+      sentry-ruby-core (~> 4.7.0)
+      sidekiq (>= 3.0)
     sidekiq (6.2.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
@@ -242,6 +245,7 @@ DEPENDENCIES
   rspec
   rubocop-config-umbrellio
   sentry-ruby
+  sentry-sidekiq
   sidekiq
 
 BUNDLED WITH

data/lib/memolog/init.rb

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

data/lib/memolog/sentry_scope_extension.rb

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

data/lib/memolog/sentry_sidekiq_middleware_extension.rb

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

data/lib/memolog/version.rb

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

data/lib/memolog.rb

@@ -11,7 +11,7 @@ require "memolog/formatter"
 require "memolog/init"
 require "memolog/middleware"
 require "memolog/sentry_scope_extension"
-require "memolog/sentry_sidekiq_middleware"
+require "memolog/sentry_sidekiq_middleware_extension"
 
 module Memolog
   extend self
@@ -59,6 +59,6 @@ module Memolog
     beginning = logdevs.last.string.length - config.log_size_limit
     beginning = 0 if beginning.negative?
 
-    logdevs.last.string.slice(beginning, config.log_size_limit)
+    logdevs.last.string.slice(beginning, config.log_size_limit).presence
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memolog
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -66,7 +66,7 @@ files:
 - lib/memolog/init.rb
 - lib/memolog/middleware.rb
 - lib/memolog/sentry_scope_extension.rb
-- lib/memolog/sentry_sidekiq_middleware.rb
+- lib/memolog/sentry_sidekiq_middleware_extension.rb
 - lib/memolog/version.rb
 homepage: https://github.com/skirushkin/memolog
 licenses:

data/lib/memolog/sentry_sidekiq_middleware.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class Memolog::SentrySidekiqMiddleware
-  def call(*)
-    Memolog.run do
-      yield
-    rescue => error
-      memolog_dump = Memolog.dump
-      Sentry.set_extras(Memolog.config.sentry_key => memolog_dump) if memolog_dump
-      raise error
-    end
-  end
-end