[mq] working branch - merge 4062818 on top of main at e334908

{"baseBranch":"main","baseCommit":"e3349082ecb3db03a872e6ce8b5dfcbbe7d7707a","createdAt":"2026-01-26T20:56:59.255058Z","headSha":"4062818ac05298805280acc07343f4c045300876","id":"bdfd7f11-1343-4e75-ad77-c25d90168f16","priority":"200","pullRequestNumber":"4371","queuedAt":"2026-01-26T20:56:59.253950Z","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

contrib/aws/datadog-lambda-go/internal/trace/listener.go

@@ -53,8 +53,7 @@ var tracerInitialized = false
 
 // MakeListener initializes a new trace lambda Listener
 func MakeListener(config Config, extensionManager *extension.ExtensionManager) Listener {
-
-	return Listener{
+	l := Listener{
 		ddTraceEnabled:           config.DDTraceEnabled,
 		mergeXrayTraces:          config.MergeXrayTraces,
 		universalInstrumentation: config.UniversalInstrumentation,
@@ -63,9 +62,40 @@ func MakeListener(config Config, extensionManager *extension.ExtensionManager) L
 		traceContextExtractor:    config.TraceContextExtractor,
 		tracerOptions:            config.TracerOptions,
 	}
+
+	if l.ddTraceEnabled && !tracerInitialized {
+		l.initTracer()
+	}
+
+	return l
+}
+
+func (l *Listener) initTracer() {
+	serviceName := os.Getenv("DD_SERVICE")
+	if serviceName == "" {
+		serviceName = internal.Instr.ServiceName(instrumentation.ComponentDefault, instrumentation.OperationContext{})
+	}
+	extensionNotRunning := !l.extensionManager.IsExtensionRunning()
+	opts := append([]ddtracer.StartOption{
+		ddtracer.WithService(serviceName),
+		ddtracer.WithLambdaMode(extensionNotRunning),
+		ddtracer.WithGlobalTag("_dd.origin", "lambda"),
+		ddtracer.WithSendRetries(2),
+	}, l.tracerOptions...)
+	if l.otelTracerEnabled {
+		provider := ddotel.NewTracerProvider(
+			opts...,
+		)
+		otel.SetTracerProvider(provider)
+	} else {
+		ddtracer.Start(
+			opts...,
+		)
+	}
+	tracerInitialized = true
 }
 
-// HandlerStarted sets up tracing and starts the function execution span if Datadog tracing is enabled
+// HandlerStarted starts the function execution span if Datadog tracing is enabled
 func (l *Listener) HandlerStarted(ctx context.Context, msg json.RawMessage) context.Context {
 	if !l.ddTraceEnabled {
 		return ctx
@@ -77,31 +107,6 @@ func (l *Listener) HandlerStarted(ctx context.Context, msg json.RawMessage) cont
 
 	ctx, _ = contextWithRootTraceContext(ctx, msg, l.mergeXrayTraces, l.traceContextExtractor)
 
-	if !tracerInitialized {
-		serviceName := os.Getenv("DD_SERVICE")
-		if serviceName == "" {
-			serviceName = internal.Instr.ServiceName(instrumentation.ComponentDefault, instrumentation.OperationContext{})
-		}
-		extensionNotRunning := !l.extensionManager.IsExtensionRunning()
-		opts := append([]ddtracer.StartOption{
-			ddtracer.WithService(serviceName),
-			ddtracer.WithLambdaMode(extensionNotRunning),
-			ddtracer.WithGlobalTag("_dd.origin", "lambda"),
-			ddtracer.WithSendRetries(2),
-		}, l.tracerOptions...)
-		if l.otelTracerEnabled {
-			provider := ddotel.NewTracerProvider(
-				opts...,
-			)
-			otel.SetTracerProvider(provider)
-		} else {
-			ddtracer.Start(
-				opts...,
-			)
-		}
-		tracerInitialized = true
-	}
-
 	isDdServerlessSpan := l.universalInstrumentation && l.extensionManager.IsExtensionRunning()
 	functionExecutionSpan, ctx = startFunctionExecutionSpan(ctx, l.mergeXrayTraces, isDdServerlessSpan)