wip

Author: ryanstrat

.gitlab/scripts/publish_layers.sh

@@ -87,6 +87,12 @@ if [[ ! ${STAGES[@]} =~ $STAGE ]]; then
 fi
 
 layer="${LAYERS[$index]}"
+if [ -z "$LAYER_NAME_SUFFIX" ]; then
+    echo "No layer name suffix"
+else
+    layer="${layer}-${LAYER_NAME_SUFFIX}"
+fi
+echo "layer name: $layer"
 
 if [[ "$STAGE" =~ ^(staging|sandbox)$ ]]; then
     # Deploy latest version

src/trace/context/extractor-utils.ts

@@ -12,7 +12,6 @@ import { XrayService } from "../xray-service";
  * Attempts to extract trace context from headers, falling back to Step Function context if needed
  * @param headers The headers object to extract from
  * @param tracerWrapper The tracer wrapper instance
- * @param eventType The type of event (for logging)
  * @returns SpanContextWrapper or null
  */
 export function extractTraceContext(headers: any, tracerWrapper: TracerWrapper): SpanContextWrapper | null {

src/trace/context/extractor.ts

@@ -43,7 +43,6 @@ export class TraceContextExtractor {
   }
 
   async extract(event: any, context: Context): Promise<SpanContextWrapper | null> {
-    this.stepFunctionContextService = StepFunctionContextService.instance(event);
 
     let spanContext: SpanContextWrapper | null = null;
     if (this.config.traceExtractor) {
@@ -57,7 +56,15 @@ export class TraceContextExtractor {
         spanContext = eventExtractor.extract(event);
       }
     }
-
+/*
+    if (spanContext === null) {
+      this.stepFunctionContextService = StepFunctionContextService.instance(event)
+      if (this.stepFunctionContextService?.context) {
+        const extractor = new StepFunctionEventTraceExtractor();
+        spanContext = extractor?.extract(event);
+      }
+    }
+*/
     if (spanContext === null) {
       const contextExtractor = new LambdaContextTraceExtractor(this.tracerWrapper);
       spanContext = contextExtractor.extract(context);
@@ -88,6 +95,7 @@ export class TraceContextExtractor {
     if (EventValidator.isKinesisStreamEvent(event)) return new KinesisEventTraceExtractor(this.tracerWrapper);
     if (EventValidator.isEventBridgeEvent(event)) return new EventBridgeEventTraceExtractor(this.tracerWrapper);
 
+    this.stepFunctionContextService = StepFunctionContextService.instance(event);
     if (this.stepFunctionContextService?.context) return new StepFunctionEventTraceExtractor();
 
     return;

src/trace/context/extractors/sns-sqs.ts

@@ -9,6 +9,7 @@ export class SNSSQSEventTraceExtractor implements EventTraceExtractor {
   constructor(private tracerWrapper: TracerWrapper) {}
 
   extract(event: SQSEvent): SpanContextWrapper | null {
+    logDebug("SNS-SQS Extractor Being Used")
     try {
       // Try to extract trace context from SNS wrapped in SQS
       const body = event?.Records?.[0]?.body;

src/trace/context/extractors/sqs.ts

@@ -9,10 +9,14 @@ export class SQSEventTraceExtractor implements EventTraceExtractor {
   constructor(private tracerWrapper: TracerWrapper) {}
 
   extract(event: SQSEvent): SpanContextWrapper | null {
+    logDebug("SQS Extractor Being Used")
+    logDebug("Line 13 - event", { event });
     try {
       // First try to extract trace context from message attributes
       let headers = event?.Records?.[0]?.messageAttributes?._datadog?.stringValue;
 
+      logDebug("Line 18 - headers", { headers });
+
       if (!headers) {
         // Then try to get from binary value. This happens when SNS->SQS, but SNS has raw message delivery enabled.
         // In this case, SNS maps any messageAttributes to the SQS messageAttributes.
@@ -23,8 +27,13 @@ export class SQSEventTraceExtractor implements EventTraceExtractor {
         }
       }
 
+      logDebug("Line 30 - headers", { headers });
+
       if (headers) {
         const parsedHeaders = JSON.parse(headers);
+
+        logDebug("Line 35 - parsedHeaders", { parsedHeaders });
+
         const traceContext = extractTraceContext(parsedHeaders, this.tracerWrapper);
         if (traceContext) {
           return traceContext;

src/trace/context/extractors/step-function.spec.ts

@@ -1,5 +1,6 @@
 import { StepFunctionContextService } from "../../step-function-service";
 import { StepFunctionEventTraceExtractor } from "./step-function";
+import { TracerWrapper } from "../../tracer-wrapper";
 
 describe("StepFunctionEventTraceExtractor", () => {
   beforeEach(() => {

src/trace/context/extractors/step-function.ts

@@ -5,11 +5,16 @@ import { EventTraceExtractor } from "../extractor";
 export class StepFunctionEventTraceExtractor implements EventTraceExtractor {
   extract(event: any): SpanContextWrapper | null {
     // Probably StepFunctionContextService hasn't been called
-    const instance = StepFunctionContextService.instance(event);
-    const context = instance.context;
+    const stepFunctionInstance = StepFunctionContextService.instance(event);
+    const stepFunctionContext = stepFunctionInstance.context;
 
-    if (context === undefined) return null;
+    if (stepFunctionContext !== undefined) {
+      const spanContext = stepFunctionInstance.spanContext;
+      if (spanContext !== null) {
+        return spanContext;
+      }
+    }
 
-    return instance.spanContext;
+    return null;
   }
 }