sonnet 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37fe52c625a9e9652eb886216565a9ea485f3f309650881d3576690e979bd1ab
-  data.tar.gz: d50175a894ac543914f9547bf9ddd6b601863a6124fd8fec0c6545f5619634b7
+  metadata.gz: cd726535211c5d03c5db6a93f14aae3121802b99a85d60ee955fe8d455c77d51
+  data.tar.gz: ff06b123ee59cd638298cf81e1f3a3394e5c43df362c81f4cca2180cf65b8baf
 SHA512:
-  metadata.gz: 38d76037845898e166536ad70e5fc0fb9c6544462c5fe04a5c3bcadf1b48a2915b4a639ad543dbea16b9c8857b3c6c72bcf40d202f25be4c2194dacf77d99f77
-  data.tar.gz: 9378241dcd507f983cbe7ab2b5954780c3d2aafd676cde6aed02c3795e03af44ffc4ecd11110ae48571c2c7754c7b6b9a601c0799a8c7bc166467d13a5e791fd
+  metadata.gz: ea0b0ebf4fbbcdc71b65365b47cb259d95b4e8a17c07cb2590e6e502d8d0a71d14dd69a74f54f159da624584a153551362fa03aa892aaf137f6573ddfe6236e3
+  data.tar.gz: 5c6d8c066d1c9daf4c7f611458b905a0018251efb1006a9f4b90d4c8ad995fc99edb64b710df55698a1bc364919e3d6f6eba4323a30bb4194fb976c894dacb02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sonnet (0.1.2)
+    sonnet (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/sonnet/formatter.rb

@@ -10,6 +10,10 @@ module Sonnet
       new(severity, time, progname, data).to_json
     end
 
+    def self.current_context
+      Thread.current[:sonnet_current_context] ||= []
+    end
+
     def initialize(severity, time, progname, data)
       @severity = severity
       @time = time
@@ -36,6 +40,20 @@ module Sonnet
       end
     end
 
+    def application_context
+      {
+        program: program,
+        # hostname: hostname,
+        level: level,
+        timestamp: timestamp,
+        pid: pid
+      }
+    end
+
+    def context
+      self.class.current_context.inject({}, &:merge)
+    end
+
     def level
       @severity&.downcase
     end
@@ -53,13 +71,7 @@ module Sonnet
     end
 
     def as_json
-      {
-        program: program,
-        # hostname: hostname,
-        level: level,
-        timestamp: timestamp,
-        pid: pid
-      }.merge(data).compact
+      context.merge(data).merge(application_context).compact
     end
 
     def to_json

data/lib/sonnet/logger.rb

@@ -10,5 +10,12 @@ module Sonnet
     def self.log_level
       ::Logger.const_get((ENV["LOG_LEVEL"] || "INFO").upcase)
     end
+
+    def with_context(context = {})
+      formatter.current_context.push(context)
+      yield self
+    ensure
+      formatter.current_context.pop
+    end
   end
 end

data/lib/sonnet/version.rb

@@ -1,3 +1,3 @@
 module Sonnet
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/sonnet.rb

@@ -8,5 +8,3 @@ require "json"
 
 module Sonnet
 end
-
-require "sonnet/rails" if defined?(::Rails::Engine)

data/test/sonnet_test.rb

@@ -1,21 +1,35 @@
 require "test_helper"
-require "logger"
 
 class SonnetTest < Minitest::Test
   Error = Class.new(StandardError)
 
-  def test_that_it_has_a_version_number
-    refute_nil ::Sonnet::VERSION
+  def test_log_info
+    logger.info("What's the story, morning glory?")
+    assert_log_line log[0], level: "info", message: "What's the story, morning glory?"
   end
 
-  def test_json_logging
-    logger.info("What's the story, morning glory?")
-    assert_equal log[0].fetch("message"), "What's the story, morning glory?"
+  def test_log_debug
+    logger.debug("this should not be logged")
+    assert_nil log[0]
+    logger.level = Logger::DEBUG
+    logger.debug("this should be logged")
+    assert_log_line log[0], level: "debug", message: "this should be logged"
   end
 
-  def test_exception_logging
+  def test_log_exception
     logger.error(Error.new("something went wrong"))
-    assert_equal log[0]["message"], "something went wrong"
+    assert_log_line log[0], message: "something went wrong"
+  end
+
+  def test_log_with_context
+    logger.with_context(color: "blue") { logger.info("What's the story, morning glory?") }
+    logger.info("definitely maybe")
+    assert_log_line log[0], color: "blue", message: "What's the story, morning glory?"
+    assert_log_line log[1], message: "definitely maybe"
+  end
+
+  def assert_log_line(actual, expected)
+    assert_equal expected, actual.slice(*expected.keys)
   end
 
   def logger
@@ -27,6 +41,6 @@ class SonnetTest < Minitest::Test
   end
 
   def log
-    io.string.each_line.map { |line| JSON.parse(line) }
+    io.string.each_line.map { |line| JSON.parse(line, symbolize_names: true) }
   end
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "minitest/autorun"
+require "byebug"
+require "logger"
 
 require "sonnet"
-require "byebug"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonnet
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Cory Kaufman-Schofield