From 9be0e79971a239710f22850c7da0f915065154fe Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Fri, 26 May 2023 10:12:13 -0600 Subject: [PATCH 1/3] Add ecs_logging to dependencies --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 6432c4122..4508e0416 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,6 +39,7 @@ install_requires = urllib3!=2.0.0,<3.0.0 certifi wrapt>=1.14.1 + ecs_logging test_suite=tests [options.entry_points] From 2fcc72f81427934634acc6983d5d3af1c7566c84 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Fri, 26 May 2023 10:13:35 -0600 Subject: [PATCH 2/3] CHANGELOG --- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 99654ea61..b01caacd7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -46,6 +46,7 @@ endif::[] * Add instrumentation for redis.asyncio {pull}1807[#1807] * Add support for urllib3 v2.0.1+ {pull}1822[#1822] * Add `service.environment` to log correlation {pull}1833[#1833] +* Add `ecs_logging` as a dependency {pull}1840[#1840] [float] ===== Bug fixes From 76b6b81a5a2c7bbf756204bd93f9f2f031f4104d Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Thu, 1 Jun 2023 13:05:17 -0600 Subject: [PATCH 3/3] Add doc note for ecs_logging dependency addition --- docs/logging.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/logging.asciidoc b/docs/logging.asciidoc index c4606f1f5..9e0b24922 100644 --- a/docs/logging.asciidoc +++ b/docs/logging.asciidoc @@ -181,7 +181,9 @@ Then, you could use a grok pattern like this (for the [[log-reformatting]] === Log reformatting (experimental) -The agent can automatically reformat application to ECS format when the application includes the `ecs-logging-python` library in its dependencies. +Starting in version 6.16.0, the agent can automatically reformat application +logs to ECS format with no changes to dependencies. Prior versions must install +the `ecs_logging` dependency. Log reformatting is controlled by the <> configuration option, and is disabled by default.