From aa8289e306b622ee7b3a964d922bedf945bfaa1a Mon Sep 17 00:00:00 2001 From: Olivier John Ndjike Nzia Date: Thu, 19 Mar 2026 14:39:37 -0400 Subject: [PATCH 1/6] set DD_TRACE_COMPUTE_STATS to false by default --- datadog_lambda/config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index 9960953e..14134f84 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -141,6 +141,8 @@ def _reset(self): "enabled" if config.fips_mode_enabled else "not enabled", ) +if ("DD_TRACE_COMPUTE_STATS" not in os.environ): + os.environ["DD_TRACE_COMPUTE_STATS"] = "false" if ( "DD_INSTRUMENTATION_TELEMETRY_ENABLED" not in os.environ From 1f26483277077805197b7c12fb9dba0541654bae Mon Sep 17 00:00:00 2001 From: Olivier John Ndjike Nzia Date: Thu, 19 Mar 2026 14:51:56 -0400 Subject: [PATCH 2/6] lint --- datadog_lambda/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index 14134f84..3d800e2b 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -141,7 +141,7 @@ def _reset(self): "enabled" if config.fips_mode_enabled else "not enabled", ) -if ("DD_TRACE_COMPUTE_STATS" not in os.environ): +if "DD_TRACE_COMPUTE_STATS" not in os.environ: os.environ["DD_TRACE_COMPUTE_STATS"] = "false" if ( From 680a0f041e962f168db03d40244108d7971de167 Mon Sep 17 00:00:00 2001 From: Olivier John Ndjike Nzia Date: Mon, 23 Mar 2026 12:46:50 -0400 Subject: [PATCH 3/6] add comment --- datadog_lambda/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index 3d800e2b..eeef642b 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -141,6 +141,7 @@ def _reset(self): "enabled" if config.fips_mode_enabled else "not enabled", ) +# disable css by default to prevent double counting in lambda if "DD_TRACE_COMPUTE_STATS" not in os.environ: os.environ["DD_TRACE_COMPUTE_STATS"] = "false" From ff44638fca70ccdb64c62d0b4fe3612b50728d1e Mon Sep 17 00:00:00 2001 From: Olivier John Ndjike Nzia Date: Mon, 23 Mar 2026 14:08:32 -0400 Subject: [PATCH 4/6] add alias, and warning --- datadog_lambda/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index eeef642b..844df699 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -142,8 +142,15 @@ def _reset(self): ) # disable css by default to prevent double counting in lambda -if "DD_TRACE_COMPUTE_STATS" not in os.environ: +if ( + "DD_TRACE_COMPUTE_STATS" not in os.environ + and "DD_TRACE_STATS_COMPUTATION_ENABLED" not in os.environ +): os.environ["DD_TRACE_COMPUTE_STATS"] = "false" +else: + logger.warning( + "Detected DD_TRACE_COMPUTE_STATS and/or DD_TRACE_STATS_COMPUTATION_ENABLED. These envs should be disabled to avoid double counting Client Side Stats" + ) if ( "DD_INSTRUMENTATION_TELEMETRY_ENABLED" not in os.environ From 04ae6c75894aabbaaabefb63d0eb6ac2f3f2ec11 Mon Sep 17 00:00:00 2001 From: Olivier John Ndjike Nzia Date: Mon, 23 Mar 2026 14:13:03 -0400 Subject: [PATCH 5/6] lint --- datadog_lambda/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index 844df699..6b3990f2 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -149,7 +149,8 @@ def _reset(self): os.environ["DD_TRACE_COMPUTE_STATS"] = "false" else: logger.warning( - "Detected DD_TRACE_COMPUTE_STATS and/or DD_TRACE_STATS_COMPUTATION_ENABLED. These envs should be disabled to avoid double counting Client Side Stats" + "Detected DD_TRACE_COMPUTE_STATS and/or DD_TRACE_STATS_COMPUTATION_ENABLED. \ + These envs should be disabled to avoid double counting Client Side Stats" ) if ( From 60484cffb1ec2ff78c2ac19759fff153acaf680f Mon Sep 17 00:00:00 2001 From: Olivier John Ndjike Nzia Date: Mon, 23 Mar 2026 14:48:03 -0400 Subject: [PATCH 6/6] disable css invariably --- datadog_lambda/config.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index 6b3990f2..4458bd9a 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -141,17 +141,12 @@ def _reset(self): "enabled" if config.fips_mode_enabled else "not enabled", ) -# disable css by default to prevent double counting in lambda -if ( - "DD_TRACE_COMPUTE_STATS" not in os.environ - and "DD_TRACE_STATS_COMPUTATION_ENABLED" not in os.environ -): - os.environ["DD_TRACE_COMPUTE_STATS"] = "false" -else: - logger.warning( - "Detected DD_TRACE_COMPUTE_STATS and/or DD_TRACE_STATS_COMPUTATION_ENABLED. \ - These envs should be disabled to avoid double counting Client Side Stats" - ) +# disable css to prevent double counting in lambda +os.environ["DD_TRACE_STATS_COMPUTATION_ENABLED"] = "false" + +# unset css aliases to ensure it is disabled +if "DD_TRACE_COMPUTE_STATS" in os.environ: + del os.environ["DD_TRACE_COMPUTE_STATS"] if ( "DD_INSTRUMENTATION_TELEMETRY_ENABLED" not in os.environ