logjam_agent 0.38.0 → 0.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca457f9e8f19c2915d63445f3c7f63bfccb4cc61d260b5e164cd80e5440c5659
-  data.tar.gz: 2b58eeaa872b742b11faac8156354e551cce37c4dd15a33d594e2e05c794bbe9
+  metadata.gz: 623b528c086e5359f9824c6ed231207340d9abc8fb1046f2763200404e9c3ee9
+  data.tar.gz: 0d7de9ffac6e355314388c15c9e6fb0d18f1c5ad723dce7c9b19ef64a864fa1c
 SHA512:
-  metadata.gz: 0ca5aead4424e9cb01dfaf099f889a772099f3320173ba6af6d4d8aa80bd2972173cdfba69c8a3555f55caef723799871c916332b9e52b62ea516e941c7e6961
-  data.tar.gz: 855bb281cfadd0485df1a2e2d2a446d502687ce03d35a5ab0fca80ad4d3a520296c1ff4650addc4c2a3149094a1834b897c1f8e2e7bc5efe5bdfb3fd4332b329
+  metadata.gz: 24d13d8931fc1a3ff1ec13a0617f941798719ccb9cec724d2934f0b80fc7365027029996b867194b60d780589fbfc7b8f391102d16cca28b7b9a5f6fda2668ae
+  data.tar.gz: c130018a95950bb0dfe32afe866f9ce891685ed37edd845b96f76fbe0c97b869bbcb08ba185a9b7f028b3eb9ff98a0a2a7f360a4292efcdb6d840b01a0e0c29e

data/lib/logjam_agent/buffered_logger.rb

@@ -122,6 +122,7 @@ module LogjamAgent
       when Hash
         message = LogjamAgent.json_encode_payload(message)
       else
+        message = message.to_s
         if request && severity >= Logger::ERROR && (e = detect_logged_exception(message))
           request.add_exception(e)
         end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.38.0"
+  VERSION = "0.38.2"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -125,7 +125,7 @@ module LogjamAgent
     end
 
     def log_warning(message)
-      LogjamAgent.error_handler.call ForwardingWarning.new(message)
+      LogjamAgent.error_handler&.call ForwardingWarning.new(message)
     end
 
     VALID_RESPONSE_CODES = [200,202]

data/test/json_logging_test.rb

@@ -100,5 +100,22 @@ module LogjamAgent
       assert_match(/ERROR -- : RuntimeError\(murks\):(\n.*\.rb:\d+:in\s.*)+/, @device.lines.first)
     end
 
+    def test_can_log_arrays_as_text
+      LogjamAgent.log_format = :text
+      @logger.error([1, 2])
+      assert_equal 1, @lines.size
+      assert_equal([1, 2].to_s, @lines.first.last)
+      assert_equal 1, @device.lines.size
+      assert_match(/ERROR -- : \[1, 2\]\n/, @device.lines.first)
+    end
+
+    def test_can_log_arrays_as_json
+      LogjamAgent.log_format = :json
+      @logger.error([1, 2])
+      assert_equal 1, @lines.size
+      assert_equal([1, 2].to_s, @lines.first.last)
+      assert_equal 1, @device.lines.size
+      assert_match(/ERROR -- : \{"message":"\[1, 2\]"\}\n/, @device.lines.first)
+    end
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter %r{^/test/}
+end
+
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'minitest/pride' if ENV['RAINBOW_COLORED_TESTS'] == "1" && $stdout.tty?

data/test/zmq_forwarder_test.rb

@@ -58,5 +58,20 @@ module LogjamAgent
       f.forward(data, :routing_key => "x", :app_env => "a-b")
     end
 
+    test "can log forwarding warnings if error_handler is defined" do
+      msg = nil
+      LogjamAgent.expects(:error_handler).returns(->(m){ msg = m})
+      ZMQForwarder.new.__send__(:log_warning, "xxx")
+      assert_instance_of ForwardingWarning, msg
+      assert_equal "xxx", msg.message
+    end
+
+    test "does not log forwading warnings if error_handler is nil" do
+      msg = nil
+      LogjamAgent.expects(:error_handler).returns(nil)
+      ZMQForwarder.new.__send__(:log_warning, "xxx")
+      assert_nil msg
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.38.2
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -280,18 +294,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Logjam client library to be used with logjam
 test_files:
-- test/sinatra_app.rb
+- test/json_logging_test.rb
+- test/request_test.rb
 - test/selective_logging_test.rb
-- test/sinatra_classic_test.rb
+- test/sinatra_app.rb
 - test/sinatra_classic_app.rb
-- test/request_test.rb
-- test/zmq_forwarder_test.rb
-- test/util_test.rb
-- test/test_helper.rb
-- test/json_logging_test.rb
+- test/sinatra_classic_test.rb
 - test/sinatra_test.rb
+- test/test_helper.rb
+- test/util_test.rb
+- test/zmq_forwarder_test.rb