Use standard hashing function

Author: nhulston

src/utils/span-pointers.spec.ts

@@ -9,11 +9,10 @@ jest.mock("./log", () => ({
 }));
 
 describe("span-pointers utils", () => {
-  const mockS3PointerHash = "mock-hash-123";
+  const mockPointerHash = "mock-hash-123";
 
   beforeEach(() => {
-    // Mock the generateS3PointerHash function
-    jest.spyOn(spanPointers, "generateS3PointerHash").mockReturnValue(mockS3PointerHash);
+    jest.spyOn(spanPointers, "generatePointerHash").mockReturnValue(mockPointerHash);
   });
 
   afterEach(() => {
@@ -58,7 +57,7 @@ describe("span-pointers utils", () => {
 
         const result = getSpanPointerAttributes(eventTypes.s3, event);
         expect(result).toEqual(expected);
-        expect(spanPointers.generateS3PointerHash).toHaveBeenCalledWith("test-bucket", "test-key", "test-etag");
+        expect(spanPointers.generatePointerHash).toHaveBeenCalledWith(["test-bucket", "test-key", "test-etag"]);
       });
 
       it("processes multiple S3 records correctly", () => {

src/utils/span-pointers.ts

@@ -4,7 +4,7 @@ import {
   SPAN_LINK_POINTER_KIND,
   S3_PTR_KIND,
   SPAN_POINTER_DIRECTION,
-  generateS3PointerHash,
+  generatePointerHash,
 } from "dd-trace/packages/dd-trace/src/span_pointers";
 
 interface SpanPointerAttributes {
@@ -54,14 +54,18 @@ function processS3Event(event: any): SpanPointerAttributes[] {
     const s3Event = record?.s3;
     const bucketName = s3Event?.bucket?.name;
     const objectKey = s3Event?.object?.key;
-    const eTag = s3Event?.object?.eTag;
+    let eTag = s3Event?.object?.eTag;
 
     if (!bucketName || !objectKey || !eTag) {
       logDebug("Unable to calculate span pointer hash because of missing parameters.");
       continue;
     }
 
-    const pointerHash = generateS3PointerHash(bucketName, objectKey, eTag);
+    // https://github.com/DataDog/dd-span-pointer-rules/blob/main/AWS/S3/Object/README.md
+    if (eTag.startsWith('"') && eTag.endsWith('"')) {
+      eTag = eTag.slice(1, -1)
+    }
+    const pointerHash = generatePointerHash([bucketName, objectKey, eTag]);
     const spanPointerAttributes = {
       "ptr.kind": S3_PTR_KIND,
       "ptr.dir": SPAN_POINTER_DIRECTION.UPSTREAM,