getaround_utils 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6782f48cc315a19f03e388e3cd7af4e4dd9fa36aa661c4423186056c35b86a0
-  data.tar.gz: 6bbe9c3696d4991d77a7ce3205a0aca9fedb16cf4bc9e928024e8911f994ff44
+  metadata.gz: 2f6dd68f18739dcc00d036bb09895bd7a9ea55cafb8b75c7b27f0fb1b9d0c9ed
+  data.tar.gz: 76fd9e2acedc062898d72a3f86f08c892157f3e36db8a5839025c346cd1e324e
 SHA512:
-  metadata.gz: f8d7e8e930796ad130e8182bee49f4736afe42f9def854547582e5637b344db0bdb318213954a063f716d12f783e925e341f1ee6774958147e29bb362834e7c9
-  data.tar.gz: e19006a2224229ff80c0f68c51b15482641dbb68223b9d627667998f88dd6a0d4c7ed882d036e6c93674f4a2d7972a6f302cd2909459058d0b5f78e0cc054dad
+  metadata.gz: d885550f6cc2d3d7f829696457a6cc29cc08be3118b0ab8daf66d680942d26d5ac4242bc22277c87d694f4666c215f78ae4dbf8b2a0fbb692010d82694325180
+  data.tar.gz: 96a3ab41e81e981db9ed51288d9bccd7fbf4f21255e80832c2fa5c924d328a660f332975b602867a7e35e7dbd4259faa42e2f9d9e2ea092a4a05fb1e88f0005f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.2.24)
+    getaround_utils (0.2.25)
 
 GEM
   remote: https://rubygems.org/
@@ -71,7 +71,7 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    connection_pool (2.3.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -120,7 +120,7 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.5)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.1.4.6)
@@ -151,7 +151,8 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    redis (4.6.0)
+    redis-client (0.12.0)
+      connection_pool
     regexp_parser (2.2.1)
     relaxed-rubocop (2.5)
     request_store (1.5.1)
@@ -195,10 +196,11 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    sidekiq (6.5.0)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
+    sidekiq (7.0.3)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.11.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -236,7 +238,7 @@ DEPENDENCIES
   rspec (~> 3.9, >= 3.9.0)
   rspec-rails (~> 5.0)
   rubocop (= 1.25.1)
-  sidekiq (~> 6.0)
+  sidekiq (> 6.0, < 8.0)
   webmock (~> 3.7)
 
 BUNDLED WITH

data/getaround_utils.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'ougai', '~> 2.0'
   gem.add_development_dependency 'rails', '~> 6.0'
   gem.add_development_dependency 'request_store_rails', '~> 2.0'
-  gem.add_development_dependency 'sidekiq', '~> 6.0'
+  gem.add_development_dependency 'sidekiq', '> 6.0', "< 8.0"
 end

data/lib/getaround_utils/railties/ougai.rb

@@ -13,7 +13,12 @@ module GetaroundUtils::Railties; end
 # https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#define-a-custom-logger
 class OugaiRailsLogger < Ougai::Logger
   include ActiveSupport::LoggerThreadSafeLevel
-  include Rails::VERSION::MAJOR < 6 ? LoggerSilence : ActiveSupport::LoggerSilence
+  include ActiveSupport::LoggerSilence
+
+  def initialize(*args)
+    super
+    after_initialize if respond_to?(:after_initialize) && ActiveSupport::VERSION::MAJOR < 6
+  end
 end
 
 # Patch for ActiveSupport::TaggedLogging
@@ -46,14 +51,14 @@ end
 
 class GetaroundUtils::Railties::Ougai < Rails::Railtie
   config.ougai_logger = OugaiRailsLogger.new($stdout)
-  config.ougai_logger.after_initialize if Rails::VERSION::MAJOR < 6
   config.ougai_logger.formatter = GetaroundUtils::Ougai::JsonFormatter.new
+
   config.ougai_logger.before_log = lambda do |data|
-    request_store = RequestStore.store[:ougai] || {}
-    data.deep_merge!(request_store) if request_store&.any?
+    data.deep_merge!(RequestStore.store[:ougai]) \
+      if defined?(RequestStore) && RequestStore.store.key?(:ougai)
 
-    sidekiq_context = Thread.current[:sidekiq_context] || {}
-    data.merge!(sidekiq: sidekiq_context) if sidekiq_context&.any?
+    data.merge!(sidekiq: Thread.current[:sidekiq_context]) \
+      if defined?(Sidekiq) && Thread.current.key?(:sidekiq_context)
   end
 
   initializer :getaround_utils_ougai, before: :initialize_logger do |app|
@@ -61,16 +66,17 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
   end
 
   initializer :getaround_utils_ougai_middleware do |app|
-    app.config.app_middleware.insert_after ActionDispatch::RequestId, OugaiRequestStoreMiddleware
+    app.config.app_middleware.insert_after(ActionDispatch::RequestId, OugaiRequestStoreMiddleware)
   end
 
   initializer :getaround_utils_ougai_activesupport do
-    ActiveSupport::TaggedLogging::Formatter.prepend OugaiTaggedLoggingFormatter
+    ActiveSupport::TaggedLogging::Formatter.prepend(OugaiTaggedLoggingFormatter)
   end
 
   initializer :getaround_utils_ougai_lograge do |app|
     next unless defined?(Lograge)
 
+    # https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#with-lograge
     app.config.lograge.logger = app.config.logger
     app.config.lograge.formatter = Lograge::Formatters::Raw.new
   end
@@ -79,9 +85,13 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
     next unless defined?(Sidekiq)
 
     # https://github.com/tilfin/ougai/wiki/Customize-Sidekiq-logger
-    Sidekiq.logger = config.ougai_logger
+    Sidekiq.configure_client do |config|
+      config.logger = Rails.application.config.logger
+    end
 
     Sidekiq.configure_server do |config|
+      config.logger = Rails.application.config.logger
+
       original_handler = config.error_handlers.shift
       config.error_handlers << lambda do |ex, ctx|
         if Sidekiq.logger.is_a?(Ougai::Logger)

data/lib/getaround_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GetaroundUtils
-  VERSION = '0.2.24'
+  VERSION = '0.2.25'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,16 +203,22 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 description: Shared base utility classes for Getaround Backend Applications.
 email:
 - oss@drivy.com