logstash-filter-fingerprint 3.4.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ab2a8c642f61df85825d8de9f0cf7c6a1cf05b01b32ceffea1776ea4ebce66
-  data.tar.gz: 7af0a15fc8e0b686a263f2828919fd7da1fb5627fa86cb4f82a7b0a361c16b20
+  metadata.gz: cab2034c16ba3a10e1e9c54f1c647e41656231297b12b8a0071aa2e2993f1c7b
+  data.tar.gz: abba4c27fe2388d5ee2f153f64b700ab92f8916804846e18d2b8b4a538f63bb3
 SHA512:
-  metadata.gz: 23ded7513caf3a42ae83a921e535a0498132ddfa0b1fd4f992991abe1f9f910f9c1d4df475edb9c37677f1d9b59ebdd6442171794f58e91eb52e4d58a0052ac9
-  data.tar.gz: c0b36f667d92ff883b7e2507bbea40d6e9a3d0b52155c7a1342b435aa7bd144675684212092059f5bba20bcff64d08ce50f74eefa5762e1e41f772aafbb8c4dd
+  metadata.gz: 574c5ac68d60513c4b4ac55bd7f6c2a6a1c986fdfa6135c56ee551dcd7ac2a119cb08ac42e1636eb19414e1b91141c72849c775df09cb9ef8ad110de1bbb0583
+  data.tar.gz: f807ec6c96c7d239be51ecd6244f6ba57c4c322968e0055a2d3dbe7e1fccec3d0b8e102917dff2ae439a24fac4197c18b30a3255d1226ba566831ded2d303d46

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.5.0
+  - Fix fingerprint instability for Hash and Array field values caused by JRuby 10 changing `Hash#inspect` formatting [#79](https://github.com/logstash-plugins/logstash-filter-fingerprint/pull/79)
+
 ## 3.4.4
   - Fix, eagerly load OpenSSL classes ot avoid uninitialized constant error [#76](https://github.com/logstash-plugins/logstash-filter-fingerprint/pull/76)
 

data/lib/logstash/filters/fingerprint.rb

@@ -160,12 +160,12 @@ class LogStash::Filters::Fingerprint < LogStash::Filters::Base
         if @concatenate_all_fields
           deep_sort_hashes(event.to_hash).each do |k,v|
             # Force encoding to UTF-8 to get around https://github.com/jruby/jruby/issues/6748
-            to_string << "|#{k}|#{v}".force_encoding("UTF-8")
+            to_string << "|#{k}|#{to_canonical_value(v)}".force_encoding("UTF-8")
           end
         else
           @source.sort.each do |k|
             # Force encoding to UTF-8 to get around https://github.com/jruby/jruby/issues/6748
-            to_string << "|#{k}|#{deep_sort_hashes(event.get(k))}".force_encoding("UTF-8")
+            to_string << "|#{k}|#{to_canonical_value(event.get(k))}".force_encoding("UTF-8")
           end
         end
         to_string << "|"
@@ -175,9 +175,9 @@ class LogStash::Filters::Fingerprint < LogStash::Filters::Base
         @source.each do |field|
           next unless event.include?(field)
           if event.get(field).is_a?(Array)
-            event.set(@target, event.get(field).collect { |v| fingerprint(deep_sort_hashes(v)) })
+            event.set(@target, event.get(field).collect { |v| fingerprint(to_canonical_value(v)) })
           else
-            event.set(@target, fingerprint(deep_sort_hashes(event.get(field))))
+            event.set(@target, fingerprint(to_canonical_value(event.get(field))))
           end
         end
       end
@@ -201,6 +201,22 @@ class LogStash::Filters::Fingerprint < LogStash::Filters::Base
     end
   end
 
+  # Returns a canonical representation of the given object for fingerprinting.
+  # For Hashes and Arrays, produces a pipe-delimited string that is
+  # independent of Hash#inspect formatting (which changed in JRuby 10).
+  # Scalars pass through unchanged to preserve type-aware fingerprinting
+  # (e.g., MURMUR3 uses int64_hash for Integers vs str_hash for Strings).
+  def to_canonical_value(object)
+    case object
+    when Hash
+      object.sort.map { |k, v| "#{to_canonical_value(k)}|#{to_canonical_value(v)}" }.join("|")
+    when Array
+      object.map { |e| to_canonical_value(e) }.join("|")
+    else
+      object
+    end
+  end
+
   def fingerprint_ipv4_network(ip_string)
     # in JRuby 1.7.11 outputs as US-ASCII
     IPAddr.new(ip_string).mask(@key.value.to_i).to_s.force_encoding(Encoding::UTF_8)

data/logstash-filter-fingerprint.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-fingerprint'
-  s.version         = '3.4.4'
+  s.version         = '3.5.0'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Fingerprints fields by replacing values with a consistent hash"
   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/fingerprint_spec.rb

@@ -261,7 +261,7 @@ describe LogStash::Filters::Fingerprint, :ecs_compatibility_support, :aggregate_
         let(:config) { super().merge("concatenate_sources" => true) }
         it "fingerprints the value of concatenated key/pairs" do
           # SHA1 of "|field1|inner_key|🂡|1|2|field2|🂡|"
-          expect(fingerprint).to eq("d74f41841c7cdc793a97c218d2ff18064a5f1950")
+          expect(fingerprint).to eq("d2a1c14e0c9ef137d67114db23b3f2fdbcc90d08")
         end
       end
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-fingerprint
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2026-03-31 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,42 +30,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: murmurhash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.6
-  name: murmurhash3
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-ecs_compatibility_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-  name: logstash-mixin-ecs_compatibility_support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -96,7 +95,6 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Fingerprints fields by replacing values with a consistent hash
 test_files: