getaround_utils 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6caee3209d10665822566c7ccc2d6b336c8132b72106aacda7db87a317a0f9f7
-  data.tar.gz: 241deaa2c3b3d37bb21bade62b517b54bee6fc62910113f2f40209862230d80c
+  metadata.gz: 1f7f3d0da69b7509f3053c794451828c06d884f52e99aa1e1354ce7d33d3f73b
+  data.tar.gz: 8de112caf848bd487de4ac5ef7fb914eca7177da431aa340a70efaaa84aa0078
 SHA512:
-  metadata.gz: c19cb3921b428f3cd7f5d885edb7eb2214fae0c07449f8a25e0a2225c6961408960d641f7a702b686cbf453476e4eea90e558f18ce0310af19ff49874f57ea17
-  data.tar.gz: 25230181f5c735e08c60384e5fd734969b4a703df25a2cf995f7582131a0e6b182e5d091e1bd5ab6d741f3b4008df09cb9d2c220e3ecaf5ab308ee913ca56eb0
+  metadata.gz: f64546ec07d84d49a4401898a488fbc8d934ee9083252930751395a0bf9343e01eb1a53d7721a55a870644b11de31d935fe8a9e59b5d80ace03108f2a16c3eaa
+  data.tar.gz: 024771347ee39b7ae902a1cae00903786f5cbabc0ed1f4db2da0e167ef710e5597eb2c42bfce171d5bea480ebc6f1fb7299c30d85898bc07fe63523000196281

data/Gemfile.lock

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

data/lib/getaround_utils/log_formatters/deep_key_value.rb

@@ -3,12 +3,6 @@ module GetaroundUtils::LogFormatters; end
 
 require 'getaround_utils/utils/deep_key_value_serializer'
 
-##
-# Format logs using key=value notation
-#
-# This logger leverage the fact that ruby Logger does not especially expect message to be string
-# It will attempt to serialize message it is a string otherwise adding it as message=value
-
 class GetaroundUtils::LogFormatters::DeepKeyValue < GetaroundUtils::Utils::DeepKeyValueSerializer
   def normalize(message)
     if message.is_a?(Hash)
@@ -37,11 +31,19 @@ class GetaroundUtils::LogFormatters::DeepKeyValue < GetaroundUtils::Utils::DeepK
   end
 
   module Sidekiq
+    def sidekiq_context
+      context = Thread.current&.fetch(:sidekiq_context, nil)
+      context.is_a?(Hash) ? context : {}
+    end
+
+    def sidekiq_tid
+      Thread.current&.fetch('sidekiq_tid', nil) || (Thread.current&.object_id ^ ::Process.pid).to_s(36)
+    end
+
     def call(severity, _datetime, appname, message)
       payload = { severity: severity, appname: appname }
-      sidekiq = { sidekiq: Thread.current[:sidekiq_context] || {} }
-      sidekiq[:sidekiq][:tid] = Thread.current['sidekiq_tid']
-      "#{normalize(payload)} #{normalize(message)} #{normalize(sidekiq)}\n"
+      sidekiq = sidekiq_context.merge(tid: sidekiq_tid).compact
+      "#{normalize(payload)} #{normalize(message)} #{normalize(sidekiq: sidekiq)}\n"
     end
   end
 

data/lib/getaround_utils/patches/key_value_sidekiq_exceptions.rb

@@ -12,10 +12,10 @@ class GetaroundUtils::Patches::KeyValueSidekiqExceptions
 
     def call(exception, ctx)
       payload = {}
-      payload[:exception] = exception&.class&.name
+      payload[:message] = exception.message
+      payload[:exception] = exception.class.name
+      payload[:backtrace] = exception.backtrace&.join("\n")
       payload[:sidekiq] = ctx
-      payload[:message] = exception&.message
-      payload[:backtrace] = exception&.backtrace&.join("\n")
       Sidekiq.logger.warn(kv_formatter.serialize(payload.compact))
     end
   end

data/lib/getaround_utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler