Skip to content

Commit 99f2e1a

Browse files
committed
test changes
1 parent 291fd30 commit 99f2e1a

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

internal/trace/listener.go

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ import (
2020
"github.com/DataDog/datadog-lambda-go/internal/logger"
2121
"github.com/DataDog/datadog-lambda-go/internal/version"
2222
"github.com/aws/aws-lambda-go/lambdacontext"
23-
"go.opentelemetry.io/otel"
2423
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
25-
ddotel "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentelemetry"
2624
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
2725
)
2826

@@ -79,16 +77,17 @@ func (l *Listener) HandlerStarted(ctx context.Context, msg json.RawMessage) cont
7977
}
8078

8179
ctx, _ = contextWithRootTraceContext(ctx, msg, l.mergeXrayTraces, l.traceContextExtractor)
80+
fmt.Printf("Extension running: %t", l.extensionManager.IsExtensionRunning())
8281

8382
if !tracerInitialized {
8483
serviceName := os.Getenv("DD_SERVICE")
8584
if serviceName == "" {
8685
serviceName = "aws.lambda"
8786
}
88-
extensionNotRunning := !l.extensionManager.IsExtensionRunning()
87+
// Remove Lambda mode
8988
opts := append([]tracer.StartOption{
9089
tracer.WithService(serviceName),
91-
tracer.WithLambdaMode(extensionNotRunning),
90+
// tracer.WithLambdaMode(extensionNotRunning),
9291
tracer.WithGlobalTag("_dd.origin", "lambda"),
9392
tracer.WithSendRetries(2),
9493
}, l.tracerOptions...)
@@ -144,16 +143,7 @@ func (l *Listener) HandlerStarted(ctx context.Context, msg json.RawMessage) cont
144143
}
145144
// End parsing DD_TRACE_SAMPLING_RULES
146145

147-
if l.otelTracerEnabled {
148-
provider := ddotel.NewTracerProvider(
149-
opts...,
150-
)
151-
otel.SetTracerProvider(provider)
152-
} else {
153-
tracer.Start(
154-
opts...,
155-
)
156-
}
146+
tracer.Start(opts...)
157147
tracerInitialized = true
158148
}
159149

0 commit comments

Comments
 (0)