memolog 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f3276d2ccd3726c5e46dee8275cee70124955d9b8764e371097324a4643713
-  data.tar.gz: c6ca8429d029135ba450f232d80a1406d4256a03193705ead871d39e7800698a
+  metadata.gz: a4c3d9289bf4c0378b3050613589595dbf2c1d1e5a25a0fa9f0c3d2302a2963e
+  data.tar.gz: 0b56db61731b0e1bd1c293216cf0a0fab009ea8eb70be2b85601a27b70cdf284
 SHA512:
-  metadata.gz: 706306f7722c755d2df86f76141a102d9da097b8bab2b64830fc1381652c64da5ba45bba31ed696773f641f4864bd2d1c06a91e191bfe1e4ea0192d3e56c0eac
-  data.tar.gz: 2136479ffe04455d9a56ba52fce097a182deb65c924a7a9f1a18e653eb49419a2063c895f72242c1ee581596bc95688f8f0759de175e3c7819e3e91346041ffe
+  metadata.gz: 6a25437819058d1330f195a7dbbeea54d728face25790bc83c6fcba84500e18b459a8d50730c79e598b86c4c7a0f953d5ab804c2d71bb38c3d2f898a08097761
+  data.tar.gz: 0b90e159e40b2a0e4a7fb0c0aa84e96a8de0fb3b4538346e5614f894f001574c7c0157963273d50081aa36fc732085f46bd97afa9991d42085235e393a3d5e93

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+memolog-*.gem

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 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.
+
 ## 0.2.0
 
 - Uprade gem due [CVE-2021-41098](https://github.com/advisories/GHSA-2rr5-8q37-2w7h)

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.0)
+    memolog (0.3.1)
       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,21 +10,27 @@ class Memolog::Init
   private
 
   def init_rails!
-    return unless defined?(Rails) && Memolog.config.initializers.include?(:rails)
-    require "memolog/railtie"
+    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::RailsMiddleware)
   end
 
   def init_sentry!
-    return unless defined?(Sentry::Scope) && Memolog.config.initializers.include?(:sentry)
-    Sentry::Scope.prepend(Memolog::SentryScopeExtension)
+    return unless Memolog.config.initializers.include?(:sentry)
+    return unless Object.const_defined?("Sentry")
+
+    Sentry.prepend(Memolog::SentryExtension)
   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?("Sidekiq")
 
     Sidekiq.configure_server do |config|
       config.server_middleware do |chain|
-        chain.prepend(Memolog::SentrySidekiqMiddleware)
+        chain.prepend(Memolog::SidekiqMiddleware)
       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.2.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"
+require "memolog/rails_middleware"
+require "memolog/sentry_extension"
+require "memolog/sidekiq_middleware"
 
 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.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -64,10 +64,9 @@ files:
 - lib/memolog/extension.rb
 - lib/memolog/formatter.rb
 - lib/memolog/init.rb
-- lib/memolog/middleware.rb
-- lib/memolog/railtie.rb
-- lib/memolog/sentry_scope_extension.rb
-- lib/memolog/sentry_sidekiq_middleware.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/railtie.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Memolog::Railtie < Rails::Railtie
-  initializer "memolog.configure_rails_initialization" do |app|
-    app.middleware.insert_before(0, Memolog::Middleware)
-  end
-end

data/lib/memolog/sentry_scope_extension.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Memolog::SentryScopeExtension
-  def extra
-    memolog_dump = Memolog.dump
-    memolog_dump.present? ? super.merge!(Memolog.config.sentry_key => memolog_dump) : super
-  end
-end

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