md-logstasher 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628b152041e0a0d8218761c1ab723f43b16ff6a9746fcf102e5b0a8d03aea76e
-  data.tar.gz: a3283254f14aef786d70dda74cae35d081d607e67a37522fff292ddab6119e80
+  metadata.gz: 69eb9914c59b6fdde645a4c54c51785fbe677f287c18e462f4283dac2af7ef70
+  data.tar.gz: c5a6066a51d68cbfa123c8bd1e30138ee90efac02a8a19cf7ed1da56e68d09f7
 SHA512:
-  metadata.gz: 68806d2f4d08aa90a7c61487d2101e9cbfa2802d1021986dc39d1d9469196d8524d6e07cdcb63b3df104c0198beff6b9510f3f2d876ddc79b4c565b5f2d2fe1e
-  data.tar.gz: 38f876594090f8a545dcfcd5380142bbfb1d9b34c726b2d0cb6de96d547ee41aaf5463c245279adbe50d694f9ab6be0a30fd6cdc45ffd0ccf5efd1e66322065f
+  metadata.gz: 89642d029ce8980eeb786953c580ab5574122a3bec77c096611c9a0c380b6230924375bf972b48f36af28134ac1474945a6c53983368eb0184d3246cb18b2ca2
+  data.tar.gz: b38aced68aa13148b72539aac1aeca810bd10b34558e776c06a0400195675ab387b86c19b463b572a59c6704cb24280db7c38c06dfa3ffc17d295e2bed075387

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/lib/logstasher.rb

@@ -46,18 +46,20 @@ module LogStasher
 
     def log_as_json(payload, as_logstash_event: false)
       payload = payload.dup
-      payload.merge!(:metadata => metadata) if !metadata&.empty? && payload.is_a?(::Hash)
+
+      # Merge in metadata if configured. This supports a Hash and a fully formed
+      # LogStash::Event.
+      if !metadata.empty?
+        payload.merge!(:metadata => metadata) if payload.is_a?(::Hash)
+        payload.append(:metadata => metadata) if payload.is_a?(::LogStash::Event)
+      end
 
       # Wrap the hash in a logstash event if the caller wishes for a specific
       # formatting applied to the hash. This is used by log subscriber, for
       # example.
-      json_payload = if as_logstash_event
-                       ::LogStash::Event.new(payload).to_json
-                     else
-                       payload.to_json
-                     end
+      payload = ::LogStash::Event.new(payload) if as_logstash_event
 
-      logger << json_payload + $INPUT_RECORD_SEPARATOR
+      logger << payload.to_json + $INPUT_RECORD_SEPARATOR
     end
 
     def logger

data/spec/lib/logstasher/logstasher_spec.rb

@@ -36,6 +36,14 @@ describe ::LogStasher do
         ::LogStasher.log_as_json(:yolo => :brolo)
       end
 
+      it "merges metadata for LogStash::Event types" do
+        expect(::LogStasher.logger).to receive(:<<) do |json|
+          expect(::JSON.parse(json)).to match(a_hash_including("yolo" => "brolo", "metadata" => { "namespace" => "cooldude" }))
+        end
+
+        ::LogStasher.log_as_json(::LogStash::Event.new(:yolo => :brolo))
+      end
+
       it "does not merge metadata on an array" do
         expect(::LogStasher.logger).to receive(:<<) do |json|
           expect(::JSON.parse(json)).to eq([{ "yolo" => "brolo" }])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Devin Christensen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -108,7 +108,7 @@ homepage: https://github.com/moneydesktop/logstasher
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Awesome rails logs
 test_files: