logstash-input-gelf 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b681e1769e452f4699058f8663137c81fe50e2ce19f1f8ec130964125bade1
-  data.tar.gz: 70f5a59240931cfcac843db52e275cbe97a2e624c59c59e9162fe6a34251f8db
+  metadata.gz: dbaa212dd64992aea162a2d0888468f52e91b9a251fcbd7eb3d02850b82da24a
+  data.tar.gz: 804762f84e844e55ed7efb4bb9dd02a4d0e7a6a56f5c2ea8fea0e5945a2683c2
 SHA512:
-  metadata.gz: a602e5bea3c91f985e72b49780241696da85f7eb210c2028396edf328a0214de738001e476f0f763dcc06aa4a6d5224e98a0003411d56480fb60bf8e92bf6b10
-  data.tar.gz: 43b6c5cf39ef80374b75272431c50e5a16facc67300a753523ede5ed5b78d1c05103405cd8a4ca898e0e474835b946554ca7856239095bd65c38087bc912757e
+  metadata.gz: 49f13ce13d7acdd4862f4db62f31dfbeea263013d201cf9e761c6f76f1621f06dee7206c39b8e991f06b0150377d10f24d2b955787ae02c49b8eced72541be4e
+  data.tar.gz: 1b7eb70bd7eb91728f9feb23d937c62cd896a9c12b1aa575950aa2e87cdcaffbacd90949dcd3799230650691d846b82165101e98c1e9176008a71d72ae303bc0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.2
+  - Fix: avoid panic when handling very-large exponent-notation `_@timestamp` values [#71](https://github.com/logstash-plugins/logstash-input-gelf/pull/71)
+
 ## 3.3.1
   - Fix: safely coerce the value of `_@timestamp` to avoid crashing the plugin [#67](https://github.com/logstash-plugins/logstash-input-gelf/pull/67)
 

data/lib/logstash/inputs/gelf.rb

@@ -243,7 +243,9 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
   def self.coerce_timestamp(timestamp)
     # prevent artificial precision from being injected by floats
     timestamp = timestamp.rationalize if timestamp.kind_of?(Float)
-    LogStash::Timestamp.at(timestamp)
+
+    # bug in JRuby prevents correcly parsing a BigDecimal fractional part, see https://github.com/elastic/logstash/issues/4565
+    timestamp.is_a?(BigDecimal) ? LogStash::Timestamp.at(timestamp.to_i, timestamp.frac * 1000000) : LogStash::Timestamp.at(timestamp)
   end
 
   def self.parse(json)

data/logstash-input-gelf.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-gelf'
-  s.version         = '3.3.1'
+  s.version         = '3.3.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads GELF-format messages from Graylog2 as events"
   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/inputs/gelf_spec.rb

@@ -176,9 +176,9 @@ describe LogStash::Inputs::Gelf do
 
     context "BigDecimal numeric values" do
       it "should coerce and preserve millisec precision in iso8601" do
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.1")).to_iso8601).to eq("2000-01-01T05:00:00.100Z")
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.12")).to_iso8601).to eq("2000-01-01T05:00:00.120Z")
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.123")).to_iso8601).to eq("2000-01-01T05:00:00.123Z")
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.1"))).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.100Z")
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.12"))).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.120Z")
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.123"))).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.123Z")
       end
 
       it "should coerce and preserve usec precision" do
@@ -206,7 +206,12 @@ describe LogStash::Inputs::Gelf do
 
     it "should coerce float numeric value and preserve milliseconds precision in iso8601" do
       event = LogStash::Inputs::Gelf.new_event("{\"timestamp\":946702800.123}", "dummy")
-      expect(event.timestamp.to_iso8601).to eq("2000-01-01T05:00:00.123Z")
+      expect(event.timestamp).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.123Z")
+    end
+
+    it "should coerce exponent-notation timestamps" do
+      event = LogStash::Inputs::Gelf.new_event("{\"timestamp\":1.660873462488E13}", "dummy")
+      expect(event.timestamp).to be_a_logstash_timestamp_equivalent_to("+528279-11-06T19:48:00Z")
     end
 
     it "should coerce float numeric value and preserve usec precision" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-gelf
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement