ougai 1.9.1-java → 2.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae6d84b8f46bc06fde403b3e4952ddc21a3370c10381b47495468ad6155cf27
-  data.tar.gz: 44214cb40f7eeb084b5fb29b68ddb27fd2d0d3d9007b85d4f3de08a7b4442fe9
+  metadata.gz: 74a6a0eada75abcdd475a429c011dfe505f59b446d0142a3b0e60d065cbcc66d
+  data.tar.gz: e305d3cf8b5c69279228f92ca03142971aff2f7b74219c4753cf331b9ad442c3
 SHA512:
-  metadata.gz: 96d8cccd04b2ee45766f0474971198d201e8e74077d6f2ca2072186415d2ea851f92f0b2a75efc7b39ee2dea228feeddf8e822aea32b765f867fc38f8803e584
-  data.tar.gz: 757a08c82faf06941b0e1bfacf8908e51bbd8dbd468d55f2e64a8d55f4b127e4bd152175367e700577aa734cc908c75a05e14fca082d7190aa795ed6f978158d
+  metadata.gz: 3a2588e9a7f1cf4f13d991332e6d0b802dbff59b6f2cb30b426846848c3842d7ea739ebe506606e004092c03549287c563d73399e8f3b86c2524329fa327e0b2
+  data.tar.gz: f9c49782afa3f7be864cc647ff10760c872ea0c108408978d58c488bb7159021c1a99b76de0eed5b7e4772f2f9d1ede0141141bb423c5d2797dec4c246645a8e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ougai (1.9.1-java)
+    ougai (2.0.0-java)
       jrjackson (~> 0.4)
 
 GEM

data/README.md

@@ -194,7 +194,18 @@ logger.info('Hello!', user: { name: 'Jiro' }, version: '2.3')
 ```
 
 If any field of with_fields is specified in each log, the field is overridden.
-But if the field's type is *Array*, both with_field value and logging value are merged with `concat` and `uniq`.
+If the field's type is *Array*, both with_field value and logging value are merged with `concat` and `uniq`.
+
+If the field's type is *Hash*, then values are merged recursively.
+
+```ruby
+logger.with_fields = { version: '1.1.0', user: { name: 'Taro' } }
+logger.debug(user: { age: 19 })
+```
+
+```json
+{"name":"test","hostname":"mint","pid":30182,"level":20,"time":"2017-07-22T20:52:12.332+09:00","v":0,"version":"1.1.0","msg":"No message","user":{"name":"Taro","age":19}}
+```
 
 ### Create a child logger
 
@@ -242,6 +253,8 @@ child_logger.debug('This is not outputted')
 
 If any field exists in both parent log and child log, the parent value is overridden or merged by child value.
 
+If the field's type is *Hash*, then values are merged recursively.
+
 ### Hook before logging
 
 Setting `before_log` of logger or child an *lambda* with `data` field, a process can be run before log each output.

data/lib/ougai/logging.rb

@@ -120,6 +120,8 @@ module Ougai
       base_data.merge!(inferior_data) do |_, base_v, inferior_v|
         if base_v.is_a?(Array) and inferior_v.is_a?(Array)
           (inferior_v + base_v).uniq
+        elsif base_v.is_a?(Hash) and inferior_v.is_a?(Hash)
+          weak_merge!(base_v, inferior_v)
         else
           base_v
         end

data/lib/ougai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ougai
-  VERSION = '1.9.1'
+  VERSION = '2.0.0'
 end

data/spec/child_logger_spec.rb

@@ -390,7 +390,7 @@ describe Ougai::ChildLogger do
           parent_logger.with_fields = { foo: 11 }
           logger.with_fields = { bar: '11' }
         end
- 
+
         it 'outputs with child fields' do
           logger.info(log_msg)
           parent_logger.info(parent_log_msg)
@@ -426,7 +426,7 @@ describe Ougai::ChildLogger do
         before do
           parent_logger.with_fields = { foo: 22 }
         end
- 
+
         it 'output with new parent fields' do
           logger.info(log_msg)
           parent_logger.info(parent_log_msg)
@@ -462,7 +462,7 @@ describe Ougai::ChildLogger do
         before do
           logger.with_fields = { bar: '33' }
         end
- 
+
         it 'output valid' do
           logger.info(log_msg)
           parent_logger.info(parent_log_msg)
@@ -478,35 +478,45 @@ describe Ougai::ChildLogger do
 
     context 'grandchild logger' do
       before do
-        parent_logger.with_fields = { tag: 'parent', tags: ['parent'] }
+        parent_logger.with_fields = { tag: 'parent', tags: ['parent'], event: { module: 'core' } }
       end
 
-      let(:logger) { parent_logger.child(tag: 'child', tags: ['child']) }
-      let(:grand_logger) { logger.child(tag: 'grandchild', tags: ['grandchild']) }
+      let(:logger) { parent_logger.child(tag: 'child', tags: ['child'], event: { dataset: 'core.child' }) }
+      let(:grand_logger) { logger.child(tag: 'grandchild', tags: ['grandchild'], event: { action: 'log-action' }) }
 
       it 'outputs with all merged fields' do
         grand_logger.info('Hi', foo: 3)
         logger.info(log_msg, foo: 2)
-        parent_logger.info(parent_log_msg, foo: 10)
-        parent_logger.info('Good evening!', foo: 11)
+        parent_logger.info(parent_log_msg, foo: 10, event: { module: 'service' })
+        parent_logger.info('Good evening!', foo: 11, event: { duration: 150 })
 
         expect(items[0]).to be_log_message('Hi', log_level)
-        expect(items[0]).to include(tag: 'grandchild', tags: ['parent', 'child', 'grandchild'], foo: 3)
+        expect(items[0]).to include(
+          tag: 'grandchild',
+          tags: ['parent', 'child', 'grandchild'],
+          foo: 3,
+          event: { module: 'core', dataset: 'core.child', action: 'log-action' }
+        )
 
         expect(items[1]).to be_log_message(log_msg, log_level)
-        expect(items[1]).to include(tag: 'child', tags: ['parent', 'child'], foo: 2)
+        expect(items[1]).to include(
+          tag: 'child',
+          tags: ['parent', 'child'],
+          foo: 2,
+          event: { module: 'core', dataset: 'core.child' }
+        )
 
         expect(items[2]).to be_log_message(parent_log_msg, log_level)
-        expect(items[2]).to include(tag: 'parent', tags: ['parent'], foo: 10)
+        expect(items[2]).to include(tag: 'parent', tags: ['parent'], foo: 10, event: { module: 'service' })
         expect(items[3]).to be_log_message('Good evening!', log_level)
-        expect(items[3]).to include(tag: 'parent', tags: ['parent'], foo: 11)
+        expect(items[3]).to include(tag: 'parent', tags: ['parent'], foo: 11, event: { module: 'core', duration: 150 })
       end
 
       context 'after updating child logger with_fields' do
         before do
           logger.with_fields = { bar: '33' }
         end
- 
+
         it 'outputs with child fields' do
           logger.info(log_msg)
           expect(items[0]).to be_log_message(log_msg, log_level)

data/spec/logging_spec.rb

@@ -24,6 +24,15 @@ describe Ougai::Logging do
       expect(result[:bar]).to eq('base')
       expect(result[:baz]).to eq(['B', 'A'])
     end
+
+    it 'merges hashes recursively' do
+      result = nil
+      subject.instance_eval do
+        result = weak_merge!({ foo: { bar: { baz: 15 } } },
+                             { foo: { bar: { extra: 10 }, nested: 'string' } })
+      end
+      expect(result).to eq({ foo: { bar: { baz: 15, extra: 10 }, nested: 'string' } })
+    end
   end
 
   describe '#chain' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.0.0
 platform: java
 authors:
 - Toshimitsu Takahashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement