test changes

Author: nhulston

internal/trace/context.go

@@ -49,6 +49,7 @@ var DefaultTraceExtractor = getHeadersFromEventHeaders
 // the root TraceContext and then adds that TraceContext to the context object.
 func contextWithRootTraceContext(ctx context.Context, ev json.RawMessage, mergeXrayTraces bool, extractor ContextExtractor) (context.Context, error) {
 	datadogTraceContext, gotDatadogTraceContext := getTraceContext(ctx, extractor(ctx, ev))
+	fmt.Printf("[DEBUG LAMBDA] Got trace context: %+v, ok=%v\n", datadogTraceContext, gotDatadogTraceContext)
 
 	xrayTraceContext, errGettingXrayContext := convertXrayTraceContextFromLambdaContext(ctx)
 	if errGettingXrayContext != nil {
@@ -135,6 +136,7 @@ func getTraceContext(ctx context.Context, headers map[string]string) (TraceConte
 	if traceID == "" {
 		if val, ok := ctx.Value(extension.DdTraceId).(string); ok {
 			traceID = val
+			fmt.Printf("[DEBUG LAMBDA] Got traceID from context: %s\n", val)
 		}
 	}
 	if traceID == "" {
@@ -145,12 +147,19 @@ func getTraceContext(ctx context.Context, headers map[string]string) (TraceConte
 	if parentID == "" {
 		if val, ok := ctx.Value(extension.DdParentId).(string); ok {
 			parentID = val
+			fmt.Printf("[DEBUG LAMBDA] Got parentID from context: %s\n", val)
 		}
 	}
+	if parentID == "" {
+		return tc, false
+	}
+
 	samplingPriority := headers[samplingPriorityHeader]
+	fmt.Printf("[DEBUG LAMBDA] Initial sampling priority from headers: %s\n", samplingPriority)
 	if samplingPriority == "" {
 		if val, ok := ctx.Value(extension.DdSamplingPriority).(string); ok {
 			samplingPriority = val
+			fmt.Printf("[DEBUG LAMBDA] Got sampling priority from context: %s\n", val)
 		}
 	}
 	// Remove this default to let tracer sampling rules take effect
@@ -161,6 +170,9 @@ func getTraceContext(ctx context.Context, headers map[string]string) (TraceConte
 	// Only set sampling priority if it was explicitly provided
 	if samplingPriority != "" {
 		tc[samplingPriorityHeader] = samplingPriority
+		fmt.Printf("[DEBUG LAMBDA] Setting sampling priority in trace context: %s\n", samplingPriority)
+	} else {
+		fmt.Printf("[DEBUG LAMBDA] No sampling priority set in trace context\n")
 	}
 	tc[traceIDHeader] = traceID
 	tc[parentIDHeader] = parentID
@@ -269,6 +281,7 @@ func convertXRayEntityIDToDatadogParentID(entityID string) (string, error) {
 
 // Converts an X-Ray sampling decision into its Datadog counterpart.
 func convertXRaySamplingDecision(decision header.SamplingDecision) string {
+	fmt.Printf("[DEBUG LAMBDA] Converting X-Ray sampling decision: %v\n", decision)
 	if decision == header.Sampled {
 		return userKeep
 	}