semantic_logger 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ad46c624c9904d87ec5b38c7fdc28e12dcc62d
-  data.tar.gz: 92ce4e537d95a70422e9662001683c82a75ce7dd
+  metadata.gz: 4cf47326afecad1dcc0ecd8cffa732b51c023356
+  data.tar.gz: d8d72838b88abb13b94e1433d1676fff824eda26
 SHA512:
-  metadata.gz: fb9845a97ecaed5b6e91f0a97e6fc61464411969af7798ebd04e336eea66e115df1447514a3fd80c3d1e36236f79071ebd8dfc2b9bdcf2af1100deeb2297d389
-  data.tar.gz: 23cd01a8709c925132f82ddf697aa8b29a57a35a595ad308ba772c948cef722b25d9aacbd6c89d56531f08dcfdd25727dc486223d867db7e868564e2d29e0f86
+  metadata.gz: fbefeb4f49ea32b347f09997baf3c9ca7138177c1ae9ea307088ca900cc74ad0fd8d1af8fba0479fcfbd16c37ec9df24aeb1e0fbe988eef90b3fce0e92933652
+  data.tar.gz: 0e168803566680fa7b20843df409e55bc4767b90a23c89249a6d7d7237f1b683d135088fc250a192d37726930ebee972844cb5b002e39c68b244eec8ad271d25

data/lib/semantic_logger.rb

@@ -41,8 +41,9 @@ module SemanticLogger
 end
 # @formatter:on
 
-# Close and flush all appenders at exit, waiting for outstanding messages on the queue
-# to be written first
+# Flush all appenders at exit, waiting for outstanding messages on the queue
+# to be written first.
 at_exit do
-  SemanticLogger.close
+  # Cannot close since test frameworks only run at exit, at which point the logging would already be closed.
+  SemanticLogger.flush
 end

data/lib/semantic_logger/appender/bugsnag.rb

@@ -38,7 +38,7 @@ class SemanticLogger::Appender::Bugsnag < SemanticLogger::Subscriber
 
   # Returns [Hash] of parameters to send to Bugsnag.
   def call(log, logger)
-    h = SemanticLogger::Formatters::Raw.new.call(log, logger)
+    h            = SemanticLogger::Formatters::Raw.new.call(log, logger)
     h[:severity] = log_level(log)
     h.delete(:message) if h[:exception] && (h[:message] == h[:exception][:message])
     h.delete(:time)

data/lib/semantic_logger/appender/elasticsearch.rb

@@ -69,7 +69,7 @@ class SemanticLogger::Appender::Elasticsearch < SemanticLogger::Subscriber
   #     Name of this application to appear in log messages.
   #     Default: SemanticLogger.application
   def initialize(url: 'http://localhost:9200', index: 'semantic_logger', type: 'log', flush_interval: 1, timeout_interval: 10, batch_size: 500,
-    level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                 level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
     @url              = url
     @index            = index

data/lib/semantic_logger/appender/elasticsearch_http.rb

@@ -49,13 +49,13 @@ class SemanticLogger::Appender::ElasticsearchHttp < SemanticLogger::Appender::Ht
   #     Name of this application to appear in log messages.
   #     Default: SemanticLogger.application
   def initialize(index: 'semantic_logger', type: 'log',
-    url: 'http://localhost:9200', compress: false, ssl: {}, open_timeout: 2.0, read_timeout: 1.0, continue_timeout: 1.0,
-    level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                 url: 'http://localhost:9200', compress: false, ssl: {}, open_timeout: 2.0, read_timeout: 1.0, continue_timeout: 1.0,
+                 level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
     @index = index
     @type  = type
-    super(url: url, compress: compress, ssl: ssl, open_timeout: 2.0, read_timeout: open_timeout, continue_timeout: continue_timeout,
-      level:   level, formatter: formatter, filter: filter, application: application, host: host, &block)
+    super(url:   url, compress: compress, ssl: ssl, open_timeout: 2.0, read_timeout: open_timeout, continue_timeout: continue_timeout,
+          level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
 
     @request_path = "#{@path.end_with?('/') ? @path : "#{@path}/"}#{@index}-%Y.%m.%d"
     @logging_path = "#{@request_path}/#{type}"

data/lib/semantic_logger/appender/graylog.rb

@@ -81,7 +81,7 @@ class SemanticLogger::Appender::Graylog < SemanticLogger::Subscriber
   #     Name of this application to appear in log messages.
   #     Default: SemanticLogger.application
   def initialize(url: 'udp://localhost:12201', max_size: 'WAN', gelf_options: {}, level_map: LevelMap.new,
-    level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                 level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
     @url          = url
     @max_size     = max_size

data/lib/semantic_logger/appender/http.rb

@@ -17,7 +17,7 @@ require 'json'
 #   )
 class SemanticLogger::Appender::Http < SemanticLogger::Subscriber
   attr_accessor :username, :application, :host, :compress, :header,
-    :open_timeout, :read_timeout, :continue_timeout
+                :open_timeout, :read_timeout, :continue_timeout
   attr_reader :http, :url, :server, :port, :path, :ssl_options
 
   # Create HTTP(S) log appender
@@ -78,7 +78,7 @@ class SemanticLogger::Appender::Http < SemanticLogger::Subscriber
   #   continue_timeout: [Float]
   #     Default: 1.0
   def initialize(url:, compress: false, ssl: {}, username: nil, password: nil, open_timeout: 2.0, read_timeout: 1.0, continue_timeout: 1.0,
-    level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                 level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
     @url              = url
     @ssl_options      = ssl

data/lib/semantic_logger/appender/kafka.rb

@@ -21,9 +21,9 @@ require 'date'
 #   )
 class SemanticLogger::Appender::Kafka < SemanticLogger::Subscriber
   attr_accessor :seed_brokers, :client_id, :connect_timeout, :socket_timeout,
-    :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_key,
-    :delivery_threshold, :delivery_interval,
-    :topic, :partition, :partition_key, :key
+                :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_key,
+                :delivery_threshold, :delivery_interval,
+                :topic, :partition, :partition_key, :key
 
   # Send log messages to Kafka in JSON format.
   #
@@ -110,10 +110,10 @@ class SemanticLogger::Appender::Kafka < SemanticLogger::Subscriber
   #     Name of this application to appear in log messages.
   #     Default: SemanticLogger.application
   def initialize(seed_brokers:, client_id: 'semantic-logger', connect_timeout: nil, socket_timeout: nil,
-    ssl_ca_cert: nil, ssl_client_cert: nil, ssl_client_cert_key: nil,
-    topic: 'log_messages', partition: nil, partition_key: nil, key: nil,
-    delivery_threshold: 100, delivery_interval: 10,
-    level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                 ssl_ca_cert: nil, ssl_client_cert: nil, ssl_client_cert_key: nil,
+                 topic: 'log_messages', partition: nil, partition_key: nil, key: nil,
+                 delivery_threshold: 100, delivery_interval: 10,
+                 level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
     @seed_brokers        = seed_brokers
     @client_id           = @client_id

data/lib/semantic_logger/appender/mongodb.rb

@@ -104,7 +104,7 @@ module SemanticLogger
       #     Name of this application to appear in log messages.
       #     Default: SemanticLogger.application
       def initialize(uri:, collection_name: 'semantic_logger', write_concern: 0, collection_size: 1024**3, collection_max: nil,
-        level: nil, formatter: nil, filter: nil, host: nil, application: nil, &block)
+                     level: nil, formatter: nil, filter: nil, host: nil, application: nil, &block)
 
         @client          = Mongo::Client.new(uri, logger: SemanticLogger::Processor.logger.clone)
         @collection_name = collection_name

data/lib/semantic_logger/appender/sentry.rb

@@ -36,25 +36,28 @@ class SemanticLogger::Appender::Sentry < SemanticLogger::Subscriber
   #     Name of this application to appear in log messages.
   #     Default: SemanticLogger.application
   def initialize(level: :error, formatter: nil, filter: nil, application: nil, host: nil, &block)
+    # Replace the Sentry Raven logger so that we can identify its log messages and not forward them to Sentry
+    Raven.configure { |config| config.logger = SemanticLogger[Raven] }
     super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
   end
 
   # Send an error notification to sentry
   def log(log)
     return false unless should_log?(log)
+    # Ignore logs coming from Ravent itself
+    return false if log.name == 'Raven'
 
     context = formatter.call(log, self)
     if log.exception
       context.delete(:exception)
       Raven.capture_exception(log.exception, context)
     else
-      message             = {
-        error_class:   context.delete(:name),
-        error_message: context.delete(:message),
-        extra:         context
+      attrs                     = {
+        level: context.delete(:level),
+        extra: context
       }
-      message[:backtrace] = log.backtrace if log.backtrace
-      Raven.capture_message(message[:error_message], message)
+      attrs[:extra][:backtrace] = log.backtrace if log.backtrace
+      Raven.capture_message(context[:message], attrs)
     end
     true
   end

data/lib/semantic_logger/appender/splunk_http.rb

@@ -67,14 +67,14 @@ class SemanticLogger::Appender::SplunkHttp < SemanticLogger::Appender::Http
   #     Proc: Only include log messages where the supplied Proc returns true
   #           The Proc must return true or false.
   def initialize(token: nil, source_type: nil, index: nil,
-    url:, compress: true, ssl: {}, open_timeout: 2.0, read_timeout: 1.0, continue_timeout: 1.0,
-    level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                 url:, compress: true, ssl: {}, open_timeout: 2.0, read_timeout: 1.0, continue_timeout: 1.0,
+                 level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
-    @source_type       = source_type
-    @index             = index
+    @source_type = source_type
+    @index       = index
 
-    super(url: url, compress: compress, ssl: ssl, open_timeout: 2.0, read_timeout: open_timeout, continue_timeout: continue_timeout,
-      level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
+    super(url:   url, compress: compress, ssl: ssl, open_timeout: 2.0, read_timeout: open_timeout, continue_timeout: continue_timeout,
+          level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
 
     # Put splunk auth token in the header of every HTTP post.
     @header['Authorization'] = "Splunk #{token}"

data/lib/semantic_logger/appender/syslog.rb

@@ -120,9 +120,9 @@ module SemanticLogger
       #     # Change the warn level to LOG_NOTICE level instead of a the default of LOG_WARNING.
       #     SemanticLogger.add_appender(appender: :syslog, level_map: {warn: ::Syslog::LOG_NOTICE})
       def initialize(url: 'syslog://localhost',
-        facility: ::Syslog::LOG_USER, level_map: SemanticLogger::Formatters::Syslog::LevelMap.new, options: ::Syslog::LOG_PID|::Syslog::LOG_CONS,
-        tcp_client: {},
-        level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+                     facility: ::Syslog::LOG_USER, level_map: SemanticLogger::Formatters::Syslog::LevelMap.new, options: ::Syslog::LOG_PID|::Syslog::LOG_CONS,
+                     tcp_client: {},
+                     level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
 
         @options            = options
         @facility           = facility

data/lib/semantic_logger/appender/tcp.rb

@@ -182,11 +182,11 @@ module SemanticLogger
       #     connect_retry_count:    5
       #   )
       def initialize(server: nil, servers: nil, separator: "\n",
-        policy: :ordered, buffered: true, #keepalive: true,
-        connect_timeout: 10.0, read_timeout: 60.0, write_timeout: 60.0,
-        connect_retry_count: 10, retry_count: 3, connect_retry_interval: 0.5, close_on_error: true,
-        on_connect: nil, proxy_server: nil, ssl: nil,
-        level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block
+                     policy: :ordered, buffered: true, #keepalive: true,
+                     connect_timeout: 10.0, read_timeout: 60.0, write_timeout: 60.0,
+                     connect_retry_count: 10, retry_count: 3, connect_retry_interval: 0.5, close_on_error: true,
+                     on_connect: nil, proxy_server: nil, ssl: nil,
+                     level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block
       )
         @separator                 = separator
         @options                   = {

data/lib/semantic_logger/base.rb

@@ -326,7 +326,7 @@ module SemanticLogger
             if silence_level = params[:silence]
               # In case someone accidentally sets `silence: true` instead of `silence: :error`
               silence_level = :error if silence_level == true
-              silence(silence_level) {yield(params)}
+              silence(silence_level) { yield(params) }
             else
               yield(params)
             end

data/lib/semantic_logger/semantic_logger.rb

@@ -193,7 +193,7 @@ module SemanticLogger
   #   Not all appenders implement reopen.
   #   Check the code for each appender you are using before relying on this behavior.
   def self.reopen
-    @appenders.each {|appender| appender.reopen if appender.respond_to?(:reopen)}
+    @appenders.each { |appender| appender.reopen if appender.respond_to?(:reopen) }
     # After a fork the appender thread is not running, start it if it is not running.
     SemanticLogger::Processor.start
   end
@@ -407,7 +407,7 @@ module SemanticLogger
   def self.named_tags
     if (list = Thread.current[:semantic_logger_named_tags]) && !list.empty?
       if list.size > 1
-        list.reduce({}) {|sum, h| sum.merge(h)}
+        list.reduce({}) { |sum, h| sum.merge(h) }
       else
         list.first.clone
       end

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger #:nodoc
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/test/appender/elasticsearch_test.rb

@@ -8,7 +8,7 @@ module Appender
         skip('Concurrent::TimerTask issue is preventing the process from stopping.') if defined? JRuby
         Elasticsearch::Transport::Client.stub_any_instance(:bulk, true) do
           @appender = SemanticLogger::Appender::Elasticsearch.new(
-            url: 'http://localhost:9200',
+            url:        'http://localhost:9200',
             batch_size: 1 # immediate flush
           )
         end
@@ -21,7 +21,7 @@ module Appender
 
       it 'logs to daily indexes' do
         index = nil
-        @appender.stub(:enqueue, ->(ind, json){ index = ind['index']['_index'] } ) do
+        @appender.stub(:enqueue, ->(ind, json) { index = ind['index']['_index'] }) do
           @appender.info @message
         end
         assert_equal "semantic_logger-#{Time.now.strftime('%Y.%m.%d')}", index
@@ -30,7 +30,7 @@ module Appender
       SemanticLogger::LEVELS.each do |level|
         it "send #{level}" do
           request = nil
-          @appender.client.stub(:bulk, -> r { request = r; {"status" => 201 } }) do
+          @appender.client.stub(:bulk, -> r { request = r; {"status" => 201} }) do
             @appender.send(level, @message)
           end
 
@@ -47,7 +47,7 @@ module Appender
             exc = e
           end
           request = nil
-          @appender.client.stub(:bulk, -> r { request = r; {"status" => 201 } }) do
+          @appender.client.stub(:bulk, -> r { request = r; {"status" => 201} }) do
             @appender.send(level, 'Reading File', exc)
           end
 
@@ -63,7 +63,7 @@ module Appender
 
         it "sends #{level} custom attributes" do
           request = nil
-          @appender.client.stub(:bulk, -> r { request = r; {"status" => 201 } }) do
+          @appender.client.stub(:bulk, -> r { request = r; {"status" => 201} }) do
             @appender.send(level, @message, {key1: 1, key2: 'a'})
           end
 

data/test/appender/sentry_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-# Unit Test for SemanticLogger::Appender::Bugsnag
+# Unit Test for SemanticLogger::Appender::Sentry
 module Appender
   class SentryTest < Minitest::Test
     describe SemanticLogger::Appender::Sentry do
@@ -16,16 +16,16 @@ module Appender
           Raven.stub(:capture_message, -> msg, h { error_message = msg; hash = h }) do
             @appender.send(level, @message)
           end
-          assert_equal @message, hash[:error_message]
-          assert_equal 'SemanticLogger::Appender::Sentry', hash[:error_class]
+          assert_equal @message, error_message
+          assert_equal 'SemanticLogger::Appender::Sentry', hash[:extra][:name]
 
           if [:error, :fatal].include?(level)
-            assert hash.has_key?(:backtrace)
+            assert hash[:extra].has_key?(:backtrace)
           else
-            refute hash.has_key?(:backtrace)
+            refute hash[:extra].has_key?(:backtrace)
           end
           assert_equal true, hash.has_key?(:extra)
-          assert_equal level, hash[:extra][:level]
+          assert_equal level, hash[:level]
         end
 
         it "sends #{level} exceptions" do

data/test/formatters/color_test.rb

@@ -90,7 +90,7 @@ module SemanticLogger
 
           it 'logs short duration' do
             log.duration = 1.34567
-            duration = SemanticLogger::Formatters::Base::PRECISION == 3 ? "(#{bold}1ms#{clear})" : "(#{bold}1.346ms#{clear})"
+            duration     = SemanticLogger::Formatters::Base::PRECISION == 3 ? "(#{bold}1ms#{clear})" : "(#{bold}1.346ms#{clear})"
             assert_equal duration, formatter.duration
           end
         end
@@ -143,7 +143,7 @@ module SemanticLogger
             log.backtrace  = backtrace
             set_exception
             duration = SemanticLogger::Formatters::Base::PRECISION == 3 ? '1' : '1.346'
-            str = "#{expected_time} #{color}D#{clear} [#{$$}:#{Thread.current.name} default_test.rb:35] [#{color}first#{clear}] [#{color}second#{clear}] [#{color}third#{clear}] {#{color}first: 1#{clear}, #{color}second: 2#{clear}, #{color}third: 3#{clear}} (#{bold}#{duration}ms#{clear}) #{color}ColorTest#{clear} -- Hello World -- #{{:first => 1, :second => 2, :third => 3}.ai(multiline: false)} -- Exception: #{color}RuntimeError: Oh no#{clear}\n"
+            str      = "#{expected_time} #{color}D#{clear} [#{$$}:#{Thread.current.name} default_test.rb:35] [#{color}first#{clear}] [#{color}second#{clear}] [#{color}third#{clear}] {#{color}first: 1#{clear}, #{color}second: 2#{clear}, #{color}third: 3#{clear}} (#{bold}#{duration}ms#{clear}) #{color}ColorTest#{clear} -- Hello World -- #{{:first => 1, :second => 2, :third => 3}.ai(multiline: false)} -- Exception: #{color}RuntimeError: Oh no#{clear}\n"
             assert_equal str, formatter.call(log, nil).lines.first
           end
         end

data/test/formatters/default_test.rb

@@ -102,7 +102,7 @@ module SemanticLogger
 
           it 'logs short duration' do
             log.duration = 1.34567
-            duration = SemanticLogger::Formatters::Base::PRECISION == 3 ? "(1ms)" : "(1.346ms)"
+            duration     = SemanticLogger::Formatters::Base::PRECISION == 3 ? "(1ms)" : "(1.346ms)"
             assert_equal duration, formatter.duration
           end
         end
@@ -165,7 +165,7 @@ module SemanticLogger
             log.backtrace  = backtrace
             set_exception
             duration = SemanticLogger::Formatters::Base::PRECISION == 3 ? '1' : '1.346'
-            str = "#{expected_time} D [#{$$}:#{Thread.current.name} default_test.rb:99] [first] [second] [third] {first: 1, second: 2, third: 3} (#{duration}ms) DefaultTest -- Hello World -- {:first=>1, :second=>2, :third=>3} -- Exception: RuntimeError: Oh no\n"
+            str      = "#{expected_time} D [#{$$}:#{Thread.current.name} default_test.rb:99] [first] [second] [third] {first: 1, second: 2, third: 3} (#{duration}ms) DefaultTest -- Hello World -- {:first=>1, :second=>2, :third=>3} -- Exception: RuntimeError: Oh no\n"
             assert_equal str, formatter.call(log, nil).lines.first
           end
         end

data/test/test_helper.rb

@@ -13,11 +13,3 @@ require_relative 'mock_logger'
 require 'awesome_print'
 
 #Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-Signal.trap('TTIN') do
-  Thread.list.each do |thread|
-    puts
-    puts
-    ap thread.name
-    ap thread.backtrace
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby