loggerstash 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2945f9572e10047201fc9b3ac4422923e8b58b
-  data.tar.gz: 7652bff72a6bb80fe20fcfd1d6ffe7c55679bc8f
+  metadata.gz: e7457877e4624e0e913b3f57a9dd064bce2476c2
+  data.tar.gz: 384ad7c464d4e7ca58b1625cb72925ddc926a437
 SHA512:
-  metadata.gz: 3c2c0be50c3a3706dca83b4e7b26c549f920c41c88fb73d0e397c1b5aa5ff99d9d89057d15d5a2adff18b3f4043b835e8a4a4474c69dc34e78a712ff3b20114e
-  data.tar.gz: 81d0b3da5b0ccabd57f6beaa74b43b993f33b11a23a1b2b9bb9aa3b96362043aca95626d3c0bf71ce0ad52021ce74fac3e0e1627a8bb95cca186f175098b3e6d
+  metadata.gz: c373e01de7e88ce5ab4674702661c09d7a248f00394c946a74a62dde4868526f3346932ddc87891147fa0a6c536b71ab8a50cf2fcf8647a62a7f99b53c61fdc6
+  data.tar.gz: 1c005e83c7991f52b41c71eed58be40121283d187eac39e7d7ba9da9744f6735097f578e52d5b533bbe6dac3dcc31465738b14767f08bdd359531ce9bc766abf

data/.rubocop.yml

@@ -111,6 +111,8 @@ Layout/MultilineMethodCallIndentation:
 
 Layout/AlignHash:
   Enabled: true
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
 
 Bundler/OrderedGems:
   Enabled: false

data/lib/loggerstash.rb

@@ -139,6 +139,8 @@ class Loggerstash
   #
   def default_formatter
     @default_formatter ||= ->(s, t, p, m) do
+      caller = caller_locations.find { |loc| ! [__FILE__, logger_filename].include? loc.absolute_path }
+
       {
         "@timestamp":  t.utc.strftime("%FT%T.%NZ"),
         "@metadata":   { event_type: "loggerstash" },
@@ -146,12 +148,25 @@ class Loggerstash
         severity_name: s.downcase,
         hostname:      Socket.gethostname,
         pid:           $$,
+        caller:        {
+          absolute_path: caller.absolute_path,
+          base_label:    caller.base_label,
+          label:         caller.label,
+          lineno:        caller.lineno,
+          path:          caller.path,
+        },
       }.tap do |ev|
         ev[:progname] = p if p
       end
     end
   end
 
+  # Identify the absolute path of the file that defines the Logger class.
+  #
+  def logger_filename
+    @logger_filename ||= Logger.instance_method(:format_message).source_location.first
+  end
+
   # The methods needed to turn any Logger into a Loggerstash Logger.
   #
   module Mixin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggerstash
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash_writer
@@ -210,7 +210,6 @@ files:
 - CONTRIBUTING.md
 - LICENCE
 - README.md
-- lib/filtered_debug_logger.rb
 - lib/loggerstash.rb
 - loggerstash.gemspec
 homepage: https://github.com/discourse/loggerstash

data/lib/filtered_debug_logger.rb

@@ -1,42 +0,0 @@
-require 'logger'
-
-# Filter debug-level log entries on progname
-#
-# Whilst well-thought-out debug logs are fantastic at showing you the
-# fine-level detail of your program's execution, they can sometimes be
-# "too much of a good thing".  Excessively verbose debug logs can obscure
-# the important debug info, and turning on debug logging on a busy service
-# can quickly swamp all but the most overprovisioned of log aggregation
-# systems.
-#
-# Hence, there's this little module.  Require it in your program, and then
-# set `logger.permitted_prognames = ['some', 'array']` on whatever logger
-# is likely to want some debug logging.  Then, whenever debug logging is
-# enabled, only those calls to `logger.debug` which provide a progname exactly
-# matching an entry in the list you provided will actually get logged.
-#
-module FilteredDebugLogger
-  # Set the list of prognames to log debug messages for.
-  #
-  # @param l [Array<String>] the (exact) prognames to log debug-level messages
-  #   for.  If it's not in this list, it doesn't get emitted, even if debug
-  #   logging is enabled.
-  #
-  def permitted_prognames=(l)
-    raise ArgumentError, "Must provide an array" unless l.is_a?(Array)
-
-    @permitted_prognames = l
-  end
-
-  # Decorate Logger#add with our "reject by progname" logic.
-  #
-  def add(s, m = nil, p = nil)
-    return if s == Logger::DEBUG && @permitted_prognames && !@permitted_prognames.include?(p)
-
-    super
-  end
-
-  alias log add
-end
-
-Logger.prepend(FilteredDebugLogger)