logstash-filter-delta 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8c0c909e697bf09071d2d95c11a7e8f2782d176
-  data.tar.gz: 40c3997a60da39404bb21fbb079fc841ce4ba707
+  metadata.gz: 1f5e44d2824a950b7d381a2769b3b4d71be155ca
+  data.tar.gz: 8ee30261a9d8bdbb3765dc2a10a62fd7fb3182fc
 SHA512:
-  metadata.gz: 90593fe58f559559795b45abf45d90c3bf7c6670398d6f1536a56ae443cbc17333bb91ac7fe577416572739a8c4ac1fa142a45c965ab82bcfb906f62b9092da0
-  data.tar.gz: d10514747b04579e102aa3a7283b91cc9118e89a4675b98553c38aba8bf449f8c10238e60fed5044f2df980bf440f6a1d94011913df7112b737874c1c637f5eb
+  metadata.gz: 1a3a5bd6139c7bcd1984abab12940762edfe319be5149c83ab2e291c856d0bce68ad1cb9ce2f70d3b6cb151ebd90917929b79575da5679f7d560ee3f74391064
+  data.tar.gz: b11c7cdb422e50d24566b6f06137fdce5b5f63267d9dc6269fd31acb9c4e1a8bbee24a864b69b320dba1e580ee71bd605bc4cb2e9e85ff9fbbab2ae55a3cc989

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.0
+ - Cast string input values to integer and float
+
 ## 1.0.1
  - Add support for Logstash 2.4 and plugin API 1.0
 

data/lib/logstash/filters/delta.rb

@@ -33,8 +33,20 @@ class LogStash::Filters::Delta < LogStash::Filters::Base
   end
 
   private
-  def is_numeric(value)
-    return (value.is_a?(Integer) or value.is_a?(Float))
+  def cast_string_to_numeric(value)
+    begin
+      return Integer(value)
+    rescue ArgumentError
+      return Float(value)
+    end
+  end
+
+  private
+  def ensure_numeric(value)
+    if (value.is_a? Float or value.is_a? Integer)
+      return value
+    end
+    return cast_string_to_numeric(value)
   end
 
   public
@@ -54,15 +66,12 @@ class LogStash::Filters::Delta < LogStash::Filters::Base
         return filter_failed(event, @tag_on_failure)
       end
 
-      to = event.get(to)
-      from = event.get(from)
-
-      if !is_numeric(to) or !is_numeric(from)
+      begin
+        delta = ensure_numeric(event.get(to)) - ensure_numeric(event.get(from))
+      rescue ArgumentError
         return filter_failed(event, @tag_on_failure)
       end
 
-      delta = to - from
-
       if @min and delta < @min
         return filter_failed(event, @tag_on_min_failure)
       end

data/logstash-filter-delta.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-delta'
-  s.version = '1.0.1'
+  s.version = '1.1.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This filter helps you to calculate integer or float delta."
   s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using `logstash-plugin install logstash-filter-delta`. This gem is not a stand-alone program"

data/spec/filters/delta_spec.rb

@@ -29,6 +29,28 @@ describe LogStash::Filters::Delta do
     end
   end
 
+  describe "Test string casting" do
+    sample("start" => "100", "end" => "250.5") do
+      expect(subject.get("output")).to eq(150.5)
+      expect(subject.get("tags")).to eq(nil)
+    end
+
+    sample("start" => "100.3", "end" => "250.5") do
+      expect(subject.get("output")).to eq(150.2)
+      expect(subject.get("tags")).to eq(nil)
+    end
+
+    sample("start" => "100", "end" => "250") do
+      expect(subject.get("output")).to eq(150)
+      expect(subject.get("tags")).to eq(nil)
+    end
+
+    sample("start" => "abc", "end" => "250") do
+      expect(subject.get("output")).to eq(nil)
+      expect(subject.get("tags")).to eq(["_deltafailure"])
+    end
+  end
+
   describe "Write delta to field" do
     sample("start" => 100, "end" => 250) do
       expect(subject.get("output")).to eq(150)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-delta
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - William Tisäter