From 91c229fbab5933d2e73238899ae18e8f2709c407 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Wed, 16 Aug 2023 14:49:12 -0400 Subject: [PATCH 1/5] feat: Support DD_TRACE_OTEL_ENABLED env var --- datadog_lambda/tracing.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 92c3e01c..f9f491f9 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -29,6 +29,12 @@ send_segment, parse_xray_header, ) +dd_trace_otel_enabled = os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true" +if dd_trace_otel_enabled: + from opentelemetry.trace import set_tracer_provider + from ddtrace.opentelemetry import TracerProvider + + set_tracer_provider(TracerProvider()) from ddtrace import tracer, patch, Span from ddtrace import __version__ as ddtrace_version from ddtrace.propagation.http import HTTPPropagator From d1cd8c994f2934c1f0902ef1d798951656ba2238 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Wed, 16 Aug 2023 14:53:28 -0400 Subject: [PATCH 2/5] fix: lint --- datadog_lambda/tracing.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index f9f491f9..fe6946a1 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -29,7 +29,9 @@ send_segment, parse_xray_header, ) -dd_trace_otel_enabled = os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true" +dd_trace_otel_enabled = ( + os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true" +) if dd_trace_otel_enabled: from opentelemetry.trace import set_tracer_provider from ddtrace.opentelemetry import TracerProvider From 7f7d50983de42ece562ae94aad31f881bacea46f Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Wed, 16 Aug 2023 14:54:46 -0400 Subject: [PATCH 3/5] fix: black --- datadog_lambda/tracing.py | 1 + 1 file changed, 1 insertion(+) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index fe6946a1..298d7d55 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -29,6 +29,7 @@ send_segment, parse_xray_header, ) + dd_trace_otel_enabled = ( os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true" ) From d943a99db94070e0aa81789bac3894a33f89f7c0 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Wed, 16 Aug 2023 15:01:08 -0400 Subject: [PATCH 4/5] fix: Seems that only the ENV var must be set for ddtrace to care --- datadog_lambda/tracing.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 298d7d55..dcc69d4f 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -30,14 +30,6 @@ parse_xray_header, ) -dd_trace_otel_enabled = ( - os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true" -) -if dd_trace_otel_enabled: - from opentelemetry.trace import set_tracer_provider - from ddtrace.opentelemetry import TracerProvider - - set_tracer_provider(TracerProvider()) from ddtrace import tracer, patch, Span from ddtrace import __version__ as ddtrace_version from ddtrace.propagation.http import HTTPPropagator @@ -50,6 +42,16 @@ EventSubtypes, ) +dd_trace_otel_enabled = ( + os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true" +) +if dd_trace_otel_enabled: + from opentelemetry.trace import set_tracer_provider + from ddtrace.opentelemetry import TracerProvider + + set_tracer_provider(TracerProvider()) + + logger = logging.getLogger(__name__) dd_trace_context = {} From 856be0f0c2063d8545ca119e9394579c56187b37 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Wed, 16 Aug 2023 15:05:08 -0400 Subject: [PATCH 5/5] fix: remove space --- datadog_lambda/tracing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index dcc69d4f..a9c223e3 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -29,7 +29,6 @@ send_segment, parse_xray_header, ) - from ddtrace import tracer, patch, Span from ddtrace import __version__ as ddtrace_version from ddtrace.propagation.http import HTTPPropagator