getaround_utils 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b8b08a78e3737d628b9e809bb89c670252fc37ba
-  data.tar.gz: 34aa0786e2093c01af30981539cf971c275e5f14
+SHA256:
+  metadata.gz: 391634ba2c0e6d1c3fe81bbdaf24519a84dfaa61fa093b8cb5ef10b3b47445a1
+  data.tar.gz: 0733525cd736128b202d0c6e8e87bb724685a09a8349ddb6fcdaccd8d10e6bee
 SHA512:
-  metadata.gz: 96e165d62becbae525d2c717b2fa503149745ec3d8ca74ca70677d373dded88acdcdd67aadb05aa1474c89dff88ed2e4e34b2ceef2a001d2b13f391c0deecc50
-  data.tar.gz: 92a70522d2ba91b312bf5c985d3394f18a54d2dd7e2217ab1fbf973b5f666cafc26c309be3ee11287cf3f604a22bc903b666404b6068823307b2983ebf328940
+  metadata.gz: 9e1b37388a0f05c21337941a8badddbc4e0411c61bceb9e326d9e0c99d16459c7df9868d4e2b6a2dda566f08ff19ae56f939f33198cbd929165f7fab3086d2d1
+  data.tar.gz: '095c102942a20a9fc4f9ec0ea445a560ced7b34bf9dab794e151c273b0b6845a84d888a7cb12a6542e37bfd5d26b675214769bdc82fe42adb9306c507cdbf1f2'

data/Gemfile.lock

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

data/README.md

@@ -28,11 +28,11 @@ class MyClass
   end
 
   def action
-    loggable(:info, dynamic: 'value')
+    loggable(:info, 'hello', dynamic: 'value')
   end
 end
 
-MyClass.new.action # :info { origin: 'MyClass', static: 'value', dynamic: 'value' }
+MyClass.new.action # :info message="hello" origin="MyClass" static="value" dynamic="value"
 
 ```
 

data/lib/getaround_utils/log_formatters/deep_key_value.rb

@@ -15,7 +15,7 @@ class GetaroundUtils::LogFormatters::DeepKeyValue < GetaroundUtils::Utils::DeepK
     if message.is_a?(Hash)
       "#{serialize(payload.merge(message).compact)}\n"
     else
-      "#{serialize(payload.merge(message: message.to_s).compact)}\n"
+      "#{serialize(payload.compact)} #{message}\n"
     end
   end
 
@@ -36,10 +36,16 @@ class GetaroundUtils::LogFormatters::DeepKeyValue < GetaroundUtils::Utils::DeepK
   end
 
   module Sidekiq
-    def call(severity, datetime, appname, message)
-      payload = { tid: Thread.current['sidekiq_tid'] }
-      payload.merge!(Thread.current[:sidekiq_context] || {})
-      "#{super.chomp} #{serialize(sidekiq: payload.compact)}\n"
+    def call(severity, _datetime, appname, message)
+      payload = {}
+      payload[:sidekiq] = Thread.current[:sidekiq_context] || {}
+      payload[:sidekiq][:tid] = Thread.current['sidekiq_tid']
+      message = if message.is_a?(Hash)
+        message.merge(payload.compact)
+      else
+        "#{serialize(payload.compact)} #{message}"
+      end
+      super
     end
   end
 

data/lib/getaround_utils/mixins/loggable.rb

@@ -24,10 +24,15 @@ module GetaroundUtils::Mixins::Loggable
     end
   end
 
-  def loggable(severity, payload)
-    extra_infos = {}
-    base_append_infos_to_loggable(extra_infos)
-    payload = payload.merge(extra_infos).compact
-    base_loggable_logger.send(severity.to_sym, payload)
+  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)
+    base_loggable_logger.send(severity.to_sym, message)
   end
 end

data/lib/getaround_utils/patches.rb

@@ -1,4 +1,3 @@
 module GetaroundUtils::Patches
-  autoload :FixTaggedLoggingStringCoercion, 'getaround_utils/patches/fix_tagged_logging_string_coercion'
   autoload :KeyValueLogTags, 'getaround_utils/patches/key_value_log_tags'
 end

data/lib/getaround_utils/version.rb

@@ -1,3 +1,3 @@
 module GetaroundUtils
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,20 +29,20 @@ dependencies:
   name: getaround-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
@@ -105,22 +105,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -139,42 +139,42 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.75'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.75.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.75'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.75'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.75.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.75'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.36.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.36.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.36'
 description: Shared base utility classes for Getaround Backend Applications.
 email:
 - oss@drivy.com
@@ -193,7 +193,6 @@ files:
 - lib/getaround_utils/mixins.rb
 - lib/getaround_utils/mixins/loggable.rb
 - lib/getaround_utils/patches.rb
-- lib/getaround_utils/patches/fix_tagged_logging_string_coercion.rb
 - lib/getaround_utils/patches/key_value_log_tags.rb
 - lib/getaround_utils/railties/lograge.rb
 - lib/getaround_utils/utils.rb
@@ -218,8 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Backend shared utility classes

data/lib/getaround_utils/patches/fix_tagged_logging_string_coercion.rb

@@ -1,32 +0,0 @@
-require 'rails/railtie'
-module GetaroundUtils; end
-module GetaroundUtils::Patches; end
-
-##
-# Fixes the ActiveSupport::TaggedLogging::Formatter string coercion
-#
-# Ruby Logger and child classes don't necessarilly expect message to be string.
-# In theory, they should preserve the message value intact until it is passed to the formatter.
-#
-# ActiveSupport::TaggedLogging breaks this by injecting the tags via string concatenation,
-# which coerces messages of any type into String.
-# This patches works around this by instead appending the tags to the result of the
-# original formatter result, which is garanteed to be a string
-
-class GetaroundUtils::Patches::FixTaggedLoggingStringCoercion
-  module TaggedLoggingFormatter
-    def fixed_tags_text
-      " #{tags_text.strip}" if tags_text
-    end
-
-    def call(severity, datetime, appname, message)
-      original_method = method(__method__).super_method.super_method
-      payload = original_method.call(severity, datetime, appname, message)
-      "#{payload.chomp}#{fixed_tags_text}\n"
-    end
-  end
-
-  def self.enable
-    ActiveSupport::TaggedLogging::Formatter.prepend TaggedLoggingFormatter
-  end
-end