DEV-118709 Fix failing tets.

Author: Siddhath Kulkarni

lib/logstash/outputs/lmlogs.rb

@@ -266,7 +266,9 @@ def multi_receive(events)
         if @include_metadata
          lmlogs_event = event_json
          lmlogs_event.delete("@timestamp")  # remove redundant timestamp field
-         lmlogs_event["event"].delete("original") # remove redundant log field
+         if lmlogs_event.dig("event", "original") != nil
+            lmlogs_event["event"].delete("original") # remove redundant log field
+         end 
         end
 
         lmlogs_event["message"] = event.get(@message_key).to_s

spec/outputs/lmlogs_spec.rb

@@ -34,12 +34,12 @@
     event1 = LogStash::Event.new("message" => "hello this is log 1", "host" => "host1")
     event2 = LogStash::Event.new("message" => "hello this is log 2", "host" => "host2")
     event3 = LogStash::Event.new("message" => "hello this is log 3", "host" => "host3")
-    expect(client).to receive(:post).once.with("https://localhost.logicmonitor.com/rest/log/ingest",:body => LogStash::Json.dump(
-        [{"message" => "hello this is log 1", "_lm.resourceId" => {"test.property" => "host1"}, "timestamp" => event1.timestamp.to_s,"@version":"1", "host" => "host1"},
-        {"message" => "hello this is log 2", "_lm.resourceId" => {"test.property" => "host2"}, "timestamp" => event2.timestamp.to_s,"@version":"1", "host" => "host2"},
-        {"message" => "hello this is log 3", "_lm.resourceId" => {"test.property" => "host3"}, "timestamp" => event3.timestamp.to_s}
+    expect(client).to receive(:post).once.with("https://localhost.logicmonitor.com/rest/log/ingest",hash_including(:body => LogStash::Json.dump(
+        [{ "host" => "host1", "message" => "hello this is log 1","@version":"1", "_lm.resourceId" => {"test.property" => "host1"}, "timestamp" => event1.timestamp.to_s,},
+        {"host" => "host2","message" => "hello this is log 2","@version":"1", "_lm.resourceId" => {"test.property" => "host2"}, "timestamp" => event2.timestamp.to_s},
+        {"host" => "host3","message" => "hello this is log 3","@version":"1", "_lm.resourceId" => {"test.property" => "host3"}, "timestamp" => event3.timestamp.to_s}
         ]
-        )).and_call_original
+        ))).and_call_original
     @lmlogs.multi_receive([event1, event2, event3])
   end