canonical_log 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db9324944116f69068168b7762d91c229899f43073008fc06346446e8742fcc
-  data.tar.gz: 3226c9fae5efac0ec81b6410ee3e7472f680ec875f7d13a2b823df55baccb6ca
+  metadata.gz: 253b27b00b94bca86297424080c22fa4d64029b0795127e857573689c64e6bc0
+  data.tar.gz: 60a9e18dbd9ab02d0ee6e2024977bdc4fc99db6f5e54cf6a17e46a92be842bf9
 SHA512:
-  metadata.gz: 33d67e16f158321cd26560e6b1691845b452c494593b338e7e15f677c5ada99779ff13adb0c832acdcc182010ae380ebc4f7ed331bf23110b3f75459c5d1bf24
-  data.tar.gz: 9130cd1796969d48363c42bf11cb3a81706942c840dde91b70d2974f7c755c8d9ae985dd365294e00b81b25b190a0e39da0cca2734ae8675c00383c05a864fa4
+  metadata.gz: abd6f3d1791e3781b75b90f051cf994696b7aafee5652b4110a4bded2a176bcf1f1aeff4be38c47a86a36c0bc2cc69243a9d79984d8c718981172746125447ad
+  data.tar.gz: cd0993781e080dc276def869041a69a430e06603a46cd8110a4a6563dc4f01515fc6b50ee2c40845ef057d132f46527196eab150e89f44fe9bc76c5ecb53c9a8

data/lib/canonical_log/configuration.rb

@@ -35,7 +35,7 @@ module CanonicalLog
       elsif @sample_rate >= 1.0
         true
       else
-        Sampling.default(event_hash, self)
+        Sampling.sample?(event_hash, self)
       end
     end
   end

data/lib/canonical_log/middleware.rb

@@ -52,20 +52,26 @@ module CanonicalLog
 
       config = CanonicalLog.configuration
       if config.user_context
-        begin
-          user_fields = config.user_context.call(env)
-          event.add(user_fields) if user_fields.is_a?(Hash)
-        rescue StandardError => e
-          warn "[CanonicalLog] user_context error: #{e.message}"
-        end
+        enrich_from_user_context_proc(env, event, config)
       elsif defined?(Warden::Manager) && env['warden']
-        user = env['warden'].user rescue nil
-        if user
-          event.context(:user, id: user.try(:id), email: user.try(:email))
-        end
+        enrich_from_warden(env, event)
       end
     end
 
+    def enrich_from_user_context_proc(env, event, config)
+      user_fields = config.user_context.call(env)
+      event.add(user_fields) if user_fields.is_a?(Hash)
+    rescue StandardError => e
+      warn "[CanonicalLog] user_context error: #{e.message}"
+    end
+
+    def enrich_from_warden(env, event)
+      user = env['warden'].user
+      event.context(:user, id: user.try(:id), email: user.try(:email)) if user
+    rescue StandardError
+      nil
+    end
+
     def emit!
       event = Context.current
       return unless event
@@ -76,6 +82,8 @@ module CanonicalLog
       event_hash = event.to_h
       return unless config.should_sample?(event_hash)
 
+      event_hash[:message] ||= build_message(event_hash)
+
       json = event_hash.to_json
 
       config.resolved_sinks.each do |sink|
@@ -87,6 +95,10 @@ module CanonicalLog
       warn "[CanonicalLog] Emit error: #{e.message}"
     end
 
+    def build_message(event_hash)
+      [event_hash[:http_method], event_hash[:path], event_hash[:http_status]].compact.join(' ')
+    end
+
     def ignored_path?(env)
       path = env['PATH_INFO']
       CanonicalLog.configuration.ignored_paths.any? do |pattern|

data/lib/canonical_log/sampling.rb

@@ -3,7 +3,7 @@
 module CanonicalLog
   module Sampling
     # Default sampling: always keep errors and slow requests, sample the rest.
-    def self.default(event_hash, config)
+    def self.sample?(event_hash, config)
       status = event_hash[:http_status] || 0
       duration = event_hash[:duration_ms] || 0
 

data/lib/canonical_log/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CanonicalLog
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/canonical_log.rb

@@ -13,6 +13,8 @@ require_relative 'canonical_log/sinks/stdout'
 require_relative 'canonical_log/sinks/rails_logger'
 require_relative 'canonical_log/subscribers/action_controller'
 require_relative 'canonical_log/subscribers/active_record'
+require_relative 'canonical_log/integrations/error_enrichment'
+require_relative 'canonical_log/integrations/sidekiq' if defined?(Sidekiq)
 
 require_relative 'canonical_log/railtie' if defined?(Rails::Railtie)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canonical_log
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Krzysztof Duda