Determine the fluentd async option based on Docker server version #4558
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
singholt
force-pushed
the
fluentd-async
branch
5 times, most recently
from
a7cf71e to
e1d0b9c
Compare
singholt
changed the title
singholt
force-pushed
the
fluentd-async
branch
10 times, most recently
from
2204383 to
cc8dcb9
Compare
Docker's fluentd log driver supports passing an "async" option. The "fluentd-async-connect" option was deprecated in Docker v20.10.0 and completely removed in v28.0.0. Reference: https://docs.docker.com/engine/deprecated/#fluentd-async-connect-log-opt Functionally, both options are equivalent, see: moby/moby#39086. Since Docker's refactor of the fluentd async option was not versioned and affects all API versions, we need to determine the appropriate option using the Docker Server version, in order to be backwards compatible.
ShelbyZ
reviewed
Apr 16, 2025
ShelbyZ
approved these changes
Apr 16, 2025
prateekchaudhry
approved these changes
Apr 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Docker's fluentd log driver supports passing an async option. The
fluentd-async-connectoption was deprecated in Docker v20.10.0 and removed completely in v28.0.0, in favor offluentd-async. See: https://docs.docker.com/engine/deprecated/#fluentd-async-connect-log-opt. Functionally, both options are equivalent, see: moby/moby#39086.This PR makes ECS agent support the new
fluentd-asyncoption, while maintaining backwards-compatibility with older Docker server versions.Implementation details
Added the new
fluentd-asyncoption alongside the oldfluentd-async-connectoption. in the Docker task engine.In order to be backwards compatible with Docker versions older than 20.10.0, ECS agent will continue using the legacy
fluentd-async-connectoption for old versions. The newfluentd-asyncoption will be used on instances with Docker version 20.10.0 and above.Since the refactor on Docker's side isn't versioned and affects all client API versions, the ECS agent will determine which option to use, using the Docker server version. This is already available to the Docker task engine.
amazon-ecs-agent/agent/engine/docker_task_engine.go
Lines 2882 to 2885 in 006c1e8
Testing
New tests cover the changes: Yes
Description for the changelog
Enhancement: Determine the fluentd log driver's async option based on Docker server version
Additional Information
Does this PR include breaking model changes? If so, Have you added transformation functions? no
Does this PR include the addition of new environment variables in the README? no
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.