logstash-codec-json 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9295eea7f1cd9ae7339dbc10ef81cf23b6ce1d36
-  data.tar.gz: bcd279ad1a9df82528d42ba132dd15bc4b824996
+  metadata.gz: f792b833b69b019e652f7cc595f3a8aab43e2261
+  data.tar.gz: f10764c4248cdfecd36ff9e54148139480f7bb29
 SHA512:
-  metadata.gz: 6de6306fad4704d91654c976b9cbde23b4028c72d9053b581fbe75f194f1c9e357ac12b50bf39e07956894e72cc7d33cffe58c102906bbb4ab88b5dc449e630b
-  data.tar.gz: c4bc2c043c6df6643835cfffcb952165218ada149fc5ed9dbd37333ef9aa185a5ea610d41dad0eb854d722cdcbeee720f6fc78a861131889ac70390df87bda14
+  metadata.gz: c28a3d92840520105f63da899c12bb4d4433ea9178d10e3a2d40d14842a40182cacb5d41c957a1982e8ef01b542ad775b7b531e59cd1f572d5fa59f60be349b7
+  data.tar.gz: 3305bb9be36a093ff7baeeae903fb39a8ddb29d94c665c763dfe245a74fe8e833c32e7ab42431bcf1faa6c26d4cba1d2fec978e8e90ea181b331bae4df39a215

data/CHANGELOG.md

@@ -1,2 +1,4 @@
+* 1.1.0
+  - Handle scalar types (string/number) and be more defensive about crashable errors
 * 1.0.1
   - Handle JSON arrays at source root by emitting multiple events

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/codecs/json.rb

@@ -42,13 +42,24 @@ class LogStash::Codecs::JSON < LogStash::Codecs::Base
       decoded = LogStash::Json.load(data)
       if decoded.is_a?(Array)
         decoded.each {|item| yield(LogStash::Event.new(item)) }
-      else
+      elsif decoded.is_a?(Hash)
         yield LogStash::Event.new(decoded)
+      else
+        @logger.info? && @logger.info("JSON codec received a scalar instead of an Arary or Object!", :data => data)
+        yield LogStash::Event.new("message" => data, "tags" => ["_jsonparsefailure"])
       end
 
     rescue LogStash::Json::ParserError => e
       @logger.info("JSON parse failure. Falling back to plain-text", :error => e, :data => data)
       yield LogStash::Event.new("message" => data, "tags" => ["_jsonparsefailure"])
+    rescue StandardError => e
+      # This should NEVER happen. But hubris has been the cause of many pipeline breaking things
+      # If something bad should happen we just don't want to crash logstash here.
+      @logger.warn("An unexpected error occurred parsing input to JSON",
+                   :input => data,
+                   :message => e.message,
+                   :class => e.class.name,
+                   :backtrace => e.backtrace)
     end
   end # def decode
 

data/logstash-codec-json.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-json'
-  s.version         = '1.0.1'
+  s.version         = '1.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This codec may be used to decode (via inputs) and encode (via outputs) full JSON messages"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

data/spec/codecs/json_spec.rb

@@ -52,6 +52,36 @@ describe LogStash::Codecs::JSON do
       end
     end
 
+    describe "scalar values" do
+      shared_examples "given a value" do |value_arg|
+        context "where value is #{value_arg}" do
+          let(:value) { value_arg }
+          let(:event) { LogStash::Event.new(value) }
+          let(:value_json) { LogStash::Json.dump(value)}
+          let(:event) do
+            e = nil
+            subject.decode(value_json) do |decoded|
+              e = decoded
+            end
+            e
+          end
+
+          it "should store the value in 'message'" do
+            expect(event["message"]).to eql(value_json)
+          end
+
+          it "should have the json parse failure tag" do
+            expect(event["tags"]).to include("_jsonparsefailure")
+          end
+        end
+      end
+
+      include_examples "given a value", 123
+      include_examples "given a value", "hello"
+      include_examples "given a value", "-1"
+      include_examples "given a value", " "
+    end
+
     context "processing JSON with an array root" do
       let(:data) {
         [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-json
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -50,17 +50,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- lib/logstash/codecs/json.rb
+- spec/codecs/json_spec.rb
+- logstash-codec-json.gemspec
+- README.md
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- Rakefile
-- lib/logstash/codecs/json.rb
-- logstash-codec-json.gemspec
-- spec/codecs/json_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)

data/.gitignore

@@ -1,3 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"