getaround_utils 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7f3d0da69b7509f3053c794451828c06d884f52e99aa1e1354ce7d33d3f73b
-  data.tar.gz: 8de112caf848bd487de4ac5ef7fb914eca7177da431aa340a70efaaa84aa0078
+  metadata.gz: c8111d0bfe63899265268fea8edcea433312a1286299d5b00f67fd5eb658c813
+  data.tar.gz: bb7c45164af9db998c5f0008f4dbec5288ff87f49d923f28916c79af94683bf0
 SHA512:
-  metadata.gz: f64546ec07d84d49a4401898a488fbc8d934ee9083252930751395a0bf9343e01eb1a53d7721a55a870644b11de31d935fe8a9e59b5d80ace03108f2a16c3eaa
-  data.tar.gz: 024771347ee39b7ae902a1cae00903786f5cbabc0ed1f4db2da0e167ef710e5597eb2c42bfce171d5bea480ebc6f1fb7299c30d85898bc07fe63523000196281
+  metadata.gz: 7f0992f71d843c927bd5d6dffe170980c3a7adfc6dce0997b49c6299159593ba9866f7d68b70a0feeaf59689913f7a5f9fc22cddab0c11a59d78800c19fd1d16
+  data.tar.gz: e8c73735d0189471f259da0c57a9821bf98c741718877558d1918c1a2500fc3b910ca2d7c6a0cc4d71516e8099d506ffdad10eaae2496af64a5bd6fd4218b065

data/.ruby-version

@@ -0,0 +1 @@
+2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.1.11)
+    getaround_utils (0.1.12)
 
 GEM
   remote: https://rubygems.org/

data/lib/getaround_utils/log_formatters/deep_key_value.rb

@@ -1,36 +1,46 @@
 module GetaroundUtils; end
 module GetaroundUtils::LogFormatters; end
 
-require 'getaround_utils/utils/deep_key_value_serializer'
-
-class GetaroundUtils::LogFormatters::DeepKeyValue < GetaroundUtils::Utils::DeepKeyValueSerializer
-  def normalize(message)
-    if message.is_a?(Hash)
-      serialize(message.compact)
-    elsif message.is_a?(String) && message.match(/^[^ =]+=/)
-      message
-    else
-      serialize(message: message.to_s)
+require 'getaround_utils/utils/deep_key_value'
+
+class GetaroundUtils::LogFormatters::DeepKeyValue
+  module Shared
+    def normalize(message)
+      if message.is_a?(Hash)
+        GetaroundUtils::Utils::DeepKeyValue.serialize(message.compact)
+      elsif message.is_a?(String) && message.match(/^[^ =]+=/)
+        message
+      else
+        GetaroundUtils::Utils::DeepKeyValue.serialize(message: message.to_s)
+      end
     end
   end
 
-  def call(severity, _datetime, appname, message)
-    payload = { severity: severity, appname: appname }
-    "#{normalize(payload)} #{normalize(message)}\n"
+  class Base
+    include GetaroundUtils::LogFormatters::DeepKeyValue::Shared
+
+    def call(severity, _datetime, appname, message)
+      payload = { severity: severity, appname: appname }
+      "#{normalize(payload)} #{normalize(message)}\n"
+    end
+  end
+
+  def self.new
+    Base.new
   end
 
-  module Lograge
+  class Lograge
     def call(message)
       message = message.compact if message.is_a?(Hash)
-      serialize(message)
+      GetaroundUtils::Utils::DeepKeyValue.serialize(message)
     end
   end
 
   def self.for_lograge
-    new.extend(Lograge)
+    Lograge.new
   end
 
-  module Sidekiq
+  class Sidekiq < Base
     def sidekiq_context
       context = Thread.current&.fetch(:sidekiq_context, nil)
       context.is_a?(Hash) ? context : {}
@@ -48,6 +58,6 @@ class GetaroundUtils::LogFormatters::DeepKeyValue < GetaroundUtils::Utils::DeepK
   end
 
   def self.for_sidekiq
-    new.extend(Sidekiq)
+    Sidekiq.new
   end
 end

data/lib/getaround_utils/mixins/loggable.rb

@@ -24,15 +24,11 @@ module GetaroundUtils::Mixins::Loggable
     end
   end
 
-  def loggable_formatter
-    @loggable_formatter ||= GetaroundUtils::Utils::DeepKeyValueSerializer.new
-  end
-
   def loggable(severity, message, payload = {})
     payload = { message: message }.merge(payload)
     base_append_infos_to_loggable(payload)
 
-    message = loggable_formatter.serialize(payload.compact)
+    message = GetaroundUtils::Utils::DeepKeyValue.serialize(payload.compact)
     base_loggable_logger.send(severity.to_sym, message)
   end
 end

data/lib/getaround_utils/patches/key_value_log_tags.rb

@@ -1,4 +1,4 @@
-require 'getaround_utils/utils/deep_key_value_serializer'
+require 'getaround_utils/log_formatters/deep_key_value'
 
 module GetaroundUtils; end
 module GetaroundUtils::Patches; end
@@ -18,25 +18,29 @@ module GetaroundUtils::Patches; end
 
 class GetaroundUtils::Patches::KeyValueLogTags
   module TaggedLoggingFormatter
+    include GetaroundUtils::LogFormatters::DeepKeyValue::Shared
+
     def tags_text
       "#{current_tags.join(' ')} " if current_tags.any?
     end
-  end
 
-  module RackLogger
-    def kv_formatter
-      @kv_formatter ||= GetaroundUtils::Utils::DeepKeyValueSerializer.new
+    def call(severity, datetime, appname, message)
+      original_method = method(__method__).super_method.super_method
+      message = "#{tags_text}#{normalize(message)}"
+      original_method.call(severity, datetime, appname, message)
     end
+  end
 
+  module RackLogger
     def compute_tags(request)
       @taggers.collect do |tag|
         case tag
         when Proc
-          kv_formatter.serialize(tag.call(request))
+          GetaroundUtils::Utils::DeepKeyValue.serialize(tag.call(request))
         when Symbol
-          kv_formatter.serialize(tag => request.send(tag))
+          GetaroundUtils::Utils::DeepKeyValue.serialize(tag => request.send(tag))
         else
-          kv_formatter.serialize(tag)
+          GetaroundUtils::Utils::DeepKeyValue.serialize(tag)
         end
       end
     end

data/lib/getaround_utils/patches/key_value_sidekiq_exceptions.rb

@@ -1,22 +1,18 @@
 require 'sidekiq/exception_handler'
-require 'getaround_utils/utils/deep_key_value_serializer'
+require 'getaround_utils/utils/deep_key_value'
 
 module GetaroundUtils; end
 module GetaroundUtils::Patches; end
 
 class GetaroundUtils::Patches::KeyValueSidekiqExceptions
   module ExceptionHandlerLogger
-    def kv_formatter
-      @kv_formatter ||= GetaroundUtils::Utils::DeepKeyValueSerializer.new
-    end
-
     def call(exception, ctx)
       payload = {}
       payload[:message] = exception.message
       payload[:exception] = exception.class.name
       payload[:backtrace] = exception.backtrace&.join("\n")
       payload[:sidekiq] = ctx
-      Sidekiq.logger.warn(kv_formatter.serialize(payload.compact))
+      Sidekiq.logger.warn(GetaroundUtils::Utils::DeepKeyValue.serialize(payload.compact))
     end
   end
 

data/lib/getaround_utils/utils/{deep_key_value_serializer.rb → deep_key_value.rb}

@@ -1,13 +1,8 @@
 module GetaroundUtils; end
 module GetaroundUtils::Utils; end
 
-class GetaroundUtils::Utils::DeepKeyValueSerializer
-  def initialize(max_depth: 5, max_length: 512)
-    @max_depth = max_depth
-    @max_length = max_length
-  end
-
-  def serialize(data)
+module GetaroundUtils::Utils::DeepKeyValue
+  def self.serialize(data)
     case data
     when Array
       flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
@@ -23,31 +18,31 @@ class GetaroundUtils::Utils::DeepKeyValueSerializer
   end
 
   # https://stackoverflow.com/questions/48836464/how-to-flatten-a-hash-making-each-key-a-unique-value
-  def flattify(value, result = {}, path = [])
-    if path.length > @max_depth
+  def self.flattify(value, result = {}, path = [], max_length = 512, max_depth = 5)
+    if path.length > max_depth
       result[path.join(".")] = '"..."'
       return result
     end
     case value
     when Array
       value.each.with_index(0) do |v, i|
-        flattify(v, result, path + [i])
+        flattify(v, result, path + [i], max_length, max_depth)
       end
     when Hash
       value.each do |k, v|
-        flattify(v, result, path + [k])
+        flattify(v, result, path + [k], max_length, max_depth)
       end
     when Numeric
       result[path.join(".")] = value.to_s
     when String
       value = if value =~ /^".*"$/
-        value.length >= @max_length ? %{#{value[0...@max_length]} ..."} : value
+        value.length >= max_length ? %{#{value[0...max_length]} ..."} : value
       else
-        value.length >= @max_length ? %{#{value[0...@max_length]} ...}.inspect : value.inspect
+        value.length >= max_length ? %{#{value[0...max_length]} ...}.inspect : value.inspect
       end
       result[path.join(".")] = value
     else
-      flattify(value.to_s, result, path)
+      flattify(value.to_s, result, path, max_length, max_depth)
     end
     result
   end

data/lib/getaround_utils/utils.rb

@@ -1,3 +1,3 @@
 module GetaroundUtils::Utils
-  autoload :DeepKeyValueSerializer, 'getaround_utils/utils/deep_key_value_serializer'
+  autoload :DeepKeyValue, 'getaround_utils/utils/deep_key_value'
 end

data/lib/getaround_utils/version.rb

@@ -1,3 +1,3 @@
 module GetaroundUtils
-  VERSION = '0.1.11'.freeze
+  VERSION = '0.1.12'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -211,7 +212,7 @@ files:
 - lib/getaround_utils/patches/key_value_sidekiq_exceptions.rb
 - lib/getaround_utils/railties/lograge.rb
 - lib/getaround_utils/utils.rb
-- lib/getaround_utils/utils/deep_key_value_serializer.rb
+- lib/getaround_utils/utils/deep_key_value.rb
 - lib/getaround_utils/version.rb
 homepage: https://github.com/drivy
 licenses: