Merge pull request #660 from logstash/remove-old-event-shims

remove old event shims and fix any uses of it

lib/logstash/event.rb

@@ -57,11 +57,6 @@ class LogStash::Event
     data["@version"] = "1" if !@data.include?("@version")
   end # def initialize
 
-  public
-  def self.from_json(json)
-    return self.new(JSON.parse(json))
-  end # def from_json
-
   public
   def cancel
     @cancelled = true
@@ -247,15 +242,6 @@ class LogStash::Event
     end # format.gsub...
   end # def sprintf
 
-  # Shims to remove after event v1 is the default.
-  def tags=(value); self["tags"] = value; end
-  def tags; return self["tags"]; end
-  def message=(value); self["message"] = value; end
-  def source=(value); self["source"] = value; end
-  def type=(value); self["type"] = value; end
-  def type; return self["type"]; end
-  def fields; return self.to_hash; end
-
   def tag(value)
     # Generalize this method for more usability
     self["tags"] ||= []

lib/logstash/filters/base.rb

@@ -158,7 +158,7 @@ class LogStash::Filters::Base < LogStash::Plugin
   protected
   def filter?(event)
     if !@type.empty?
-      if event.type != @type
+      if event["type"] != @type
         @logger.debug? and @logger.debug(["filters/#{self.class.name}: Skipping event because type doesn't match #{@type}", event])
         return false
       end

spec/examples/syslog.rb

@@ -33,15 +33,15 @@ describe "parse syslog", :if => RUBY_ENGINE == "jruby" do
   CONFIG
 
   sample("message" => "<164>Oct 26 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434 dst outside:192.168.0.1/53 by access-group \"acl_drac\" [0x0, 0x0]", "type" => "syslog") do
-    insist { subject.type } == "syslog"
-    insist { subject.tags }.nil?
+    insist { subject["type"] } == "syslog"
+    insist { subject["tags"] }.nil?
     insist { subject["syslog_pri"] } == "164"
   end
 
   # Single digit day
   sample("message" => "<164>Oct  6 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434 dst outside:192.168.0.1/53 by access-group \"acl_drac\" [0x0, 0x0]", "type" => "syslog") do
-    insist { subject.type } == "syslog"
-    insist { subject.tags }.nil?
+    insist { subject["type"] } == "syslog"
+    insist { subject["tags"] }.nil?
     insist { subject["syslog_pri"] } == "164"
     #insist { subject.timestamp } == "2012-10-26T15:19:25.000Z"
   end

spec/filters/clone.rb

@@ -46,21 +46,21 @@ describe LogStash::Filters::Clone do
       insist { subject }.is_a? Array
       insist { subject.length } == 3
 
-      insist { subject[0].type } == "nginx-access"
+      insist { subject[0]["type"] } == "nginx-access"
       #Initial event remains unchanged
-      insist { subject[0].tags }.include? "TESTLOG"
-      reject { subject[0].tags }.include? "RABBIT"
-      reject { subject[0].tags }.include? "NO_ES"
+      insist { subject[0]["tags"] }.include? "TESTLOG"
+      reject { subject[0]["tags"] }.include? "RABBIT"
+      reject { subject[0]["tags"] }.include? "NO_ES"
       #All clones go through filter_matched
-      insist { subject[1].type } == "nginx-access-clone1"
-      reject { subject[1].tags }.include? "TESTLOG"
-      insist { subject[1].tags }.include? "RABBIT"
-      insist { subject[1].tags }.include? "NO_ES"
+      insist { subject[1]["type"] } == "nginx-access-clone1"
+      reject { subject[1]["tags"] }.include? "TESTLOG"
+      insist { subject[1]["tags"] }.include? "RABBIT"
+      insist { subject[1]["tags"] }.include? "NO_ES"
 
-      insist { subject[2].type } == "nginx-access-clone2"
-      reject { subject[2].tags }.include? "TESTLOG"
-      insist { subject[2].tags }.include? "RABBIT"
-      insist { subject[2].tags }.include? "NO_ES"
+      insist { subject[2]["type"] } == "nginx-access-clone2"
+      reject { subject[2]["tags"] }.include? "TESTLOG"
+      insist { subject[2]["tags"] }.include? "RABBIT"
+      insist { subject[2]["tags"] }.include? "NO_ES"
 
     end
   end

spec/filters/grep.rb

@@ -141,7 +141,7 @@ describe LogStash::Filters::Grep do
 
     sample("type" => "grepper", "str" => "test") do
       reject { subject }.nil?
-      insist { subject["new_field"]} == subject.type
+      insist { subject["new_field"]} == subject["type"]
     end
   end
 
@@ -180,7 +180,7 @@ describe LogStash::Filters::Grep do
 
     sample("tags" => ["tag"], "str" => "test") do
       reject { subject }.nil?
-      insist { subject.tags} == ["tag", "new_tag"]
+      insist { subject["tags"]} == ["tag", "new_tag"]
     end
   end
 
@@ -197,7 +197,7 @@ describe LogStash::Filters::Grep do
 
     sample("tags" => ["tag"], "str" => "test") do
       reject { subject }.nil?
-      insist { subject.tags} == ["tag", "new_tag"]
+      insist { subject["tags"]} == ["tag", "new_tag"]
     end
   end
 
@@ -214,7 +214,7 @@ describe LogStash::Filters::Grep do
 
     sample("tags" => ["tag"], "str" => "non-matching") do
       reject { subject }.nil?
-      insist { subject.tags} == ["tag"]
+      insist { subject["tags"]} == ["tag"]
     end
   end
 
@@ -230,7 +230,7 @@ describe LogStash::Filters::Grep do
 
     sample("tags" => ["tag"], "str" => "test") do
       reject { subject }.nil?
-      insist { subject.tags} == ["tag", subject["str"]]
+      insist { subject["tags"]} == ["tag", subject["str"]]
     end
   end
 

spec/filters/grok.rb

@@ -248,7 +248,7 @@ describe LogStash::Filters::Grok do
         }
       CONFIG
       sample "hello world" do
-        insist { subject.tags }.nil?
+        insist { subject["tags"] }.nil?
         insist { subject["foo"] } == "hello"
       end
     end
@@ -281,8 +281,8 @@ describe LogStash::Filters::Grok do
     CONFIG
 
     sample("status" => 403) do
-      reject { subject.tags }.include?("_grokparsefailure")
-      insist { subject.tags }.include?("four_oh_three")
+      reject { subject["tags"] }.include?("_grokparsefailure")
+      insist { subject["tags"] }.include?("four_oh_three")
     end
   end
 
@@ -298,7 +298,7 @@ describe LogStash::Filters::Grok do
 
     sample("version" => 1.0) do
       insist { subject["tags"] }.include?("one_point_oh")
-      insist { subject.tags }.include?("one_point_oh")
+      insist { subject["tags"] }.include?("one_point_oh")
     end
   end
 

spec/filters/json.rb

@@ -51,7 +51,7 @@ describe LogStash::Filters::Json do
     CONFIG
 
     sample "invalid json" do
-      insist { subject.tags }.include?("_jsonparsefailure")
+      insist { subject["tags"] }.include?("_jsonparsefailure")
     end
   end
 end

spec/filters/mutate.rb

@@ -157,8 +157,8 @@ describe LogStash::Filters::Mutate do
     CONFIG
 
     sample "whatever" do
-      reject { subject.fields }.include?("nosuchfield")
-      reject { subject.fields }.include?("hello")
+      reject { subject }.include?("nosuchfield")
+      reject { subject }.include?("hello")
     end
   end
 

spec/filters/railsparallelrequest.rb

@@ -8,11 +8,11 @@ describe LogStash::Filters::Railsparallelrequest do
     it "should not process same event twice" do
       filter = LogStash::Filters::Railsparallelrequest.new
       event = LogStash::Event.new({message: "hello world"})
-      event.tags=[]
+      event["tags"]=[]
       filter.filter event
-      insist { event.tags } == ["railsparallelrequest"]
+      insist { event["tags"] } == ["railsparallelrequest"]
       filter.filter event
-      insist { event.tags } == ["railsparallelrequest"]
+      insist { event["tags"] } == ["railsparallelrequest"]
     end
 
     it "should merge multiple events into single event based on unique UUID" do
@@ -106,7 +106,7 @@ describe LogStash::Filters::Railsparallelrequest do
 end
 def event data
   event = LogStash::Event.new(data)
-  event.tags=[]
+  event["tags"]=[]
   event
 end