Merge pull request #15 from logicmonitor/14-nested-metadata-extraction-breaking-with

Fix breaking issue for nested metadata key if does not exist.

Author: siddharthck

CHANGELOG.md

@@ -16,3 +16,5 @@
 - Fix user agent populated in headers
 ## 2.0.0
 - Dont send event metadata by default. Add config include_metadata_keys for including custom metadata
+## 2.0.1
+- Fix incomplete json metadata error.

Dockerfile

@@ -1,5 +1,5 @@
 #FROM jruby:9.3.9.0-jdk11
-FROM logstash:8.5.1 AS builder
+FROM logstash:8.11.3 AS builder
 
 FROM jruby:9.3.9.0-jdk11
 COPY --from=builder /usr/share/logstash /logstash

lib/logstash/outputs/lmlogs.rb

@@ -298,7 +298,12 @@ def processEvent(event)
     elsif @final_metadata_keys
       @final_metadata_keys.each do | key, value |
         nestedVal = event_json
-        value.each { |x| nestedVal = nestedVal[x] }
+        value.each do |x|
+          if nestedVal == nil
+            break
+          end
+          nestedVal = nestedVal[x]
+        end
         if nestedVal != nil
           lmlogs_event[key] = nestedVal
         end

lib/logstash/outputs/version.rb

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

spec/outputs/metadata_spec.rb

@@ -83,4 +83,26 @@ def check_same_hash(h1,h2)
       puts " hash diff : #{Hashdiff.diff(constructed_event,expected_event)}"
       expect(Hashdiff.diff(constructed_event,expected_event)).to eq([])
     end
+
+    it "Netsted key that doesn not exist should not break" do
+      plugin = create_output_plugin_with_conf({
+        "portal_name" => "localhost",
+        "access_id" => "abcd",
+        "access_key" => "abcd",
+        "lm_property" => "system.hostname",
+        "property_key" => "host",
+        "include_metadata_keys" => %w[nested1.nested2.nestedkey_that_doesnt_exist]
+      })
+      constructed_event = plugin.processEvent(logstash_event)
+      expected_event = {
+        "message" => "hello this is log 1",
+        "timestamp" => logstash_event.timestamp,
+        "_lm.resourceId" => {"system.hostname" => "host1"}
+      }
+      puts " actual : #{constructed_event} \n expected : #{expected_event}"
+      puts " hash diff : #{Hashdiff.diff(constructed_event,expected_event)}"
+      expect(Hashdiff.diff(constructed_event,expected_event)).to eq([])
+    end
+
+
 end