prefab-cloud-ruby 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ba1dd85add1fd682905bb54cfa2ab75baa3f4b3bc1c31fe762d8389b10c8aea
-  data.tar.gz: 4fb1d5bdc68d1dcd566afe681b02970288fbdcbbcf5c9706705c3d857b3422d4
+  metadata.gz: 29a3d9257f166fad534f81a44879cd82abc0cdd729714ab6feb2423d7b913a4d
+  data.tar.gz: b11f8e29260760dd64a78f26c016bd936fe0a5e75100329c645915bddd094ebc
 SHA512:
-  metadata.gz: 0cbdd3e8d1c04b3f113ccbf9a6fdd8f46f3240f71db26d2feb86b18dfbf25237c1df24325aa90d433c20ef017138fd0f847d5599d27e746fc983dac680f1278c
-  data.tar.gz: e09ed434ec40557b2ba8b684abdf2da3ae32103715e200162898b002031b9e175a401f9c435424b937d4929302f5dd7066813bdfd8d9fe1048fc6d74579815c9
+  metadata.gz: f74cda2cf6f657f72c15d118d9fb622d24d049261436691bff28e42ad5656beb53ec192e148e30e0f025a5becb094682fc68f4860c2cf5b3ed351b7954e3b587
+  data.tar.gz: 90125b61cd874c12376eecc726aa2fef0d6158565150830f95f642f97fad849b53570238593ce617dc39b05960abb47d4c2e6cd4a974e30c69fc40ec2720958b

data/VERSION

@@ -1 +1 @@
-0.24.2
+0.24.3

data/lib/prefab/logger_client.rb

@@ -53,8 +53,9 @@ module Prefab
 
       return true if @logdev.nil? || severity < level_of(path) || @silences[local_log_id]
 
-      progname = "#{path}: #{progname || @progname}"
-
+      if progname.nil?
+        progname = @progname
+      end
       if message.nil?
         if block_given?
           message = yield
@@ -65,7 +66,7 @@ module Prefab
       end
 
       @logdev.write(
-        format_message(format_severity(severity), Time.now, progname, message)
+        format_message(format_severity(severity), Time.now, progname, message, path)
       )
       true
     end
@@ -169,6 +170,20 @@ module Prefab
       path.slice! SEP
       path
     end
+
+    def format_message(severity, datetime, progname, msg, path)
+      formatter = (@formatter || @default_formatter)
+
+      if formatter.arity == 5
+        formatter.call(severity, datetime, progname, msg, path)
+      else
+        formatter.call(severity, datetime, join_path_and_progname(path, progname), msg)
+      end
+    end
+
+    def join_path_and_progname(path, progname)
+      (progname.nil? || progname.empty?) ? path : "#{progname}: #{path}"
+    end
   end
 
   # StubConfigClient to be used while config client initializes

data/lib/prefab/options.rb

@@ -21,6 +21,15 @@ module Prefab
     DEFAULT_LOG_FORMATTER = proc { |severity, datetime, progname, msg|
       "#{severity.ljust(5)} #{datetime}:#{' ' if progname}#{progname} #{msg}\n"
     }
+    JSON_LOG_FORMATTER = proc { |severity, datetime, progname, msg, path|
+      {
+        type: severity,
+        time: datetime,
+        progname: progname,
+        message: msg,
+        path: path
+      }.compact.to_json << "\n"
+    }
 
     module ON_INITIALIZATION_FAILURE
       RAISE = 1

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.24.2 ruby lib
+# stub: prefab-cloud-ruby 0.24.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.24.2"
+  s.version = "0.24.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2023-05-12"
+  s.date = "2023-05-15"
   s.description = "Feature Flags, Live Config, and Dynamic Log Levels as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_logger.rb

@@ -85,46 +85,47 @@ class TestLogger < Minitest::Test
   end
 
   def test_log_internal
-    logger, mock_logdev = mock_logger_expecting(/W, \[.*\]  WARN -- cloud.prefab.client.test.path: : test message/)
-    logger.log_internal('test message', 'test.path', '', ::Logger::WARN)
-    mock_logdev.verify
+    prefab, io = captured_logger
+    prefab.log.log_internal('test message', 'test.path', '', ::Logger::WARN)
+    assert_logged io, 'WARN', "cloud.prefab.client.test.path", "test message"
   end
 
   def test_log_internal_unknown
-    logger, mock_logdev = mock_logger_expecting(/A, \[.*\]   ANY -- cloud.prefab.client.test.path: : test message/)
-    logger.log_internal('test message', 'test.path', '', ::Logger::UNKNOWN)
-    mock_logdev.verify
+    prefab, io = captured_logger
+    prefab.log.log_internal('test message', 'test.path', '', ::Logger::UNKNOWN)
+    assert_logged io, 'ANY', "cloud.prefab.client.test.path", "test message"
   end
 
   def test_log_internal_silencing
-    logger, mock_logdev = mock_logger_expecting(/W, \[.*\]  WARN -- cloud.prefab.client.test.path: : should log/,
-                                                calls: 2)
-    logger.silence do
-      logger.log_internal('should not log', 'test.path', '', ::Logger::WARN)
+    prefab, io = captured_logger
+    prefab.log.silence do
+      prefab.log.log_internal('should not log', 'test.path', '', ::Logger::WARN)
     end
-    logger.log_internal('should log', 'test.path', '', ::Logger::WARN)
-    mock_logdev.verify
+    prefab.log.log_internal('should log', 'test.path', '', ::Logger::WARN)
+    assert_logged io, 'WARN', "cloud.prefab.client.test.path", "should log"
+    refute_logged io, 'should not log'
   end
 
   def test_log
-    logger, mock_logdev = mock_logger_expecting(/W, \[.*\]  WARN -- test.path: : test message/)
-    logger.log('test message', 'test.path', '', ::Logger::WARN)
-    mock_logdev.verify
+    prefab, io = captured_logger
+    prefab.log.log('test message', 'test.path', '', ::Logger::WARN)
+    assert_logged io, 'WARN', "test.path", "test message"
   end
 
   def test_log_unknown
-    logger, mock_logdev = mock_logger_expecting(/A, \[.*\]   ANY -- test.path: : test message/)
-    logger.log('test message', 'test.path', '', ::Logger::UNKNOWN)
-    mock_logdev.verify
+    prefab, io = captured_logger
+    prefab.log.log('test message', 'test.path', '', ::Logger::UNKNOWN)
+    assert_logged io, 'ANY', "test.path", "test message"
   end
 
   def test_log_silencing
-    logger, mock_logdev = mock_logger_expecting(/W, \[.*\]  WARN -- test.path: : should log/, calls: 2)
-    logger.silence do
-      logger.log('should not log', 'test.path', '', ::Logger::WARN)
+    prefab, io = captured_logger
+    prefab.log.silence do
+      prefab.log.log('should not log', 'test.path', '', ::Logger::WARN)
     end
-    logger.log('should log', 'test.path', '', ::Logger::WARN)
-    mock_logdev.verify
+    prefab.log.log('should log', 'test.path', '', ::Logger::WARN)
+    assert_logged io, 'WARN', "test.path", "should log"
+    refute_logged io, 'should not log'
   end
 
   def test_logging_with_prefix
@@ -163,7 +164,7 @@ class TestLogger < Minitest::Test
     prefab.log.progname = 'MY_PROGNAME'
     prefab.log.error message
 
-    assert_logged io, 'ERROR', 'MY_PROGNAME test.test_logger.test_logging_with_a_progname', message
+    assert_logged io, 'ERROR', 'MY_PROGNAME: test.test_logger.test_logging_with_a_progname', message
   end
 
   def test_logging_with_a_progname_and_no_message
@@ -172,7 +173,7 @@ class TestLogger < Minitest::Test
     prefab.log.progname = 'MY_PROGNAME'
     prefab.log.error
 
-    assert_logged io, 'ERROR', 'MY_PROGNAME test.test_logger.test_logging_with_a_progname_and_no_message', 'MY_PROGNAME'
+    assert_logged io, 'ERROR', 'MY_PROGNAME: test.test_logger.test_logging_with_a_progname_and_no_message', 'MY_PROGNAME'
   end
 
   def test_logging_with_criteria_on_top_level_key
@@ -399,35 +400,19 @@ class TestLogger < Minitest::Test
       raise 'THIS WILL NEVER BE EVALUATED'
     end
 
-    assert_logged io, 'ERROR', 'test.test_logger.test_logging_with_a_block', ' ' + message
+    assert_logged io, 'ERROR', 'test.test_logger.test_logging_with_a_block', message
   end
 
   private
 
   def assert_logged(logged_io, level, path, message)
-    assert_match(/#{level}\s+\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-+]?\d+:\s+#{path}: #{message}\n/, logged_io.string)
+    assert_match(/#{level}\s+\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-+]?\d+:\s+#{path} #{message}\n/, logged_io.string)
   end
 
   def refute_logged(logged_io, message)
     refute_match(/#{message}/, logged_io.string)
   end
 
-  def mock_logger_expecting(pattern, configs = {}, calls: 1)
-    mock_logdev = Minitest::Mock.new
-    mock_logdev.expect :write, nil do |arg|
-      pattern.match(arg)
-    end
-
-    calls.times.each do
-      mock_logdev.expect(:nil?, false)
-    end
-
-    logger = Prefab::LoggerClient.new($stdout)
-    logger.instance_variable_set('@logdev', mock_logdev)
-    logger.set_config_client(MockConfigClient.new(configs))
-    [logger, mock_logdev]
-  end
-
   def captured_logger(options = {})
     io = StringIO.new
     options = Prefab::Options.new(**options.merge(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby