Merge pull request #2082 from vimalk78/add-oj

LOG-1157: Added Oj parser for json parsing

Author: openshift-merge-robot

fluentd/Gemfile

@@ -16,6 +16,8 @@ gem 'fluent-plugin-remote-syslog'
 gem 'fluent-plugin-prometheus'
 gem 'fluent-plugin-splunk-hec'
 gem 'typhoeus'
+gem 'oj'
+gem 'bigdecimal'
 
 #Below gem(and two of its dependencies) are moved to O_A_L/fluentd/lib, but its dependencies still exist in O_A_L/fluentd/vendored_gem_src/
 #gem 'fluent-plugin-remote_syslog', '1.0.0'

fluentd/Gemfile.lock

@@ -15,6 +15,7 @@ GEM
       jmespath (~> 1.0)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
+    bigdecimal (3.0.0)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.3)
     cool.io (1.6.0)
@@ -126,6 +127,7 @@ GEM
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     netrc (0.11.0)
+    oj (3.11.3)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
     public_suffix (4.0.5)
@@ -163,6 +165,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bigdecimal
   elasticsearch
   elasticsearch-api
   elasticsearch-transport
@@ -180,6 +183,7 @@ DEPENDENCIES
   fluent-plugin-splunk-hec
   fluent-plugin-systemd
   fluentd (= 1.7.4)!
+  oj
   rake
   typhoeus
   uuidtools (= 2.1.5)

fluentd/rh-manifest.txt

@@ -20,6 +20,7 @@ jmespath 1.4.0 http://github.com/trevorrowe/jmespath.rb
 jsonpath 1.0.5 https://github.com/joshbuddy/jsonpath
 ltsv 0.1.2 https://github.com/condor/ltsv
 rubygem-addressable 2.7.0 https://github.com/sporkmonger/addressable
+rubygem-bigdecimal 3.0.0 https://github.com/ruby/bigdecimal
 rubygem-concurrent-ruby 1.1.6 http://www.concurrent-ruby.com
 rubygem-connection_pool 2.2.3 https://github.com/mperham/connection_pool
 rubygem-cool.io 1.6.0 http://coolio.github.com
@@ -52,6 +53,7 @@ rubygem-multi_json 1.15.0 https://github.com/intridea/multi_json
 rubygem-multipart-post 2.1.1 https://github.com/nicksieger/multipart-post
 rubygem-net-http-persistent 3.1.0 http://docs.seattlerb.org/net-http-persistent
 rubygem-netrc 0.11.0 https://github.com/geemus/netrc
+rubygem-oj 3.11.3 http://www.ohler.com/oj
 rubygem-prometheus-client 0.9.0 https://github.com/prometheus/client_ruby
 rubygem-public_suffix 4.0.5 https://simonecarletti.com/code/publicsuffix-ruby
 rubygem-quantile 0.2.1 http://github.com/matttproud/ruby_quantile_estimation

fluentd/vendored_gem_src/bigdecimal/bigdecimal.gemspec

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+bigdecimal_version = '3.0.0'
+
+Gem::Specification.new do |s|
+  s.name          = "bigdecimal"
+  s.version       = bigdecimal_version
+  s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
+  s.email         = ["[email protected]"]
+
+  s.summary       = "Arbitrary-precision decimal floating-point number library."
+  s.description   = "This library provides arbitrary-precision decimal floating-point number class."
+  s.homepage      = "https://github.com/ruby/bigdecimal"
+  s.license       = "Ruby"
+
+  s.require_paths = %w[lib]
+  s.extensions    = %w[ext/bigdecimal/extconf.rb]
+  s.files         = %w[
+    bigdecimal.gemspec
+    ext/bigdecimal/bigdecimal.c
+    ext/bigdecimal/bigdecimal.h
+    lib/bigdecimal.rb
+    lib/bigdecimal/jacobian.rb
+    lib/bigdecimal/ludcmp.rb
+    lib/bigdecimal/math.rb
+    lib/bigdecimal/newton.rb
+    lib/bigdecimal/util.rb
+    sample/linear.rb
+    sample/nlsolve.rb
+    sample/pi.rb
+  ]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+
+  s.add_development_dependency "rake", ">= 12.3.3"
+  s.add_development_dependency "rake-compiler", ">= 0.9"
+  s.add_development_dependency "minitest", "< 5.0.0"
+  s.add_development_dependency "pry"
+end