memolog 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dce059f72625002e6b813ad70cf427c5a3a59fb00cc614b6c9f80c8424bae8f
-  data.tar.gz: 9e2fb92f533500da3d192c417b63578bfaa1984e76718e501393143e786796e5
+  metadata.gz: d8cb342892f52d20fa06101e203aa4d4d1c5efea05696c48bb7a30804b66befb
+  data.tar.gz: 4e7f8721ae37487cc8d88316432d2897f269c1817e75d66e562c5b846521cbd6
 SHA512:
-  metadata.gz: 6d3dd9ff1c59a672936711f746fafb06921558108c3973ba174a8d3b08feb5ad239120d3422cf9a1fb53ff9621c6b10e82489b8da055774674821cef0e33eaaf
-  data.tar.gz: 60a56a7a9bd93b7fb06383230b3874a41806cf422197675a148b31410b67265733fc89673613990e7e5adc279d9f5a0ac8ac134e8e2284b07503471ec7eb1e73
+  metadata.gz: 806d71859e439c83417ad71f5c97f53358405e55243f982e79ce5f28b6736f1ae0175c6bf25822bbd30c27dea0f04584b4eb820df8ec8a8632c5487d48667a31
+  data.tar.gz: fbf2765dcf76597eba069a9d627e5728306043962bb92b3e23aab8e253cc948be10a4bbc4220b3d66bcb48d62ca3f9b9e362c88e03ea98a8f268dc51160b2926

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    memolog (0.3.5)
+    memolog (0.4.0)
+      json (~> 2)
       logger (~> 1.4.3)
       securerandom (~> 0.1.0)
 
@@ -87,6 +88,7 @@ GEM
     i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     io-wait (0.2.1)
+    json (2.6.1)
     logger (1.4.4)
     loofah (2.13.0)
       crass (~> 1.0.2)
@@ -155,7 +157,7 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    redis (4.5.1)
+    redis (4.6.0)
     regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -167,11 +169,11 @@ GEM
     rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.25.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -204,7 +206,7 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     securerandom (0.1.1)
-    sidekiq (6.4.0)
+    sidekiq (6.4.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)

data/README.md

@@ -26,10 +26,10 @@ Use this example during application initialization process (this example impleme
 ```ruby
 Memolog.configure do |config|
   config.debug = false
-  config.formatter = ::Memolog::Formatter.new
+  config.formatter = ::Logger::Formatter.new
   config.middlewares = %i[rails sidekiq]
+  config.log_json = false
   config.log_size_limit = 50_000
-  config.uuid_callable = -> { SecureRandom.uuid }
 end
 
 Memolog.init_middlewares!
@@ -39,8 +39,8 @@ Available options are:
 - `debug` - set it to true if you need to leave Memolog.dump result outside `Memolog.run {}` block.
 - `formatter` - setup your own formatter.
 - `middlewares` - define here what you want to initialize in `#init_middlewares!` call.
+- `log_json` - `#dump` will try to parse dump with `JSON.parse()`. Default is `false`
 - `log_size_limit` - max log length in `#dump`.
-- `uuid_callable` - Memolog add unique value to logs, here you can redefine uuid generation.
 
 If you want to apply Sentry monkey patch that call `Memolog.dump` before `Sentry.capture_exception`
 and `Sentry.capture_message` you can implement it via this code:

data/lib/memolog/config.rb

@@ -4,14 +4,14 @@ Memolog::Config = Struct.new(
   :debug,
   :formatter,
   :middlewares,
+  :parse_json,
   :log_size_limit,
-  :uuid_callable,
 ) do
   def initialize
     self.debug = false
-    self.formatter = ::Memolog::Formatter.new
+    self.formatter = ::Logger::Formatter.new
     self.middlewares = %i[rails sidekiq]
+    self.parse_json = false
     self.log_size_limit = 50_000
-    self.uuid_callable = -> { SecureRandom.uuid }
   end
 end

data/lib/memolog/version.rb

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

data/lib/memolog.rb

@@ -3,10 +3,10 @@
 require "logger"
 require "securerandom"
 require "stringio"
+require "json"
 
 require "memolog/version"
 require "memolog/config"
-require "memolog/formatter"
 require "memolog/init"
 require "memolog/logger_extension"
 require "memolog/rails_middleware"
@@ -30,11 +30,6 @@ module Memolog
 
   def extend_logger(other_logger)
     other_logger.extend(Memolog::LoggerExtension)
-    other_logger.formatter = config.formatter
-  end
-
-  def uuid
-    Thread.current[:memolog_uuid]
   end
 
   def logger
@@ -46,8 +41,6 @@ module Memolog
   end
 
   def run
-    Thread.current[:memolog_uuid] = config.uuid_callable.call
-
     logdevs.push(StringIO.new)
     logger.instance_variable_set(:@logdev, logdevs.last)
 
@@ -62,6 +55,10 @@ 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).presence
+    dump = logdevs.last.string.slice(beginning, config.log_size_limit).presence
+
+    config.parse_json ? JSON.parse(dump) : dump
+  rescue JSON::ParserError
+    dump
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: memolog
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +75,6 @@ files:
 - bin/setup
 - lib/memolog.rb
 - lib/memolog/config.rb
-- lib/memolog/formatter.rb
 - lib/memolog/init.rb
 - lib/memolog/logger_extension.rb
 - lib/memolog/rails_middleware.rb

data/lib/memolog/formatter.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class Memolog::Formatter < Logger::Formatter
-  def call(severity, time, _progname, msg)
-    format(
-      Format,
-      severity[0..0],
-      format_datetime(time),
-      $PID,
-      severity,
-      Memolog.uuid,
-      msg2str(msg),
-    )
-  end
-end