logstash-codec-json 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d60d31b2c7e2ade8098adedf54e08c488c57a625abf96eb1fcb17763da79eb
-  data.tar.gz: f9d189aae39a9cbfc3e733d9bed105e363ccf7933e7c48629dc4bc42811fc546
+  metadata.gz: a7b46a5fa704f7e6638944ab3ece1b96d972bcae84d7a35a3bf1850fde9d1c68
+  data.tar.gz: 8dc490e072b14ab59c7bccec084ccc02c10af576eef532ec0cf4d01faa171b43
 SHA512:
-  metadata.gz: d170acccfdafc9bc6d848de05dddc6c0e40f0bd4a995341375783eb8ab04d2fc4a4e201b711c5165e2e9011a62aba54c2574462645a74a6dc29c188d85b333a9
-  data.tar.gz: af487455cec1b076d84e428d0769ced95f9f1cf64ec2cee5a52e965dc384a1e3416aff90e425084530f005bea2a3513bba46782f96567bf8c2a5b510cb7be9b1
+  metadata.gz: 6bb6de9751e720507a9c60234f0d6d249fd6aa9b3ef687246c68a22015d40bc2fdced1905f0e5ebcc902b98c8ed9052cd7743182ecd25064cd98e2d1e59435a0
+  data.tar.gz: c347d72d75821502694f16439faf146c1f9d064964f0fe5b428ea487e570e072cd3cbf79ca3cb0b297404f7c16a5f235a14e94936cc73f1644a38d6e917ead03

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.1
+  - Fix: when decoded JSON includes an `[event][original]` field, having `ecs_compatibility` enabled will no longer overwrite the decoded field [#43](https://github.com/logstash-plugins/logstash-codec-json/pull/43)
+
 ## 3.1.0
   - Feat: event `target => namespace` support (for ECS) [#37](https://github.com/logstash-plugins/logstash-codec-json/pull/37)
   - Refactor: dropped support for old Logstash versions (< 6.0)

data/lib/logstash/codecs/json.rb

@@ -75,7 +75,7 @@ class LogStash::Codecs::JSON < LogStash::Codecs::Base
     events = events_from_json(json, targeted_event_factory)
     if events.size == 1
       event = events.first
-      event.set(@original_field, json.dup.freeze) if @original_field
+      event.set(@original_field, json.dup.freeze) if @original_field && !event.include?(@original_field)
       yield event
     else
       events.each { |event| yield event }

data/logstash-codec-json.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-json'
-  s.version         = '3.1.0'
+  s.version         = '3.1.1'
   s.licenses        = ['Apache License (2.0)']
-  s.summary         = "Reads JSON formatted content, creating one event per element in a JSON array"
+  s.summary         = "Reads and writes JSON formatted content; one event per element in a JSON array"
   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'

data/spec/codecs/json_spec.rb

@@ -222,6 +222,19 @@ describe LogStash::Codecs::JSON, :ecs_compatibility_support do
 
         end
 
+        context 'when JSON-coded event includes [event][original]' do
+          let(:message) { ' { "foo": "bar", "baz": { "0": [1, 2, 3], "1": true }, "event" : { "original" : "actual_original" } } ' }
+
+          it 'does not overwrite [event][original]' do
+            count = 0
+            subject.decode(message) do |event|
+              count += 1
+              expect( event.get('[event][original]') ).to eq("actual_original")
+            end
+            expect( count ).to eql 1
+          end
+        end
+
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-json
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -145,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Reads JSON formatted content, creating one event per element in a JSON array
+summary: Reads and writes JSON formatted content; one event per element in a JSON
+  array
 test_files:
 - spec/codecs/json_spec.rb