logstash-filter-date 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23dc096d2329e51dc294d33a1e13c0d160c26270
-  data.tar.gz: 7ab94137df21d9bf1e66f2befca1308ecbf5af99
+  metadata.gz: 560d311715c0a4a9fd5dce66347ac0454e8a0f9b
+  data.tar.gz: 16c331c55c8ee5473e7bd15b61cf984e3e02c26f
 SHA512:
-  metadata.gz: df6a4a6db839b1472e9580848246a17e89196256edfea9123f07fb05be252eb0033dab2e71a757e9d46da77c7eea3609c1413fc46cc2e8c9778e3814e346f3fb
-  data.tar.gz: ca7e797bd82d5f13458d94ecbce72822f2ee2303cd7a55241fd84b79538d009b249069a180651e61be83bf9ceb8d61b79b96ffa875722330f9178ecbe125a168
+  metadata.gz: 4e2309227ddbc2945a328c27bf26bb2f3c48b86fe96797442bc919761079e1749282936532661923c225746699f7458529b1d2cd768d18d9e93f86513423d733
+  data.tar.gz: 6c41b484930ee043e2b19bc5725f59312ae69c27a7b732ea2ebfeb5d38c1359fa87cbacaf6d9ddbff5e3af5947969e8f8333bacf7390551e3bf02388445afcd2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.1.5
+  - Ignore cancelled events
+
+## 3.1.4
+  - Add metrics to track matches and failures
+
 ## 3.1.3
   - Fix bug where numbers from a JSON codec would result in a date parse failure. (#86, #89)
 

data/lib/logstash/filters/date.rb

@@ -171,9 +171,15 @@ class LogStash::Filters::Date < LogStash::Filters::Base
 
     source = @match.first
 
-    @datefilter = org.logstash.filters.DateFilter.new(source, @target, @tag_on_failure) do |event|
+    success_block = Proc.new do |event|
       filter_matched(event)
+      metric.increment(:matches)
     end
+    failure_block = Proc.new do |event|
+      metric.increment(:failures)
+    end
+
+    @datefilter = org.logstash.filters.DateFilter.new(source, @target, @tag_on_failure, success_block, failure_block)
 
     @match[1..-1].map do |format|
       @datefilter.accept_filter_config(format, @locale, @timezone)

data/logstash-filter-date.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-date'
-  s.version         = '3.1.3'
+  s.version         = '3.1.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The date filter is used for parsing dates from fields, and then using that date or timestamp as the logstash timestamp for the event."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/filters/date_spec.rb

@@ -9,20 +9,11 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     org.logstash.filters.parser.JodaParser.setDefaultClock(org.logstash.filters.parser.JodaParser.wallClock);
   end
 
-  describe "giving an invalid match config, raise a configuration error" do
-    config <<-CONFIG
-      filter {
-        date {
-          match => [ "mydate"]
-          locale => "en"
-        }
-      }
-    CONFIG
-
-    sample "not_really_important" do
-      insist {subject}.raises LogStash::ConfigurationError
+  context "when giving an invalid match config" do
+    let(:options) { { "match" => ["mydate"] } }
+    it "raises a configuration error" do
+      expect { described_class.new(options) }.to raise_error(LogStash::ConfigurationError)
     end
-
   end
 
   describe "parsing with ISO8601" do
@@ -754,4 +745,78 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
     end
   end
+
+  describe "metric counters" do
+    subject { described_class.new("match" => [ "message", "yyyy" ]) }
+
+    context "when date parses a date correctly" do
+      let(:event) { ::LogStash::Event.new("message" => "1999") }
+      it "increases the matches counter" do
+        expect(subject.metric).to receive(:increment).with(:matches)
+        subject.filter(event)
+      end
+    end
+
+    context "when date parses a date correctly" do
+      let(:event) { ::LogStash::Event.new("message" => "not really a year") }
+      it "increases the matches counter" do
+        expect(subject.metric).to receive(:increment).with(:failures)
+        subject.filter(event)
+      end
+    end
+  end
+
+  describe "cancelled events" do
+    subject { described_class.new("match" => [ "message", "yyyy" ]) }
+
+    context "single cancelled event" do
+      let(:event) do
+        e = ::LogStash::Event.new("message" => "1999")
+        e.cancel
+        e
+      end
+
+      it "ignores and return cancelled" do
+        expect{subject.filter(event)}.to_not change{event.timestamp}
+        result = subject.filter(event)
+        expect(result.cancelled?).to be_truthy
+      end
+    end
+
+    context "cancelled events list" do
+      let(:uncancelled_year) { 2001 }
+
+      let(:now_year) do
+        ::LogStash::Event.new.timestamp.year
+      end
+
+      let(:events) do
+        list = []
+        e = ::LogStash::Event.new("message" => "1999")
+        e.cancel
+        list << e
+
+        e = ::LogStash::Event.new("message" => "2000")
+        e.cancel
+        list << e
+
+        e = ::LogStash::Event.new("message" => uncancelled_year.to_s)
+        list << e
+
+        list
+      end
+
+      it "ignores and return ignored cancelled" do
+        result = subject.multi_filter(events)
+        expect(result.size).to eq(3)
+        expect(result[0].cancelled?).to be_truthy
+        expect(result[1].cancelled?).to be_truthy
+        expect(result[2].cancelled?).to be_falsey
+
+        expect(result[0].timestamp.year).to eq(now_year)
+        expect(result[1].timestamp.year).to eq(now_year)
+        expect(result[2].timestamp.year).to eq(uncancelled_year)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-date
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement