Fix tests

DataDog · Nov 22, 2024 · 0715e81 · 0715e81
1 parent b50916d
commit 0715e81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/trace/trigger.spec.ts b/src/trace/trigger.spec.ts
@@ -174,7 +174,7 @@ describe("parseEventSource", () => {
   it("extracts all trigger tags", () => {
     for (let event of events) {
       const eventData = JSON.parse(readFileSync(`./event_samples/${event.file}`, "utf8"));
-      const eventSource = parseEventSource(event);
+      const eventSource = parseEventSource(eventData);
       const triggerTags = extractTriggerTags(eventData, mockContext, eventSource);
       expect(triggerTags).toEqual(event.result);
     }
@@ -183,7 +183,7 @@ describe("parseEventSource", () => {
   it("extracts the status code if API Gateway, ALB, or Function URL, otherwise do nothing, for buffered functions", () => {
     for (const event of events) {
       const eventData = JSON.parse(readFileSync(`./event_samples/${event.file}`, "utf8"));
-      const eventSource = parseEventSource(event);
+      const eventSource = parseEventSource(eventData);
       const triggerTags = extractTriggerTags(eventData, mockContext, eventSource);
       const isResponseStreamingFunction = false;
       for (const response of bufferedResponses) {
@@ -208,7 +208,7 @@ describe("parseEventSource", () => {
   it("extracts the status code if API Gateway, ALB, or Function URL, otherwise do nothing, for streaming functions", () => {
     for (let event of events) {
       const eventData = JSON.parse(readFileSync(`./event_samples/${event.file}`, "utf8"));
-      const eventSource = parseEventSource(event);
+      const eventSource = parseEventSource(eventData);
       const triggerTags = extractTriggerTags(eventData, mockContext, eventSource);
       const isResponseStreamingFunction = true;
       for (const response of streamingResponses) {

diff --git a/src/utils/span-pointers.spec.ts b/src/utils/span-pointers.spec.ts
@@ -51,6 +51,7 @@ describe("span-pointers utils", () => {
                   eTag: "test-etag",
                 },
               },
+              eventName: "ObjectCreated:SomeEventName",
             },
           ],
         };
@@ -79,6 +80,7 @@ describe("span-pointers utils", () => {
                   eTag: "etag1",
                 },
               },
+              eventName: "ObjectCreated:SomeEventName",
             },
             {
               s3: {
@@ -88,6 +90,7 @@ describe("span-pointers utils", () => {
                   eTag: "etag2",
                 },
               },
+              eventName: "ObjectCreated:SomeEventName",
             },
           ],
         };
@@ -135,6 +138,7 @@ describe("span-pointers utils", () => {
                   eTag: "valid-etag",
                 },
               },
+              eventName: "ObjectCreated:SomeEventName",
             },
           ],
         };

diff --git a/src/utils/span-pointers.ts b/src/utils/span-pointers.ts
@@ -53,7 +53,7 @@ function processS3Event(event: any): SpanPointerAttributes[] {
 
   for (const record of records) {
     const eventName = record.eventName;
-    if (!eventName.startsWith("ObjectCreated")) {
+    if (!eventName || !eventName.startsWith("ObjectCreated")) {
       continue;
     }
     // Values are stored in the same place, regardless of AWS SDK v2/v3 or the event type.