fluentd 1.16.5 → 1.17.1

data/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,71 +0,0 @@
-name: Bug Report
-description: Create a report with a procedure for reproducing the bug
-labels: "waiting-for-triage"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Check [CONTRIBUTING guideline](https://github.com/fluent/fluentd/blob/master/CONTRIBUTING.md) first and here is the list to help us investigate the problem.
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: To Reproduce
-      description: Steps to reproduce the behavior
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Your Environment
-      description: |
-        - Fluentd or td-agent version: `fluentd --version` or `td-agent --version`
-        - Operating system: `cat /etc/os-release`
-        - Kernel version: `uname -r`
-
-        Tip: If you hit the problem with older fluentd version, try latest version first.
-      value: |
-        - Fluentd version:
-        - TD Agent version:
-        - Operating system:
-        - Kernel version:
-      render: markdown
-    validations:
-      required: true
-  - type: textarea
-    id: configuration
-    attributes:
-      label: Your Configuration
-      description: |
-        Write your configuration here. Minimum reproducible fluentd.conf is recommended.
-      render: apache
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Your Error Log
-      description: Write your ALL error log here
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    id: addtional-context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false

data/.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Ask a Question
-    url: https://github.com/fluent/fluentd/discussions
-    about: I have questions about Fluentd and plugins. Please ask and answer questions at https://github.com/fluent/fluentd/discussions

data/.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,39 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project
-labels: "waiting-for-triage"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Check [CONTRIBUTING guideline](https://github.com/fluent/fluentd/blob/master/CONTRIBUTING.md) first and here is the list to help us investigate the problem.
-  - type: textarea
-    id: description
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: |
-        A clear and concise description of what the problem is.
-        Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: true
-  - type: textarea
-    id: addtional-context
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false
-

data/.github/ISSUE_TEMPLATE.md

@@ -1,17 +0,0 @@
-Check [CONTRIBUTING guideline](https://github.com/fluent/fluentd/blob/master/CONTRIBUTING.md) first and here is the list to help us investigate the problem.
-
-**Got a question or problem?**
-
-RESOURCES of [Official site](https://www.fluentd.org/) and [Fluentd documentation](https://docs.fluentd.org/) may help you.
-
-If you have further questions about Fluentd and plugins, please direct these to [Mailing List](https://groups.google.com/forum/#!forum/fluentd).
-Don't use Github issue for asking questions. Here are examples:
-
-- I installed xxx plugin but it doesn't work. Why?
-- Fluentd starts but logs are not sent to xxx. Am I wrong?
-- I want to do xxx. How to realize it with plugins?
-
-We may close such questions to keep clear repository for developers and users.
-Github issue is mainly for submitting a bug report or feature request. See below.
-
-If you can't judge your case is a bug or not, use mailing list or slack first.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +0,0 @@
-<!--
-Thank you for contributing to Fluentd!
-Your commits need to follow DCO: https://probot.github.io/apps/dco/
-And please provide the following information to help us make the most of your pull request:
--->
-
-**Which issue(s) this PR fixes**: 
-Fixes #
-
-**What this PR does / why we need it**: 
-
-**Docs Changes**:
-
-**Release Note**: 

data/.github/workflows/stale-actions.yml

@@ -1,24 +0,0 @@
-name: "Mark or close stale issues and PRs"
-on:
-  schedule:
-  - cron: "00 10 * * *"
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@v8
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 30
-        days-before-close: 7
-        stale-issue-message: "This issue has been automatically marked as stale because it has been open 30 days with no activity. Remove stale label or comment or this issue will be closed in 7 days"
-        stale-pr-message: "This PR has been automatically marked as stale because it has been open 30 days with no activity. Remove stale label or comment or this PR will be closed in 7 days"
-        close-issue-message: "This issue was automatically closed because of stale in 7 days"
-        close-pr-message: "This PR was automatically closed because of stale in 7 days"
-        stale-pr-label: "stale"
-        stale-issue-label: "stale"
-        exempt-issue-labels: "waiting-for-triage,bug,enhancement,feature request,pending,work_in_progress,v1,v2"
-        exempt-pr-labels: "waiting-for-triage,bug,enhancement,feature request,pending,work_in_progress,v1,v2"
-        exempt-all-assignees: true
-        exempt-all-milestones: true

data/.github/workflows/test.yml

@@ -1,32 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches: [v1.16]
-  pull_request:
-    branches: [v1.16]
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    continue-on-error: false
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
-
-    name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-      - name: Install addons
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt-get install libgmp3-dev libcap-ng-dev
-      - name: Install dependencies
-        run: bundle install
-      - name: Run tests
-        run: bundle exec rake test TESTOPTS=-v

data/.gitignore

@@ -1,30 +0,0 @@
-Gemfile.lock
-INSTALL
-NEWS
-Makefile
-Makefile.in
-README
-ac
-aclocal.m4
-autom4te.cache
-confdefs.h
-config.log
-config.status
-configure
-deps/
-fluent-cat
-fluent-gem
-fluentd
-pkg/*
-test/tmp/*
-test/config/tmp/*
-make_dist.sh
-Gemfile.local
-.ruby-version
-*.swp
-coverage/*
-.vagrant/
-cov-int/
-cov-fluentd.tar.gz
-.vscode
-.idea/

data/Gemfile

@@ -1,9 +0,0 @@
-source 'https://rubygems.org/'
-
-gemspec
-
-local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
-if File.exist?(local_gemfile)
-  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(local_gemfile)
-end

data/fluentd.gemspec

@@ -1,54 +0,0 @@
-require File.expand_path('../lib/fluent/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.name          = "fluentd"
-  gem.version       = Fluent::VERSION # see lib/fluent/version.rb
-
-  gem.authors       = ["Sadayuki Furuhashi"]
-  gem.email         = ["frsyuki@gmail.com"]
-  gem.description   = %q{Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time.}
-  gem.summary       = %q{Fluentd event collector}
-  gem.homepage      = "https://www.fluentd.org/"
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.license = "Apache-2.0"
-
-  gem.required_ruby_version = '>= 2.4'
-
-  gem.add_runtime_dependency("bundler")
-  gem.add_runtime_dependency("msgpack", [">= 1.3.1", "< 2.0.0"])
-  gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
-  gem.add_runtime_dependency("cool.io", [">= 1.4.5", "< 2.0.0"])
-  gem.add_runtime_dependency("serverengine", [">= 2.3.2", "< 3.0.0"])
-  gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.9.0"])
-  gem.add_runtime_dependency("sigdump", ["~> 0.2.5"])
-  gem.add_runtime_dependency("tzinfo", [">= 1.0", "< 3.0"])
-  gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"])
-  gem.add_runtime_dependency("strptime", [">= 0.2.4", "< 1.0.0"])
-  gem.add_runtime_dependency("webrick", ["~> 1.4"])
-
-  # build gem for a certain platform. see also Rakefile
-  fake_platform = ENV['GEM_BUILD_FAKE_PLATFORM'].to_s
-  gem.platform = fake_platform unless fake_platform.empty?
-  if /mswin|mingw/ =~ fake_platform || (/mswin|mingw/ =~ RUBY_PLATFORM && fake_platform.empty?)
-    gem.add_runtime_dependency("win32-service", ["~> 2.3.0"])
-    gem.add_runtime_dependency("win32-ipc", ["~> 0.7.0"])
-    gem.add_runtime_dependency("win32-event", ["~> 0.6.3"])
-    gem.add_runtime_dependency("certstore_c", ["~> 0.1.7"])
-  end
-
-  gem.add_development_dependency("rake", ["~> 13.0"])
-  gem.add_development_dependency("flexmock", ["~> 2.0"])
-  gem.add_development_dependency("parallel_tests", ["~> 0.15.3"])
-  gem.add_development_dependency("simplecov", ["~> 0.7"])
-  gem.add_development_dependency("rr", ["~> 3.0"])
-  gem.add_development_dependency("timecop", ["~> 0.9"])
-  gem.add_development_dependency("test-unit", ["~> 3.3"])
-  gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
-  gem.add_development_dependency("oj", [">= 2.14", "< 4"])
-  gem.add_development_dependency("async", "~> 1.23")
-  gem.add_development_dependency("async-http", ">= 0.50.0")
-end

data/test/command/test_binlog_reader.rb

@@ -1,362 +0,0 @@
-require_relative '../helper'
-
-require 'yajl'
-require 'flexmock/test_unit'
-
-require 'fluent/command/binlog_reader'
-require 'fluent/event'
-
-class TestFluentBinlogReader < ::Test::Unit::TestCase
-  module ::BinlogReaderCommand
-    class Dummy < Base
-      def call; end
-    end
-  end
-
-  def suppress_stdout
-    out = StringIO.new
-    $stdout = out
-    yield
-  ensure
-    $stdout = STDOUT
-  end
-
-  sub_test_case 'call' do
-    data(
-      empty: [],
-      invalid: %w(invalid packed.log),
-    )
-    test 'should fail when invalid command' do |argv|
-      fu = FluentBinlogReader.new(argv)
-
-      assert_raise(SystemExit) do
-        suppress_stdout { fu.call }
-      end
-    end
-
-    data(
-      cat: %w(cat packed.log),
-      head: %w(head packed.log),
-      formats: %w(formats packed.log)
-    )
-    test 'should succeed when valid command' do |argv|
-      fu = FluentBinlogReader.new(argv)
-
-      flexstub(::BinlogReaderCommand) do |command|
-        command.should_receive(:const_get).once.and_return(::BinlogReaderCommand::Dummy)
-        assert_nothing_raised do
-          fu.call
-        end
-      end
-    end
-  end
-end
-
-class TestBaseCommand < ::Test::Unit::TestCase
-  TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/../tmp/command/binlog_reader#{ENV['TEST_ENV_NUMBER']}")
-
-  def create_message_packed_file(path, times = [event_time], records = [{ 'message' => 'dummy' }])
-    es = Fluent::MultiEventStream.new(times, records)
-    v = es.to_msgpack_stream
-    out_path = "#{TMP_DIR}/#{path}"
-    File.open(out_path, 'wb') do |f|
-      f.print(v)
-    end
-    waiting(5) do
-      sleep 0.5 until File.size(out_path) == v.bytesize
-    end
-  end
-
-  def setup
-    FileUtils.rm_rf(TMP_DIR)
-    FileUtils.mkdir_p(TMP_DIR)
-  end
-
-  def timezone(timezone = 'UTC')
-    old = ENV['TZ']
-    ENV['TZ'] = timezone
-    yield
-  ensure
-    ENV['TZ'] = old
-  end
-end
-
-class TestHead < TestBaseCommand
-  setup do
-    @default_newline = if Fluent.windows?
-                         "\r\n"
-                       else
-                         "\n"
-                       end
-  end
-
-  sub_test_case 'initialize' do
-    data(
-      'file is not passed' => %w(),
-      'file is not found' => %w(invalid_path.log)
-    )
-    test 'should fail if file is invalid' do |argv|
-      assert_raise(SystemExit) do
-        capture_stdout { BinlogReaderCommand::Head.new(argv) }
-      end
-    end
-
-    test 'should succeed if a file is valid' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}"]
-      create_message_packed_file(file_name)
-
-      assert_nothing_raised do
-        BinlogReaderCommand::Head.new(argv)
-      end
-    end
-
-    test 'should fail when config_params format is invalid' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'only_key']
-      create_message_packed_file(file_name)
-
-      assert_raise(SystemExit) do
-        capture_stdout { BinlogReaderCommand::Head.new(argv) }
-      end
-    end
-
-    test 'should succeed if config_params format is valid' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'fields=message']
-      create_message_packed_file(file_name)
-
-      assert_nothing_raised do
-        capture_stdout { BinlogReaderCommand::Head.new(argv) }
-      end
-    end
-  end
-
-  sub_test_case 'call' do
-    setup do
-      @file_name = 'packed.log'
-      @t = '2011-01-02 13:14:15 UTC'
-      @record = { 'message' => 'dummy' }
-    end
-
-    test 'should output the beginning of the file with default format (out_file)' do
-      argv = ["#{TMP_DIR}/#{@file_name}"]
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
-        head = BinlogReaderCommand::Head.new(argv)
-        out = capture_stdout { head.call }
-        assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Yajl.dump(@record)}#{@default_newline}" * 5, out
-      end
-    end
-
-    test 'should set the number of lines to display' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '-n', '1']
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
-        head = BinlogReaderCommand::Head.new(argv)
-        out = capture_stdout { head.call }
-        assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Yajl.dump(@record)}#{@default_newline}", out
-      end
-    end
-
-    test 'should fail when the number of lines is invalid' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '-n', '0']
-
-      create_message_packed_file(@file_name)
-      assert_raise(SystemExit) do
-        capture_stdout { BinlogReaderCommand::Head.new(argv) }
-      end
-    end
-
-    test 'should output content of a file with json format' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '--format=json']
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
-        head = BinlogReaderCommand::Head.new(argv)
-        out = capture_stdout { head.call }
-        assert_equal "#{Yajl.dump(@record)}#{@default_newline}", out
-      end
-    end
-
-    test 'should fail with an invalid format' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '--format=invalid']
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
-        head = BinlogReaderCommand::Head.new(argv)
-
-        assert_raise(SystemExit) do
-          capture_stdout { head.call }
-        end
-      end
-    end
-
-    test 'should succeed if multiple config_params format' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'fields=message,fo', '-e', 'delimiter=|']
-      create_message_packed_file(file_name, [event_time], [{ 'message' => 'dummy', 'fo' => 'dummy2' }])
-
-      head = BinlogReaderCommand::Head.new(argv)
-      assert_equal "\"dummy\"|\"dummy2\"\n", capture_stdout { head.call }
-    end
-  end
-end
-
-class TestCat < TestBaseCommand
-  setup do
-    @default_newline = if Fluent.windows?
-                         "\r\n"
-                       else
-                         "\n"
-                       end
-  end
-
-  sub_test_case 'initialize' do
-    data(
-      'file is not passed' => [],
-      'file is not found' => %w(invalid_path.log)
-    )
-    test 'should fail if a file is invalid' do |argv|
-      assert_raise(SystemExit) do
-        capture_stdout { BinlogReaderCommand::Head.new(argv) }
-      end
-    end
-
-    test 'should succeed if a file is valid' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}"]
-      create_message_packed_file(file_name)
-
-      assert_nothing_raised do
-        BinlogReaderCommand::Cat.new(argv)
-      end
-    end
-
-    test 'should fail when config_params format is invalid' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}", '--format=json', '-e', 'only_key']
-      create_message_packed_file(file_name)
-
-      assert_raise(SystemExit) do
-        capture_stdout { BinlogReaderCommand::Cat.new(argv) }
-      end
-    end
-
-    test 'should succeed when config_params format is valid' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'fields=message']
-      create_message_packed_file(file_name)
-
-      assert_nothing_raised do
-        capture_stdout { BinlogReaderCommand::Cat.new(argv) }
-      end
-    end
-  end
-
-  sub_test_case 'call' do
-    setup do
-      @file_name = 'packed.log'
-      @t = '2011-01-02 13:14:15 UTC'
-      @record = { 'message' => 'dummy' }
-    end
-
-    test 'should output the file with default format(out_file)' do
-      argv = ["#{TMP_DIR}/#{@file_name}"]
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
-        head = BinlogReaderCommand::Cat.new(argv)
-        out = capture_stdout { head.call }
-        assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Yajl.dump(@record)}#{@default_newline}" * 6, out
-      end
-    end
-
-    test 'should set the number of lines to display' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '-n', '1']
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
-        head = BinlogReaderCommand::Cat.new(argv)
-        out = capture_stdout { head.call }
-        assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Yajl.dump(@record)}#{@default_newline}", out
-      end
-    end
-
-    test 'should output content of a file with json format' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '--format=json']
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
-        head = BinlogReaderCommand::Cat.new(argv)
-        out = capture_stdout { head.call }
-        assert_equal "#{Yajl.dump(@record)}#{@default_newline}", out
-      end
-    end
-
-    test 'should fail with an invalid format' do
-      argv = ["#{TMP_DIR}/#{@file_name}", '--format=invalid']
-
-      timezone do
-        create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
-        head = BinlogReaderCommand::Cat.new(argv)
-
-        assert_raise(SystemExit) do
-          capture_stdout { head.call }
-        end
-      end
-    end
-
-    test 'should succeed if multiple config_params format' do
-      file_name = 'packed.log'
-      argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'fields=message,fo', '-e', 'delimiter=|']
-      create_message_packed_file(file_name, [event_time], [{ 'message' => 'dummy', 'fo' => 'dummy2' }])
-
-      head = BinlogReaderCommand::Cat.new(argv)
-      assert_equal "\"dummy\"|\"dummy2\"\n", capture_stdout { head.call }
-    end
-  end
-end
-
-class TestFormats < TestBaseCommand
-  test 'parse_option!' do
-    assert_raise(SystemExit) do
-      capture_stdout do
-        BinlogReaderCommand::Formats.new(['--plugin=invalid_dir_path'])
-      end
-    end
-  end
-
-  sub_test_case 'call' do
-    test 'display available plugins' do
-      f = BinlogReaderCommand::Formats.new
-      out = capture_stdout { f.call }
-      assert out.include?('json')
-      assert out.include?('csv')
-    end
-
-    test 'add new plugins using --plugin option' do
-      dir_path = File.expand_path(File.dirname(__FILE__) + '/../scripts/fluent/plugin/formatter1')
-
-      f = BinlogReaderCommand::Formats.new(["--plugin=#{dir_path}"])
-      out = capture_stdout { f.call }
-      assert out.include?('json')
-      assert out.include?('csv')
-      assert out.include?('test1')
-    end
-
-    test 'add multiple plugins using --plugin option' do
-      dir_path1 = File.expand_path(File.dirname(__FILE__) + '/../scripts/fluent/plugin/formatter1')
-      dir_path2 = File.expand_path(File.dirname(__FILE__) + '/../scripts/fluent/plugin/formatter2')
-
-      f = BinlogReaderCommand::Formats.new(["--plugin=#{dir_path1}", '-p', dir_path2])
-      out = capture_stdout { f.call }
-      assert out.include?('json')
-      assert out.include?('csv')
-      assert out.include?('test1')
-      assert out.include?('test2')
-    end
-  end
-end