From e808d6947997183ca5ff3ea344797175104ef52c Mon Sep 17 00:00:00 2001 From: Julio Guerra Date: Fri, 3 Nov 2023 16:19:51 +0100 Subject: [PATCH 1/3] feat: opt-in enablement of the instrumentation telemetry client --- datadog_lambda/tracing.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index a9c223e3..323135ed 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -55,6 +55,11 @@ dd_trace_context = {} dd_tracing_enabled = os.environ.get("DD_TRACE_ENABLED", "false").lower() == "true" +if dd_tracing_enabled: + # Enable the telemetry client if the user has opted in + if os.environ.get("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "false").lower() == "true": + from ddtrace.internal.telemetry import telemetry_writer + telemetry_writer.enable() propagator = HTTPPropagator() From b635b184bf6f5e64e599687d037b05268b6fa249 Mon Sep 17 00:00:00 2001 From: Julio Guerra Date: Mon, 6 Nov 2023 18:07:37 +0100 Subject: [PATCH 2/3] Update datadog_lambda/tracing.py Co-authored-by: Alberto Vara --- datadog_lambda/tracing.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 323135ed..79339c71 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -57,7 +57,10 @@ dd_tracing_enabled = os.environ.get("DD_TRACE_ENABLED", "false").lower() == "true" if dd_tracing_enabled: # Enable the telemetry client if the user has opted in - if os.environ.get("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "false").lower() == "true": + if ( + os.environ.get("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "false").lower() + == "true" + ): from ddtrace.internal.telemetry import telemetry_writer telemetry_writer.enable() From 80ed221553018c3bbbf9c2fc8c8d2a3ef48f2466 Mon Sep 17 00:00:00 2001 From: Julio Guerra Date: Tue, 7 Nov 2023 09:50:35 +0100 Subject: [PATCH 3/3] Fix linter --- datadog_lambda/tracing.py | 1 + 1 file changed, 1 insertion(+) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 79339c71..de6e76b4 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -62,6 +62,7 @@ == "true" ): from ddtrace.internal.telemetry import telemetry_writer + telemetry_writer.enable() propagator = HTTPPropagator()