vx-instrumentation 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c90efe52d6c37274260467769f9d2d2173c012f
-  data.tar.gz: f618f491daf83632d2921dd347f4ccf6397c5c81
+  metadata.gz: 56e99e02c5dae2b4ec7353e76076122226c1c71e
+  data.tar.gz: 854bb9c8b52c7cfd9644d591bec489e78382803b
 SHA512:
-  metadata.gz: ee2f8b0d9090c0f8630cfb8ae062748e7565cf399a1edeb44d45dfbf58db4fdcfa329d84d669ca130cc46ba4588aa337a2304da2e921f4fa574317179ef11bb6
-  data.tar.gz: b34b761fbd46a224a729badc1f65c5963b930049c8b4f017f14e515a5c7ce23b02025194194954e811d4773025eab512b4b4d4012b2e426d4c12f6751303d612
+  metadata.gz: 981b646a3a26047e37911260e05a9f6b8449a5363769205c23933b2622cf9b1cc28cc30b71ad1fb1487dd19b0e0c63e2e3ea9236ebc6a138d917d8d66da7c011
+  data.tar.gz: fa8fcfa4c0cde7ac633e43a7eac8c3f8b2c3ae4c1986dafa36f975dccacb8a954c1f7c865b8012ec771bf431b4f80f8e04b44a5bb9fb2994aa347ec8e90aace8

data/lib/vx/instrumentation/logger.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'logger'
+require 'active_support/core_ext/hash/deep_merge'
 
 module Vx
 
@@ -75,14 +76,14 @@ module Vx
 
           case
           when msg.is_a?(Hash)
-            values.merge! msg
+            values.deep_merge! msg
           when msg.respond_to?(:to_h)
             values.merge! msg.to_h
           else
-            values.merge!(message: msg)
+            values.deep_merge!(message: msg)
           end
 
-          values.merge!(severity: severity.to_s.downcase)
+          values.deep_merge!(severity: severity.to_s.downcase)
 
           values = make_safe_hash(values)
 

data/lib/vx/instrumentation/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Instrumentation
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/spec/lib/logger_spec.rb

@@ -70,7 +70,7 @@ describe Vx::Instrumentation::Logger do
     )
   end
 
-  it "should woth with default values" do
+  it "should work with default values" do
     Vx::Instrumentation.with(foo: "bar") do
       logger.info(key: "value")
     end
@@ -80,4 +80,14 @@ describe Vx::Instrumentation::Logger do
       "severity" => "info"
     )
   end
+
+  it "should work with nested default values" do
+    Vx::Instrumentation.with("@fields" => {a: 1}) do
+      logger.info("@fields" => {b: 2})
+    end
+    expect(result).to eq(
+      "@fields" => {"a"=>1, "b"=>2},
+      "severity" => "info"
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dmitry Galinsky