Merge pull request #1953 from jcantrill/1833486_174_on_46

Bug 1833486: Revert fluentd to 1.7.4 to address performance regression

Author: openshift-merge-robot

fluentd/Dockerfile

@@ -3,7 +3,7 @@ FROM ubi7/ruby-25:latest as builder
 MAINTAINER OpenShift Development <[email protected]>
 
 ARG DATA_VERSION_VALUE=1.6.0
-ARG FLUENTD_VERSION_VALUE=1.11.1
+ARG FLUENTD_VERSION_VALUE=1.7.4
 ARG HOME_VALUE=/opt/app-root/src
 ARG PATH_VALUE=/opt/app-root/src/bin:/opt/app-root/bin
 ARG LOGGING_FILE_PATH_VALUE=/var/log/fluentd/fluentd.log

fluentd/Gemfile.lock

@@ -1,21 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activesupport (5.2.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aes_key_wrap (1.1.0)
-    attr_required (1.0.1)
-    bindata (2.4.7)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.3)
     cool.io (1.6.0)
+    dig_rb (1.0.1)
     digest-crc (0.6.1)
       rake (~> 13.0)
     domain_name (0.5.20190701)
@@ -42,22 +33,22 @@ GEM
       uuidtools (>= 2.1.5)
     fluent-plugin-concat (2.4.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-elasticsearch (4.1.0)
+    fluent-plugin-elasticsearch (4.1.1)
       elasticsearch
       excon
       fluentd (>= 0.14.22)
-    fluent-plugin-kafka (0.13.0)
+    fluent-plugin-kafka (0.13.1)
       fluentd (>= 0.10.58, < 2)
       ltsv
       ruby-kafka (>= 0.7.8, < 2)
-    fluent-plugin-kubernetes_metadata_filter (2.5.1)
+    fluent-plugin-kubernetes_metadata_filter (2.5.2)
       fluentd (>= 0.14.0, < 1.12)
       kubeclient (< 5)
       lru_redux
     fluent-plugin-multi-format-parser (1.0.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-prometheus (1.8.1)
-      fluentd (>= 1.9.1, < 2)
+    fluent-plugin-prometheus (1.7.3)
+      fluentd (>= 0.14.20, < 2)
       prometheus-client (< 0.10)
     fluent-plugin-record-modifier (2.1.0)
       fluentd (>= 1.0, < 2)
@@ -68,26 +59,22 @@ GEM
     fluent-plugin-rewrite-tag-filter (2.3.0)
       fluent-config-regexp-type
       fluentd (>= 0.14.2, < 2)
-    fluent-plugin-splunk-hec (1.2.2)
-      activesupport (~> 5.2)
-      fluent-plugin-kubernetes_metadata_filter (~> 2.4)
-      fluentd (>= 1.4)
-      http_parser.rb (= 0.5.3)
+    fluent-plugin-splunk-hec (1.1.2)
+      fluentd (~> 1.4)
       multi_json (~> 1.13)
-      net-http-persistent (~> 3.1)
-      openid_connect (~> 1.1.8)
-      prometheus-client (< 0.10.0)
+      net-http-persistent (~> 3.0)
     fluent-plugin-systemd (1.0.2)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.3.2)
-    fluentd (1.11.1)
+    fluentd (1.7.4)
       cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 1.3.1, < 2.0.0)
+      msgpack (>= 1.2.0, < 2.0.0)
       serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (>= 1.0, < 3.0)
+      tzinfo (~> 2.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
     http (4.4.1)
@@ -101,14 +88,7 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.5.3)
-    httpclient (2.8.3)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    json-jwt (1.13.0)
-      activesupport (>= 4.2)
-      aes_key_wrap
-      bindata
+    http_parser.rb (0.6.0)
     jsonpath (1.0.5)
       multi_json
       to_regexp (~> 0.2.1)
@@ -119,40 +99,19 @@ GEM
       rest-client (~> 2.0)
     lru_redux (1.1.0)
     ltsv (0.1.2)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
-    mini_mime (1.0.2)
-    minitest (5.14.1)
     msgpack (1.3.3)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    openid_connect (1.1.8)
-      activemodel
-      attr_required (>= 1.0.0)
-      json-jwt (>= 1.5.0)
-      rack-oauth2 (>= 1.6.1)
-      swd (>= 1.0.0)
-      tzinfo
-      validate_email
-      validate_url
-      webfinger (>= 1.0.1)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
     public_suffix (4.0.5)
     quantile (0.2.1)
-    rack (2.2.3)
-    rack-oauth2 (1.15.0)
-      activesupport
-      attr_required
-      httpclient
-      json-jwt (>= 1.11.0)
-      rack (>= 2.1.0)
     rake (13.0.1)
     recursive-open-struct (1.1.2)
     rest-client (2.1.0)
@@ -166,32 +125,18 @@ GEM
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.4)
-    swd (1.2.0)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
     syslog_protocol (0.9.2)
     systemd-journal (1.3.3)
       ffi (~> 1.9)
-    thread_safe (0.3.6)
     to_regexp (0.2.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.2)
+      concurrent-ruby (~> 1.0)
     tzinfo-data (1.2020.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
     uuidtools (2.1.5)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
-    validate_url (1.0.11)
-      activemodel (>= 3.0.0)
-      public_suffix
-    webfinger (1.1.0)
-      activesupport
-      httpclient (>= 2.4)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -213,7 +158,7 @@ DEPENDENCIES
   fluent-plugin-rewrite-tag-filter
   fluent-plugin-splunk-hec
   fluent-plugin-systemd
-  fluentd (= 1.11.1)!
+  fluentd (= 1.7.4)!
   uuidtools (= 2.1.5)
 
 BUNDLED WITH

fluentd/install-gems.sh

@@ -59,7 +59,7 @@ for dir in * ; do
 done
 
 if CONFIGURE_ARGS="--with-cflags='$( rpm --eval %optflags )' ${CONFIGURE_ARGS:-}" \
-   gem install -V --local -N *.gem ; then
+   gem install *.gem  -V --local -N --ignore-dependencies ; then
    echo INFO: all gems installed successfully
    rc=0
 else

fluentd/rh-manifest.txt

@@ -1,24 +1,17 @@
-aes_key_wrap 1.1.0 https://github.com/tomdalling/aes_key_wrap
-attr_required 1.0.1 http://github.com/nov/attr_required
-bindata 2.4.7 http://github.com/dmendel/bindata
 digest-crc 0.6.1 https://github.com/postmodern/digest-crc#readme
+dig_rb 1.0.1 https://github.com/jrochkind/dig_rb
 ffi-compiler 1.0.1 http://wiki.github.com/ffi/ffi
 fluent-config-regexp-type 1.0.0 https://github.com/okkez/fluent-config-regexp-type
-fluentd 1.11.1 https://www.fluentd.org/
+fluentd 1.7.4 https://www.fluentd.org/
 fluent-plugin-concat 2.4.0 https://github.com/fluent-plugins-nursery/fluent-plugin-concat
-fluent-plugin-kafka 0.13.0 https://github.com/fluent/fluent-plugin-kafka
+fluent-plugin-kafka 0.13.1 https://github.com/fluent/fluent-plugin-kafka
 fluent-plugin-multi-format-parser 1.0.0 https://github.com/repeatedly/fluent-plugin-multi-format-parser
-fluent-plugin-splunk-hec 1.2.2 https://github.com/splunk/fluent-plugin-splunk-hec
+fluent-plugin-splunk-hec 1.1.2 https://github.com/splunk/fluent-plugin-splunk-hec
 http-accept 1.7.0 https://github.com/ioquatix/http-accept
 http-parser 1.2.1 https://github.com/cotag/http-parser
 jemalloc 5.2.1 https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
-json-jwt 1.13.0 https://github.com/nov/json-jwt
 jsonpath 1.0.5 https://github.com/joshbuddy/jsonpath
 ltsv 0.1.2 https://github.com/condor/ltsv
-openid_connect 1.1.8 https://github.com/nov/openid_connect
-rack-oauth2 1.15.0 http://github.com/nov/rack-oauth2
-rubygem-activemodel 5.2.4.3 http://rubyonrails.org
-rubygem-activesupport 5.2.4.3 http://rubyonrails.org
 rubygem-addressable 2.7.0 https://github.com/sporkmonger/addressable
 rubygem-concurrent-ruby 1.1.6 http://www.concurrent-ruby.com
 rubygem-connection_pool 2.2.3 https://github.com/mperham/connection_pool
@@ -31,26 +24,21 @@ rubygem-excon 0.75.0 https://github.com/excon/excon
 rubygem-faraday 1.0.1 https://lostisland.github.io/faraday
 rubygem-ffi 1.11.3 https://github.com/ffi/ffi/wiki
 rubygem-fluent-mixin-config-placeholders 0.4.0 https://github.com/tagomoris/fluent-mixin-config-placeholders
-rubygem-fluent-plugin-elasticsearch 4.1.0 https://github.com/uken/fluent-plugin-elasticsearch
-rubygem-fluent-plugin-kubernetes_metadata_filter 2.5.1 https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
-rubygem-fluent-plugin-prometheus 1.8.1 https://github.com/fluent/fluent-plugin-prometheus
+rubygem-fluent-plugin-elasticsearch 4.1.1 https://github.com/uken/fluent-plugin-elasticsearch
+rubygem-fluent-plugin-kubernetes_metadata_filter 2.5.2 https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
+rubygem-fluent-plugin-prometheus 1.7.3 https://github.com/fluent/fluent-plugin-prometheus
 rubygem-fluent-plugin-record-modifier 2.1.0 https://github.com/repeatedly/fluent-plugin-record-modifier
 rubygem-fluent-plugin-remote-syslog 1.1 https://github.com/docebo/fluent-plugin-remote-syslog
 rubygem-fluent-plugin-rewrite-tag-filter 2.3.0 https://github.com/fluent/fluent-plugin-rewrite-tag-filter
 rubygem-fluent-plugin-systemd 1.0.2 https://github.com/reevoo/fluent-plugin-systemd
 rubygem-http 4.4.1 https://github.com/httprb/http
-rubygem-httpclient 2.8.3 https://github.com/nahi/httpclient
 rubygem-http-cookie 1.0.3 https://github.com/sparklemotion/http-cookie
 rubygem-http-form_data 2.3.0 https://github.com/httprb/form_data.rb
-rubygem-http_parser.rb 0.5.3 http://github.com/tmm1/http_parser.rb
-rubygem-i18n 1.8.3 https://github.com/ruby-i18n/i18n
+rubygem-http_parser.rb 0.6.0 http://github.com/tmm1/http_parser.rb
 rubygem-kubeclient 4.8.0 https://github.com/abonas/kubeclient
 rubygem-lru_redux 1.1.0 https://github.com/SamSaffron/lru_redux
-rubygem-mail 2.7.1 https://github.com/mikel/mail
 rubygem-mime-types 3.3.1 https://github.com/mime-types/ruby-mime-types/
 rubygem-mime-types-data 3.2020.0512 https://github.com/mime-types/mime-types-data/
-rubygem-mini_mime 1.0.2 https://github.com/discourse/mini_mime
-rubygem-minitest 5.14.1 https://github.com/seattlerb/minitest
 rubygem-msgpack 1.3.3 http://msgpack.org/
 rubygem-multi_json 1.15.0 https://github.com/intridea/multi_json
 rubygem-multipart-post 2.1.1 https://github.com/nicksieger/multipart-post
@@ -59,15 +47,13 @@ rubygem-netrc 0.11.0 https://github.com/geemus/netrc
 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
-rubygem-rack 2.2.3 https://github.com/rack/rack
 rubygem-rake 13.0.1 https://github.com/ruby/rake
 rubygem-recursive-open-struct 1.1.2 https://github.com/aetherknight/recursive-open-struct
 rubygem-rest-client 2.1.0 https://github.com/rest-client/rest-client
 rubygem-sigdump 0.2.4 https://github.com/frsyuki/sigdump
 rubygem-syslog_protocol 0.9.2 https://github.com/eric/syslog_protocol
 rubygem-systemd-journal 1.3.3 https://github.com/ledbettj/systemd-journal
-rubygem-thread_safe 0.3.6 https://github.com/ruby-concurrency/thread_safe
-rubygem-tzinfo 1.2.7 https://tzinfo.github.io
+rubygem-tzinfo 2.0.2 https://tzinfo.github.io
 rubygem-tzinfo-data 1.2020.1 https://tzinfo.github.io
 rubygem-unf 0.1.4 https://github.com/knu/ruby-unf
 rubygem-unf_ext 0.0.7.7 https://github.com/knu/ruby-unf_ext
@@ -76,8 +62,4 @@ rubygem-yajl-ruby 1.4.1 http://github.com/brianmario/yajl-ruby
 ruby-kafka 1.1.0 https://github.com/zendesk/ruby-kafka
 serverengine 2.2.1 https://github.com/fluent/serverengine
 strptime 0.2.4 https://github.com/nurse/strptime
-swd 1.2.0 https://github.com/nov/swd
 to_regexp 0.2.1 https://github.com/seamusabshere/to_regexp
-validate_email 0.1.6 http://github.com/perfectline/validates_email/tree/master
-validate_url 1.0.11 http://github.com/perfectline/validates_url/tree/master
-webfinger 1.1.0 https://github.com/nov/webfinger

fluentd/vendored_gem_src/dig_rb/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.2.4
+  - 2.1.8
+  - 2.0.0-p648
+  - jruby-9.0.4.0
+  - jruby-1.7.23

fluentd/vendored_gem_src/dig_rb/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in dig_rb.gemspec
+gemspec

fluentd/vendored_gem_src/dig_rb/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Jonathan Rochkind
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

fluentd/vendored_gem_src/dig_rb/README.md

@@ -0,0 +1,61 @@
+# Dig_rb
+
+[![Gem Version](https://badge.fury.io/rb/dig_rb.svg)](https://badge.fury.io/rb/dig_rb) [![Build Status](https://travis-ci.org/jrochkind/dig_rb.svg?branch=master)](https://travis-ci.org/jrochkind/dig_rb)
+
+[Ruby 2.3.0 introduced #dig on Hash, Array, and Struct](https://www.ruby-lang.org/en/news/2015/12/25/ruby-2-3-0-released/). With this gem, you can have dig on ruby pre 2.3.0, or any ruby lacking dig.
+
+If you are writing an app and want to use dig in it you should probably just upgrade to ruby 2.3.0. But if you are writing a gem and want it to work with both MRI 2.3.0 and others (including JRuby 9.0.x), this gem is for you. This gem only adds #dig methods if they aren't already defined, so it's safe to use in code that is for all rubies, if run on MRI 2.3.0 you'll still be using native #dig, otherwise dig_rb's implementation.
+
+### Will it work identically to MRI 2.3.0 dig?
+
+Dig_rb is tested with:
+
+* Specs found in MRI repo for #dig in 2.3.0
+* [Ruby Spec Suite](https://github.com/ruby/spec/) specs found in repo for Array and Hash#dig
+* All examples in MRI 2.3.0 generated method API docs. (One example in MRI 2.3.0 is _wrong_ about exception class and message returned, dig_rb matches actual 2.3.0 behavior there, not documented example)
+
+[Our travis](https://travis-ci.org/jrochkind/dig_rb) runs tests on a variety of ruby platforms. 
+
+If you find any weird edge cases that work differenty in MRI 2.3.0 than in ruby_dig, let me know in a GitHub Issue please.
+
+The performance of dig_rb will probably be less than native MRI 2.3.0 implementation, this code is not written for performance. But it should
+be fine, really.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'dig_rb'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install dig_rb
+
+## Usage
+
+Just go ahead and use #dig as doc'd in MRI 2.3.0, now it'll work on any ruby.
+
+* [Hash](http://ruby-doc.org/core-2.3.0/Hash.html#method-i-dig)
+* [Array](http://ruby-doc.org/core-2.3.0/Array.html#method-i-dig)
+* [Struct](http://ruby-doc.org/core-2.3.0/Struct.html#method-i-dig)
+* [OpenStruct](http://ruby-doc.org/stdlib-2.3.0/libdoc/ostruct/rdoc/OpenStruct.html#method-i-dig)
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+1. Fork it ( https://github.com/jrochkind/dig_rb/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

fluentd/vendored_gem_src/dig_rb/Rakefile

@@ -0,0 +1,10 @@
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/test*.rb'] + FileList['test/**/*_spec.rb']
+  t.verbose = true
+end
+
+task :default => [:test]