From 6331b159baa140286e47e30b0ea2273a2b7f2dfa Mon Sep 17 00:00:00 2001 From: Piotr WOLSKI Date: Wed, 31 Jan 2024 22:50:36 -0500 Subject: [PATCH] internal/trace/listener: Don't override service name (#155) * internal/trace/listener: Don't override service name * default to aws.lambda if DD_SERVICE isn't set --- internal/trace/listener.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/trace/listener.go b/internal/trace/listener.go index 7deddbd4..57aaedbc 100644 --- a/internal/trace/listener.go +++ b/internal/trace/listener.go @@ -12,6 +12,7 @@ import ( "context" "encoding/json" "fmt" + "os" "strings" "github.com/DataDog/datadog-lambda-go/internal/extension" @@ -71,8 +72,12 @@ 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 = "aws.lambda" + } tracer.Start( - tracer.WithService("aws.lambda"), + tracer.WithService(serviceName), tracer.WithLambdaMode(!l.extensionManager.IsExtensionRunning()), tracer.WithGlobalTag("_dd.origin", "lambda"), tracer.WithSendRetries(2),