Do not return an empty metadata key hash when calling to_hash_with_me…

…tadata Fixes elastic#3034
ttyard · Apr 20, 2015 · cc3f9d6 · cc3f9d6
1 parent 0b72d06
commit cc3f9d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/logstash/event.rb b/lib/logstash/event.rb
@@ -295,11 +295,7 @@ def init_timestamp(o)
 
   public
   def to_hash_with_metadata
-    if @metadata.nil?
-      to_hash
-    else
-      to_hash.merge(METADATA => @metadata)
-    end
+    @metadata.empty? ? to_hash : to_hash.merge(METADATA => @metadata)
   end
 
   public

diff --git a/spec/core/event_spec.rb b/spec/core/event_spec.rb
@@ -409,6 +409,10 @@
         it "should still allow normal field access" do
           expect(subject["foo"]).to eq("bar")
         end
+
+        it "should not include the @metadata key" do
+          expect(subject.to_hash_with_metadata).not_to include("@metadata")
+        end
       end
     end