From 70a224923a7e0f401fdd815975b47aeb6ce7d05f Mon Sep 17 00:00:00 2001
From: XXX <XXX@hoge.com>
Date: Wed, 19 Mar 2025 11:14:39 +0900
Subject: [PATCH 1/2] [bug-fix] Make it possible to grant xray traces with an
 http request in Nuxt3

---
 src/plugins/utils/http-utils.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/plugins/utils/http-utils.ts b/src/plugins/utils/http-utils.ts
index bfd491b3..f623a024 100644
--- a/src/plugins/utils/http-utils.ts
+++ b/src/plugins/utils/http-utils.ts
@@ -168,10 +168,17 @@ export const addAmznTraceIdHeaderToInit = (
     if (!init.headers) {
         init.headers = {};
     }
-    (init.headers as any)[X_AMZN_TRACE_ID] = getAmznTraceIdHeaderValue(
-        traceId,
-        segmentId
-    );
+    if ((init.headers as any).set) {
+        (init.headers as any).set(
+            X_AMZN_TRACE_ID,
+            getAmznTraceIdHeaderValue(traceId, segmentId)
+        );
+    } else {
+        (init.headers as any)[X_AMZN_TRACE_ID] = getAmznTraceIdHeaderValue(
+            traceId,
+            segmentId
+        );
+    }
 };
 
 export const addAmznTraceIdHeaderToHeaders = (

From 914898952d82bdb52bdb8029971551f64c7f533a Mon Sep 17 00:00:00 2001
From: XXX <XXX@hoge.com>
Date: Sun, 30 Mar 2025 13:24:27 +0900
Subject: [PATCH 2/2] Added tests that make it possible to grant xray traces
 with an http request in Nuxt3

---
 app/http_fetch_event.html                     | 27 +++++++++++-
 src/__smoke-test__/dataplane-integ.spec.ts    | 39 ++++++++++++++++
 .../__integ__/FetchPlugin.test.ts             | 29 ++++++++++++
 .../utils/__tests__/http-utils.test.ts        | 44 ++++++++++++++++++-
 4 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/app/http_fetch_event.html b/app/http_fetch_event.html
index 2847d775..5ca235c3 100644
--- a/app/http_fetch_event.html
+++ b/app/http_fetch_event.html
@@ -5,8 +5,18 @@
 
         <script>
             window.fetch = function (request, init) {
-                document.getElementById('fetchRequestHeaders').innerText =
-                    init.headers['X-Amzn-Trace-Id'];
+                // Display the trace header for debugging
+                if (init && init.headers) {
+                    if (init.headers instanceof Headers) {
+                        document.getElementById(
+                            'fetchRequestHeaders'
+                        ).innerText = init.headers.get('X-Amzn-Trace-Id');
+                    } else {
+                        document.getElementById(
+                            'fetchRequestHeaders'
+                        ).innerText = init.headers['X-Amzn-Trace-Id'];
+                    }
+                }
                 return Promise.resolve({
                     status: 200,
                     headers: new Headers({ 'Content-Length': 125 }),
@@ -43,6 +53,12 @@
                 fetch('https://aws.amazon.com');
             }
 
+            // Headers object has a set method by default
+            function sendFetchRequestWithHeadersObject() {
+                const headers = new Headers();
+                fetch('https://aws.amazon.com', { headers });
+            }
+
             function sendDataPlaneRequest() {
                 fetch(
                     'https://dataplane.rum.us-west-2.amazonaws.com/appmonitors/abc123/'
@@ -89,6 +105,13 @@
         <button id="clearRequestResponse" onclick="clearRequestResponse()">
             Clear
         </button>
+        <!-- Button for testing headers with set method -->
+        <button
+            id="sendFetchRequestWithHeadersObject"
+            onclick="sendFetchRequestWithHeadersObject()"
+        >
+            Send Fetch Request with Headers Object
+        </button>
         <hr />
         <span id="request"></span>
         <span id="response"></span>
diff --git a/src/__smoke-test__/dataplane-integ.spec.ts b/src/__smoke-test__/dataplane-integ.spec.ts
index 2ff2345c..3757e2ff 100644
--- a/src/__smoke-test__/dataplane-integ.spec.ts
+++ b/src/__smoke-test__/dataplane-integ.spec.ts
@@ -70,3 +70,42 @@ test('when web client calls PutRumEvents then the payload contains all events',
     expect(navigation.length).toEqual(NAVIGATION_COUNT);
     expect(resource.length).toEqual(RESOURCE_EVENT_COUNT);
 });
+
+test('when web client is used in Nuxt3 environment then X-Ray trace ID is added to HTTP requests', async ({
+    page
+}) => {
+    // Mock Nuxt3 environment
+    await page.addInitScript(() => {
+        // Override fetch to simulate Nuxt3's ofetch behavior
+        const originalFetch = window.fetch;
+        window.fetch = function (input, init) {
+            if (!init) {
+                init = {};
+            }
+            if (!init.headers) {
+                // Create Headers object with set method
+                init.headers = new Headers();
+            }
+            return originalFetch(input, init);
+        };
+    });
+
+    // Open page
+    await page.goto(TEST_URL);
+
+    // Trigger a fetch request
+    await page.evaluate(() => {
+        fetch('/api/test');
+    });
+
+    // Verify that the X-Ray trace ID header was added
+    const request = await page.waitForRequest(
+        (request) =>
+            request.url().includes('/api/test') &&
+            request.headers()['x-amzn-trace-id'] !== undefined
+    );
+
+    expect(request.headers()['x-amzn-trace-id']).toMatch(
+        /Root=1-[0-9a-f]{8}-[0-9a-f]{24};Parent=[0-9a-f]{16};Sampled=1/
+    );
+});
diff --git a/src/plugins/event-plugins/__integ__/FetchPlugin.test.ts b/src/plugins/event-plugins/__integ__/FetchPlugin.test.ts
index eea43824..da356c8a 100644
--- a/src/plugins/event-plugins/__integ__/FetchPlugin.test.ts
+++ b/src/plugins/event-plugins/__integ__/FetchPlugin.test.ts
@@ -3,6 +3,9 @@ import { REQUEST_BODY } from '../../../test-utils/integ-test-utils';
 import { XRAY_TRACE_EVENT_TYPE, HTTP_EVENT_TYPE } from '../../utils/constant';
 
 const sendFetchRequest: Selector = Selector(`#sendFetchRequest`);
+const sendFetchRequestWithHeadersObject: Selector = Selector(
+    `#sendFetchRequestWithHeadersObject`
+);
 const sendDataPlaneRequest: Selector = Selector(`#sendDataPlaneRequest`);
 const dispatch: Selector = Selector(`#dispatch`);
 const clearRequestResponse: Selector = Selector(`#clearRequestResponse`);
@@ -65,3 +68,29 @@ test('when fetch is called then an http event is recorded', async (t: TestContro
         .expect(eventDetails.response.status)
         .eql(200);
 });
+
+test('when fetch is called with headers that have set method then trace header is added', async (t: TestController) => {
+    // This test simulates the environment where headers have a set method
+    await t
+        .wait(300)
+        .click(dispatch)
+        .expect(REQUEST_BODY.textContent)
+        .contains('BatchId')
+        .click(clearRequestResponse)
+        .click(sendFetchRequestWithHeadersObject)
+        .expect(fetchRequestHeaders.textContent)
+        .match(/Root=1-[0-9a-f]{8}-[0-9a-f]{24};Parent=[0-9a-f]{16};Sampled=1/)
+        .click(dispatch)
+        .expect(REQUEST_BODY.textContent)
+        .contains('BatchId');
+
+    const json = JSON.parse(await REQUEST_BODY.textContent);
+    const eventType = json.RumEvents[0].type;
+    const eventDetails = JSON.parse(json.RumEvents[0].details);
+
+    await t
+        .expect(eventType)
+        .eql(XRAY_TRACE_EVENT_TYPE)
+        .expect(eventDetails.name)
+        .eql('sample.rum.aws.amazon.com');
+});
diff --git a/src/plugins/utils/__tests__/http-utils.test.ts b/src/plugins/utils/__tests__/http-utils.test.ts
index 7d007e27..61a7539e 100644
--- a/src/plugins/utils/__tests__/http-utils.test.ts
+++ b/src/plugins/utils/__tests__/http-utils.test.ts
@@ -1,4 +1,9 @@
-import { X_AMZN_TRACE_ID, getTraceHeader } from '../http-utils';
+import {
+    X_AMZN_TRACE_ID,
+    getTraceHeader,
+    addAmznTraceIdHeaderToInit,
+    getAmznTraceIdHeaderValue
+} from '../http-utils';
 
 const Request = function (input: RequestInfo, init?: RequestInit) {
     if (typeof input === 'string') {
@@ -50,4 +55,41 @@ describe('http-utils', () => {
         expect(traceHeader.traceId).toEqual(undefined);
         expect(traceHeader.segmentId).toEqual(undefined);
     });
+
+    test('when headers object has set method then trace header is added using set method', async () => {
+        const traceId = '1-0-000000000000000000000001';
+        const segmentId = '0000000000000001';
+
+        const headersWithSetMethod = {
+            set: jest.fn()
+        };
+
+        const init: RequestInit = {
+            headers: headersWithSetMethod as any
+        };
+
+        addAmznTraceIdHeaderToInit(init, traceId, segmentId);
+
+        expect(headersWithSetMethod.set).toHaveBeenCalledWith(
+            X_AMZN_TRACE_ID,
+            getAmznTraceIdHeaderValue(traceId, segmentId)
+        );
+    });
+
+    test('when headers object does not have set method then trace header is added as property', async () => {
+        const traceId = '1-0-000000000000000000000001';
+        const segmentId = '0000000000000001';
+
+        const headersWithoutSetMethod = {} as any;
+
+        const init: RequestInit = {
+            headers: headersWithoutSetMethod
+        };
+
+        addAmznTraceIdHeaderToInit(init, traceId, segmentId);
+
+        expect(headersWithoutSetMethod[X_AMZN_TRACE_ID]).toEqual(
+            getAmznTraceIdHeaderValue(traceId, segmentId)
+        );
+    });
 });