fluentd 1.15.2-x64-mingw32 → 1.16.0-x64-mingw32

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.16.0
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -190,22 +190,16 @@ dependencies:
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: win32-service
   requirement: !ruby/object:Gem::Requirement
@@ -441,19 +435,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".deepsource.toml"
-- ".drone.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.yaml"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/feature_request.yaml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/issue-auto-closer.yml"
 - ".github/workflows/linux-test.yaml"
 - ".github/workflows/macos-test.yaml"
-- ".github/workflows/stale-actions.yml"
 - ".github/workflows/windows-test.yaml"
 - ".gitignore"
-- ".gitlab-ci.yml"
 - ADOPTERS.md
 - AUTHORS
 - CHANGELOG.md
@@ -585,6 +575,7 @@ files:
 - lib/fluent/event.rb
 - lib/fluent/event_router.rb
 - lib/fluent/ext_monitor_require.rb
+- lib/fluent/file_wrapper.rb
 - lib/fluent/filter.rb
 - lib/fluent/fluent_log_event_router.rb
 - lib/fluent/formatter.rb
@@ -592,6 +583,7 @@ files:
 - lib/fluent/label.rb
 - lib/fluent/load.rb
 - lib/fluent/log.rb
+- lib/fluent/log/console_adapter.rb
 - lib/fluent/match.rb
 - lib/fluent/mixin.rb
 - lib/fluent/msgpack_factory.rb
@@ -613,7 +605,6 @@ files:
 - lib/fluent/plugin/compressable.rb
 - lib/fluent/plugin/exec_util.rb
 - lib/fluent/plugin/file_util.rb
-- lib/fluent/plugin/file_wrapper.rb
 - lib/fluent/plugin/filter.rb
 - lib/fluent/plugin/filter_grep.rb
 - lib/fluent/plugin/filter_parser.rb
@@ -814,6 +805,7 @@ files:
 - test/helper.rb
 - test/helpers/fuzzy_assert.rb
 - test/helpers/process_extenstion.rb
+- test/log/test_console_adapter.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
 - test/plugin/data/2010/01/20100102.log
@@ -846,7 +838,6 @@ files:
 - test/plugin/test_buffer_memory_chunk.rb
 - test/plugin/test_compressable.rb
 - test/plugin/test_file_util.rb
-- test/plugin/test_file_wrapper.rb
 - test/plugin/test_filter.rb
 - test/plugin/test_filter_grep.rb
 - test/plugin/test_filter_parser.rb
@@ -978,12 +969,12 @@ files:
 - test/test_event.rb
 - test/test_event_router.rb
 - test/test_event_time.rb
+- test/test_file_wrapper.rb
 - test/test_filter.rb
 - test/test_fluent_log_event_router.rb
 - test/test_formatter.rb
 - test/test_input.rb
 - test/test_log.rb
-- test/test_logger_initializer.rb
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_msgpack_factory.rb
@@ -1022,7 +1013,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector
@@ -1057,6 +1048,7 @@ test_files:
 - test/helper.rb
 - test/helpers/fuzzy_assert.rb
 - test/helpers/process_extenstion.rb
+- test/log/test_console_adapter.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
 - test/plugin/data/2010/01/20100102.log
@@ -1089,7 +1081,6 @@ test_files:
 - test/plugin/test_buffer_memory_chunk.rb
 - test/plugin/test_compressable.rb
 - test/plugin/test_file_util.rb
-- test/plugin/test_file_wrapper.rb
 - test/plugin/test_filter.rb
 - test/plugin/test_filter_grep.rb
 - test/plugin/test_filter_parser.rb
@@ -1221,12 +1212,12 @@ test_files:
 - test/test_event.rb
 - test/test_event_router.rb
 - test/test_event_time.rb
+- test/test_file_wrapper.rb
 - test/test_filter.rb
 - test/test_fluent_log_event_router.rb
 - test/test_formatter.rb
 - test/test_input.rb
 - test/test_log.rb
-- test/test_logger_initializer.rb
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_msgpack_factory.rb

data/.drone.yml

@@ -1,35 +0,0 @@
-kind: pipeline
-name: fluentd-test-arm64-3-0
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: fluentd-test-arm64-3-0
-  image: arm64v8/ruby:3.0
-  commands:
-  - apt update
-  - apt -y install libgmp3-dev
-  - export BUNDLE_GEMFILE=$PWD/Gemfile
-  - gem update --system
-  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-  - bundle exec rake test
----
-kind: pipeline
-name: fluentd-test-arm64-2-7
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: fluentd-test-arm64-2-7
-  image: arm64v8/ruby:2.7
-  commands:
-  - apt update
-  - apt -y install libgmp3-dev
-  - export BUNDLE_GEMFILE=$PWD/Gemfile
-  - gem update --system
-  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-  - bundle exec rake test

data/.github/workflows/issue-auto-closer.yml

@@ -1,12 +0,0 @@
-name: Autocloser
-on: [issues]
-jobs:
-  autoclose:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Autoclose issues that did not follow issue template
-      uses: roots/issue-closer-action@v1.1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-close-message: "@${issue.user.login} this issue was automatically closed because it did not follow the issue template"
-        issue-pattern: "(.*Describe the bug.*)|(.*Is your feature request related to a problem.*)"

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

@@ -1,22 +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@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 90
-        days-before-close: 30
-        stale-issue-message: "This issue has been automatically marked as stale because it has been open 90 days with no activity. Remove stale label or comment or this issue will be closed in 30 days"
-        stale-pr-message: "This PR has been automatically marked as stale because it has been open 90 days with no activity. Remove stale label or comment or this PR will be closed in 30 days"
-        close-issue-message: "This issue was automatically closed because of stale in 30 days"
-        close-pr-message: "This PR was automatically closed because of stale in 30 days"
-        stale-pr-label: "stale"
-        stale-issue-label: "stale"
-        exempt-issue-labels: "bug,enhancement,feature request,pending,work_in_progress,v1,v2"
-        exempt-pr-labels: "bug,enhancement,feature request,pending,work_in_progress,v1,v2"

data/.gitlab-ci.yml

@@ -1,103 +0,0 @@
-.install-template:
-  before_script:
-    - gem update --system
-    - ruby -v
-
-.test-template:
-  before_script:
-    - gem install rake
-    - bundle install
-    - chmod 777 -R ./test
-
-stages:
-  - build
-  - tests
-
-2-6-6:
-  image: "ruby:2.6.6"
-  stage: build
-  extends: .install-template
-  script:
-    - bundle install --jobs=3 --retry=3
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 2-6-6"
-    paths:
-
-2-7-2:
-  image: "ruby:2.7.2"
-  stage: build
-  extends: .install-template
-  script:
-    - bundle install --jobs=3 --retry=3
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 2-7-2"
-    paths:
-
-3-0-0:
-  image: "ruby:3.0.0"
-  stage: build
-  extends: .install-template
-  script:
-    - bundle install --jobs=3 --retry=3
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 3-0-0"
-    paths:
-
-rubyhead:
-  image: "ruby:latest"
-  stage: build
-  extends: .install-template
-  script:
-    - bundle install --jobs=3 --retry=3
-  cache:
-    key: "$CI_COMMIT_REF_SLUG latest"
-    paths:
-      - ./*
-
-2-6-6-test:
-  image: "ruby:2.6.6"
-  stage: tests
-  allow_failure: true
-  extends: .test-template
-  script:
-    - bundle exec rake test
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 2-6-6"
-    paths:
-      - ./*
-
-2-7-2-test:
-  image: "ruby:2.7.2"
-  stage: tests
-  allow_failure: true
-  extends: .test-template
-  script:
-    - bundle exec rake test
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 2-7-2"
-    paths:
-      - ./*
-
-3-0-0-test:
-  image: "ruby:3.0.0"
-  stage: tests
-  allow_failure: true
-  extends: .test-template
-  script:
-    - bundle exec rake test
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 3-0-0"
-    paths:
-      - ./*
-
-rubyhead-test:
-  image: "ruby:latest"
-  stage: tests
-  allow_failure: true
-  extends: .test-template
-  script:
-    - bundle exec rake test
-  cache:
-    key: "$CI_COMMIT_REF_SLUG latest"
-    paths:
-      - ./*

data/lib/fluent/plugin/file_wrapper.rb

@@ -1,131 +0,0 @@
-#
-# Fluentd
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-require 'fluent/win32api'
-
-module Fluent
-  module FileWrapper
-    def self.open(path, mode='r')
-      io = WindowsFile.new(path, mode).io
-      if block_given?
-        v = yield io
-        io.close
-        v
-      else
-        io
-      end
-    end
-
-    def self.stat(path)
-      f = WindowsFile.new(path)
-      s = f.stat
-      f.close
-      s
-    end
-  end
-
-  class WindowsFile
-    include File::Constants
-
-    attr_reader :io
-
-    INVALID_HANDLE_VALUE = -1
-
-    def initialize(path, mode='r')
-      @path = path
-      @io = File.open(path, mode2flags(mode))
-      @file_handle = Win32API._get_osfhandle(@io.to_i)
-      @io.instance_variable_set(:@file_index, self.ino)
-      def @io.ino
-        @file_index
-      end
-    end
-
-    def close
-      @io.close
-      @file_handle = INVALID_HANDLE_VALUE
-    end
-
-    # To keep backward compatibility, we continue to use GetFileInformationByHandle()
-    # to get file id.
-    # Note that Ruby's File.stat uses GetFileInformationByHandleEx() with FileIdInfo
-    # and returned value is different with above one, former one is 64 bit while
-    # later one is 128bit.
-    def ino
-      by_handle_file_information = '\0'*(4+8+8+8+4+4+4+4+4+4)   #72bytes
-
-      unless Win32API.GetFileInformationByHandle(@file_handle, by_handle_file_information)
-        return 0
-      end
-
-      by_handle_file_information.unpack("I11Q1")[11] # fileindex
-    end
-
-    def stat
-      raise Errno::ENOENT if delete_pending
-      s = File.stat(@path)
-      s.instance_variable_set :@ino, self.ino
-      def s.ino; @ino; end
-      s
-    end
-
-    private
-
-    def mode2flags(mode)
-      # Always inject File::Constants::SHARE_DELETE
-      # https://github.com/fluent/fluentd/pull/3585#issuecomment-1101502617
-      # To enable SHARE_DELETE, BINARY is also required.
-      # https://bugs.ruby-lang.org/issues/11218
-      # https://github.com/ruby/ruby/blob/d6684f063bc53e3cab025bd39526eca3b480b5e7/win32/win32.c#L6332-L6345
-      flags = BINARY | SHARE_DELETE
-      case mode.delete("b")
-      when "r"
-        flags |= RDONLY
-      when "r+"
-        flags |= RDWR
-      when "w"
-        flags |= WRONLY | CREAT | TRUNC
-      when "w+"
-        flags |= RDWR | CREAT | TRUNC
-      when "a"
-        flags |= WRONLY | CREAT | APPEND
-      when "a+"
-        flags |= RDWR | CREAT | APPEND
-      else
-        raise Errno::EINVAL.new("Unsupported mode by Fluent::FileWrapper: #{mode}")
-      end
-    end
-
-    # DeletePending is a Windows-specific file state that roughly means
-    # "this file is queued for deletion, so close any open handlers"
-    #
-    # This flag can be retrieved via GetFileInformationByHandleEx().
-    #
-    # https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-getfileinformationbyhandleex
-    #
-    def delete_pending
-      file_standard_info = 0x01
-      bufsize = 1024
-      buf = '\0' * bufsize
-
-      unless Win32API.GetFileInformationByHandleEx(@file_handle, file_standard_info, buf, bufsize)
-        return false
-      end
-
-      return buf.unpack("QQICC")[3] != 0
-    end
-  end
-end if Fluent.windows?

data/test/test_logger_initializer.rb

@@ -1,46 +0,0 @@
-require_relative 'helper'
-require 'fluent/supervisor'
-require 'fileutils'
-
-class LoggerInitializerTest < ::Test::Unit::TestCase
-  TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp/logger_initializer#{ENV['TEST_ENV_NUMBER']}")
-
-  teardown do
-    begin
-      FileUtils.rm_rf(TMP_DIR)
-    rescue => _
-    end
-  end
-
-  test 'when path is given' do
-    path = File.join(TMP_DIR, 'fluent_with_path.log')
-
-    assert_false File.exist?(TMP_DIR)
-    logger = Fluent::Supervisor::LoggerInitializer.new(path, Fluent::Log::LEVEL_DEBUG, nil, nil, {})
-    mock.proxy(File).chmod(0o777, TMP_DIR).never
-
-    assert_nothing_raised do
-      logger.init(:supervisor, 0)
-    end
-
-    assert_true File.exist?(TMP_DIR)
-  end
-
-  test 'apply_options with log_dir_perm' do
-    omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
-
-    path = File.join(TMP_DIR, 'fluent_with_path.log')
-
-    assert_false File.exist?(TMP_DIR)
-    logger = Fluent::Supervisor::LoggerInitializer.new(path, Fluent::Log::LEVEL_DEBUG, nil, nil, {})
-    mock.proxy(File).chmod(0o777, TMP_DIR).once
-
-    assert_nothing_raised do
-      logger.init(:supervisor, 0)
-    end
-
-    logger.apply_options(log_dir_perm: 0o777)
-    assert_true File.exist?(TMP_DIR)
-    assert_equal 0o777, (File.stat(TMP_DIR).mode & 0xFFF)
-  end
-end