logstash-core-event 2.2.4.snapshot2-java → 2.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3922d39638e8b986dc53b640d0251e3d8db4f648
-  data.tar.gz: c983cd79962457327fae39b5db02910e498fbe17
+  metadata.gz: 6bbec684d28183585d9145c139222af96c794d75
+  data.tar.gz: 913010a87e3327cf359c7e23f2cd19c9055e6b34
 SHA512:
-  metadata.gz: 7679cfbe82ee091f537c1866d44223101589bc99daab58d57d2a42932f513bedb1cb15a861ccef3ccf3e9199765b09a3c1e5360df98222a10483a30b262c60f5
-  data.tar.gz: 63b12d4ceac484ef1706cd0aaf6c4be5c3f288a4d66b6b8bef838f85bdf1e7afd77de38b12df8d3307024d48923134bc5bc9d88ea9d91bd656180bd11968752d
+  metadata.gz: 52bd3dca7ce0b16c85db04bc563ab4cdac1dbb1eb7d65fa4441028275303cf8f3b42ec05ebd91f921d8321ec260093a88f34039386a60637bae50e4ed46cf03c
+  data.tar.gz: 9729bca036041a20f7d117cf41d298a6c27643ce6012be56ca2644956a4c31a5404b507dfa0758b6909afc1deb4c08012fd9c2f20b6b9de184f07b1c11f1c30a

data/lib/logstash/string_interpolation.rb

@@ -125,7 +125,9 @@ module LogStash
       when Hash
         LogStash::Json.dump(value)
       else
-        value
+        # Make sure we dont work on the refence of the value
+        # The Java Event implementation was always returning a string.
+        "#{value}"
       end
     end
   end

data/lib/logstash/timestamp.rb

@@ -24,13 +24,7 @@ module LogStash
     end
 
     def self.at(*args)
-      epoch = args.first
-      if epoch.is_a?(BigDecimal)
-        # bug in JRuby prevents correcly parsing a BigDecimal fractional part, see https://github.com/elastic/logstash/issues/4565
-        Timestamp.new(::Time.at(epoch.to_i, epoch.frac.to_f * 1000000))
-      else
-        Timestamp.new(::Time.at(*args))
-      end
+      Timestamp.new(::Time.at(*args))
     end
 
     def self.parse(*args)

data/lib/logstash-core-event/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_EVENT_VERSION = "2.2.4.snapshot2"
+LOGSTASH_CORE_EVENT_VERSION = "2.3.0"

data/spec/logstash/event_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "spec_helper"
+require "logstash/util/decorators"
 require "json"
 
 describe LogStash::Event do
@@ -49,9 +50,46 @@ describe LogStash::Event do
         subject["[baz]"] = nil
         expect(subject.to_hash).to include("baz" => nil)
       end
+
+      it "should set nil element within existing array value" do
+        subject["[foo]"] = ["bar", "baz"]
+
+        expect(subject["[foo][0]"] = nil).to eq(nil)
+        expect(subject["[foo]"]).to eq([nil, "baz"])
+      end
+
+      it "should set nil in first element within empty array" do
+        subject["[foo]"] = []
+
+        expect(subject["[foo][0]"] = nil).to eq(nil)
+        expect(subject["[foo]"]).to eq([nil])
+      end
+
+      it "should set nil in second element within empty array" do
+        subject["[foo]"] = []
+
+        expect(subject["[foo][1]"] = nil).to eq(nil)
+        expect(subject["[foo]"]).to eq([nil, nil])
+      end
     end
 
     context "#sprintf" do
+      it "should not return a String reference" do
+        data = "NOT-A-REFERENCE"
+        event = LogStash::Event.new({ "reference" => data })
+        LogStash::Util::Decorators.add_fields({"reference_test" => "%{reference}"}, event, "dummy-plugin")
+        data.downcase!
+        expect(event["reference_test"]).not_to eq(data)
+      end
+
+      it "should not return a Fixnum reference" do
+        data = 1
+        event = LogStash::Event.new({ "reference" => data })
+        LogStash::Util::Decorators.add_fields({"reference_test" => "%{reference}"}, event, "dummy-plugin")
+        data += 41
+        expect(event["reference_test"]).to eq("1")
+      end
+
       it "should report a unix timestamp for %{+%s}" do
         expect(subject.sprintf("%{+%s}")).to eq("1356998400")
       end
@@ -114,6 +152,39 @@ describe LogStash::Event do
         expect(subject.sprintf("%{type}%{message}|")).to eq("sprintfhello world|")
       end
 
+      it "should render nil array values as leading empty string" do
+        expect(subject["foo"] = [nil, "baz"]).to eq([nil, "baz"])
+
+        expect(subject["[foo][0]"]).to be_nil
+        expect(subject["[foo][1]"]).to eq("baz")
+
+        expect(subject.sprintf("%{[foo]}")).to eq(",baz")
+      end
+
+      it "should render nil array values as middle empty string" do
+        expect(subject["foo"] = ["bar", nil, "baz"]).to eq(["bar", nil, "baz"])
+
+        expect(subject["[foo][0]"]).to eq("bar")
+        expect(subject["[foo][1]"]).to be_nil
+        expect(subject["[foo][2]"]).to eq("baz")
+
+        expect(subject.sprintf("%{[foo]}")).to eq("bar,,baz")
+      end
+
+     it "should render nil array values as trailing empty string" do
+        expect(subject["foo"] = ["bar", nil]).to eq(["bar", nil])
+
+        expect(subject["[foo][0]"]).to eq("bar")
+        expect(subject["[foo][1]"]).to be_nil
+
+        expect(subject.sprintf("%{[foo]}")).to eq("bar,")
+     end
+
+      it "should render deep arrays with nil value" do
+        subject["[foo]"] = [[12, nil], 56]
+        expect(subject.sprintf("%{[foo]}")).to eq("12,,56")
+      end
+
       context "#encoding" do
         it "should return known patterns as UTF-8" do
           expect(subject.sprintf("%{message}").encoding).to eq(Encoding::UTF_8)

data/spec/logstash/timestamp_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "spec_helper"
 require "logstash/timestamp"
+require "bigdecimal"
 
 describe LogStash::Timestamp do
 
@@ -106,4 +107,64 @@ describe LogStash::Timestamp do
       expect(subject.to_f).to eq(now.to_f)
     end
   end
+
+  context "at" do
+    context "with integer epoch" do
+      it "should convert to correct date" do
+        expect(LogStash::Timestamp.at(946702800).to_iso8601).to eq("2000-01-01T05:00:00.000Z")
+      end
+
+      it "should return zero usec" do
+        expect(LogStash::Timestamp.at(946702800).usec).to eq(0)
+      end
+
+      it "should return prior to epoch date on negative input" do
+        expect(LogStash::Timestamp.at(-1).to_iso8601).to eq("1969-12-31T23:59:59.000Z")
+      end
+    end
+
+    context "with float epoch" do
+      it "should convert to correct date" do
+        expect(LogStash::Timestamp.at(946702800.123456.to_f).to_iso8601).to eq("2000-01-01T05:00:00.123Z")
+      end
+
+      it "should return usec with a minimum of millisec precision" do
+        expect(LogStash::Timestamp.at(946702800.123456.to_f).usec).to be_within(1000).of(123456)
+      end
+    end
+
+    context "with BigDecimal epoch" do
+      it "should convert to correct date" do
+        expect(LogStash::Timestamp.at(BigDecimal.new("946702800.123456")).to_iso8601).to eq("2000-01-01T05:00:00.123Z")
+      end
+
+      it "should return usec with a minimum of millisec precision" do
+        # since Java Timestamp relies on JodaTime which supports only milliseconds precision
+        # the usec method will only be precise up to milliseconds.
+        expect(LogStash::Timestamp.at(BigDecimal.new("946702800.123456")).usec).to be_within(1000).of(123456)
+      end
+    end
+
+    context "with illegal parameters" do
+      it "should raise exception on nil input" do
+        expect{LogStash::Timestamp.at(nil)}.to raise_error
+      end
+
+      it "should raise exception on invalid input type" do
+        expect{LogStash::Timestamp.at(:foo)}.to raise_error
+      end
+    end
+  end
+
+  context "usec" do
+    it "should support millisecond precision" do
+      expect(LogStash::Timestamp.at(946702800.123).usec).to eq(123000)
+    end
+
+    it "should try to preserve and report microseconds precision if possible" do
+      # since Java Timestamp relies on JodaTime which supports only milliseconds precision
+      # the usec method will only be precise up to milliseconds.
+      expect(LogStash::Timestamp.at(946702800.123456).usec).to be_within(1000).of(123456)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core-event
 version: !ruby/object:Gem::Version
-  version: 2.2.4.snapshot2
+  version: 2.3.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies: []
 description: The core event component of logstash, the scalable log and event management tool
 email:
@@ -38,14 +38,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8