Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fluent/fluentd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.16.5
Choose a base ref
...
head repository: fluent/fluentd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.16.6
Choose a head ref
  • 16 commits
  • 14 files changed
  • 5 contributors

Commits on Mar 27, 2024

  1. ci: do not show test detail immediately (#4454)

    TESTOPTS=-v shows running test and the result.
    If something weird happen, it show error immediately.
    
    As rake task executes many tests, so it may be better to
    delay showing test details later.
    
    NOTE: --progress-style=fault-only helps you to focus on
    failure, but it is inconvenient when test case has stalled.
    
    Signed-off-by: Kentaro Hayashi <[email protected]>
    Co-authored-by: Kentaro Hayashi <[email protected]>
    daipom and kenhys authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    44d132c View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. v1.16: keep console v1.23 (#4510)

    console gem v1.24 and v1.25 has some specification changes that
    influence Fluentd.
    
    Since they have nothing to do with vulnerability, we should keep
    the version on v1.16 stable branch.
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom authored May 29, 2024
    Configuration menu
    Copy the full SHA
    aeed909 View commit details
    Browse the repository at this point in the history
  2. out_file: add warn message for symlink_path setting (#4512)

    Backported from 74b2e3d. (#4502) 
    
    Signed-off-by: Shingo Nakayama <[email protected]>
    Signed-off-by: Daijiro Fukuda <[email protected]>
    Co-authored-by: Shingo Nakayama <[email protected]>
    daipom and Shingo-Nakayama authored May 29, 2024
    Configuration menu
    Copy the full SHA
    056f2e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. test: fix timecop version to keep clock specs in tests (#4524)

    Backported from 57f821b.
    
    ---
    
    timecop 0.9.9 supports `Process.clock_gettime`.
    This breaks specifications of `process_extenstion` of Fluentd and
    `Fluent::Clock`.
    
    `Fluent::Clock` uses `CLOCK_MONOTONIC_RAW` if possible and it does not
    be affected.
    However, `CLOCK_MONOTONIC_RAW` is not available on Windows, so the
    impact on tests on Windows is very significant.
    
    For now, we should avoid this effect by fixing the version.
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    17c66e1 View commit details
    Browse the repository at this point in the history
  2. config: yaml_parser: Handle $log_level element for special case

    Backported from 236d87d.
    
    ---
    
    This is because `@log_level` is invalid for YAML.
    Instead, we should interpret $log_level as `@log_level` on YAML parser.
    
    Signed-off-by: Hiroshi Hatake <[email protected]>
    cosmo0920 authored and daipom committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    2020531 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4486 from fluent/v1.16-backport-4482

    Backport(v1.16): config: yaml_parser: Handle $log_level element for special case (#4482)
    ashie authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    00ab6e8 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. test: fix IOError about Tempfile closed when GC (#4591)

    Backported from 3b27984.
    
    ---
    
    `Tempfile#binmode` returns `File` object, not own `Tempfile`
    object.
    So, GC will cause its finalizer and the file can be closed during
    the test.
    This is the cause why these tests sometimes fail by
    `IOError: closed stream`.
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    260a7f5 View commit details
    Browse the repository at this point in the history
  2. parser_json: fix wrong LoadError warning (#4592)

    Backported from 891ce71.
    
    ---
    
    If Oj is not installed, LoadError with the empty message is raised.
    So, the current condition `/\boj\z/.match?(ex.message)` does not work
    and the following meaningless warning is displayed.
    
        {datetime} [warn]: #x {id} LoadError
    
    After this fix, the log message will be:
    
        {datetime} [info]: #x {id} Oj is not installed, and failing back to
        Yajl for json parser
    
    Refactor "rescue" logic because this falling back feature is
    currently only for "oj" (LoadError can not occur for "json" and
    "yajl").
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    Co-authored-by: Takuro Ashie <[email protected]>
    daipom and ashie authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    2824884 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. fluentd command: fix plugin_dirs not to overwrite default value (#4606)

    Backported from fe5843f
    
    ---
    
    This option is explained as "add plugin directory".
    However, since v1.16.0, the behavior has changed to overwrite the
    default value unintentionally.
    (PR: #4064, commit: 41678bf).
    
    We should revert it to the original behavior.
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    a9b9a2e View commit details
    Browse the repository at this point in the history
  2. v1.16.6

    Signed-off-by: Kentaro Hayashi <[email protected]>
    kenhys authored and daipom committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    b5db2c6 View commit details
    Browse the repository at this point in the history
  3. v1.16.6: add #4605

    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    63adf0d View commit details
    Browse the repository at this point in the history
  4. v1.16.6: Move #4510 to Misc

    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    cb5e515 View commit details
    Browse the repository at this point in the history
  5. v1.16.6: Move #4486 to Bug Fix

    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f12fc95 View commit details
    Browse the repository at this point in the history
  6. v1.16.6: Move #4512 to Misc

    Because it does not fix the bug itself.
    
    Signed-off-by: Daijiro Fukuda <[email protected]>
    daipom committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f0cc1f0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a0ede80 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #4600 from fluent/release-v1.16.6

    v1.16.6
    kenhys authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    fa1cfbb View commit details
    Browse the repository at this point in the history
Loading