logstash-input-gelf 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b681e1769e452f4699058f8663137c81fe50e2ce19f1f8ec130964125bade1
-  data.tar.gz: 70f5a59240931cfcac843db52e275cbe97a2e624c59c59e9162fe6a34251f8db
+  metadata.gz: 1abbfdf0377b9939b08f7de87999036e09889ec2b6afade8bc727467850a6919
+  data.tar.gz: 50c30dd393b1acb755157320f95fca38aa5249d47c13314a043a0870fec3f869
 SHA512:
-  metadata.gz: a602e5bea3c91f985e72b49780241696da85f7eb210c2028396edf328a0214de738001e476f0f763dcc06aa4a6d5224e98a0003411d56480fb60bf8e92bf6b10
-  data.tar.gz: 43b6c5cf39ef80374b75272431c50e5a16facc67300a753523ede5ed5b78d1c05103405cd8a4ca898e0e474835b946554ca7856239095bd65c38087bc912757e
+  metadata.gz: 9b4c1ee937cd763d930754282a6c4013ae1561579e2265b535536add96d1d5c4326affab3d297c1443bd463d5dd8ddab91638db28dc1e59b98b7c93f3c5d48b4
+  data.tar.gz: 2728923a3d68e587f6fb3ce70530abdc2d0ff8e4ed84f59ca57739ab2baf6fccdfb1936de508b225fac5061147bfca5333a0d1660d42fbfb9db108675020e503

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.4.0
+  - Updates the gelf dependency [#77](https://github.com/logstash-plugins/logstash-input-gelf/pull/77)
+
+## 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

@@ -226,7 +226,7 @@ class LogStash::Inputs::Gelf < LogStash::Inputs::Base
     event = parse(json_gelf)
     return if event.nil?
 
-    event.set(SOURCE_HOST_FIELD, host.force_encoding("UTF-8"))
+    event.set(SOURCE_HOST_FIELD, host.encode("UTF-8"))
 
     if (gelf_timestamp = event.get(TIMESTAMP_GELF_FIELD)).is_a?(Numeric)
       event.timestamp = self.coerce_timestamp(gelf_timestamp)
@@ -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,13 +1,13 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-gelf'
-  s.version         = '3.3.1'
+  s.version         = '3.4.0'
   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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
-  s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.homepage        = "https://www.elastic.co/logstash"
   s.require_paths = ["lib"]
 
   # Files
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'stud', '>= 0.0.22', '< 0.1.0'
 
   s.add_development_dependency 'logstash-devutils', '>= 2.3'
-  s.add_development_dependency "gelf", ["3.0.0"]                  #(MIT license)
+  s.add_development_dependency "gelf", ["3.1.0"]                  #(MIT license)
   s.add_development_dependency "flores"
 end

data/spec/inputs/gelf_spec.rb

@@ -106,7 +106,7 @@ describe LogStash::Inputs::Gelf do
       let(:port) { 12210 }
 
       it "should be correctly processed" do
-        gelfclient.notify!("short_message" => "msg1", "_@timestamp" => BigDecimal.new("946702800.1"))
+        gelfclient.notify!("short_message" => "msg1", "_@timestamp" => BigDecimal("946702800.1"))
         gelfclient.notify!("short_message" => "msg2")
 
         e = queue.pop
@@ -176,21 +176,21 @@ 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("946702800.1"))).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.100Z")
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.12"))).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.120Z")
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.123"))).to be_a_logstash_timestamp_equivalent_to("2000-01-01T05:00:00.123Z")
       end
 
       it "should coerce and preserve usec precision" do
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.1")).usec).to eq(100000)
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.12")).usec).to eq(120000)
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.123")).usec).to eq(123000)
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.1")).usec).to eq(100000)
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.12")).usec).to eq(120000)
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.123")).usec).to eq(123000)
 
         # since Java Timestamp in 2.3+ relies on JodaTime which supports only millisec precision
         # the usec method will only be precise up to millisec.
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.1234")).usec).to be_within(1000).of(123400)
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.12345")).usec).to be_within(1000).of(123450)
-        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal.new("946702800.123456")).usec).to be_within(1000).of(123456)
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.1234")).usec).to be_within(1000).of(123400)
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.12345")).usec).to be_within(1000).of(123450)
+        expect(LogStash::Inputs::Gelf.coerce_timestamp(BigDecimal("946702800.123456")).usec).to be_within(1000).of(123456)
       end
     end
   end
@@ -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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-gelf
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2026-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +19,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,34 +30,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: gelfd2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
-  name: gelfd2
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,9 +67,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.1.0
-  name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -79,42 +78,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
+  name: gelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: gelf
-  prerelease: false
+        version: 3.1.0
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
+  name: flores
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: flores
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,13 +138,12 @@ files:
 - logstash-input-gelf.gemspec
 - spec/inputs/gelf_spec.rb
 - spec/support/helpers.rb
-homepage: http://www.elastic.co/guide/en/logstash/current/index.html
+homepage: https://www.elastic.co/logstash
 licenses:
 - Apache License (2.0)
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Reads GELF-format messages from Graylog2 as events
 test_files: