feat(transport): support dynamic headers in Fetch/OtlpHttp transport (#1490)

Author: rbaradari

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next
 
+- Feature (`@grafana/faro-web-sdk`): Fetch transport now supports dynamic header values. Each header can be a static string or a function returning a string, resolved at request time (#1490).
+
+- Feature (`@grafana/faro-transport-otlp-http [experimental]`): OLTP HTTP transport now supports dynamic header values. Each header can be a static string or a function returning a string, resolved at request time (#1490).
+
 ## 2.0.2
 
 - Breaking (`@grafana/faro-web-sdk`): User action events now have a standardized event name

experimental/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Next
 
+- Feature (`@grafana/faro-transport-otlp-http`): OLTP HTTP transport now supports dynamic header values. Each header can be a static string or a function returning a string, resolved at request time (#1490).
+
 ## 1.13.0
 
 - Improvement (`@grafana/faro-*`) Add required Node engines to package.json ()

experimental/transport-otlp-http/src/transport.test.ts

@@ -420,6 +420,87 @@ describe('OtlpHttpTransport', () => {
     expect(mockResponseTextFn).toHaveBeenCalledTimes(1);
   });
 
+  it('will add static header values', () => {
+    const transport = new OtlpHttpTransport({
+      logsURL: 'https://www.example.com/v1/logs',
+      requestOptions: {
+        headers: {
+          Authorization: 'Bearer static-token',
+          'X-Static': 'static-value',
+        },
+      },
+    });
+
+    transport.internalLogger = mockInternalLogger;
+
+    transport.send([logTransportItem]);
+
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
+      'https://www.example.com/v1/logs',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer static-token',
+          'X-Static': 'static-value',
+        }),
+      })
+    );
+  });
+
+  it('will add dynamic header values from sync callbacks', () => {
+    const transport = new OtlpHttpTransport({
+      logsURL: 'https://www.example.com/v1/logs',
+      requestOptions: {
+        headers: {
+          Authorization: () => 'Bearer dynamic-token',
+          'X-User': () => 'user-123',
+        },
+      },
+    });
+
+    transport.internalLogger = mockInternalLogger;
+
+    transport.send([logTransportItem]);
+
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
+      'https://www.example.com/v1/logs',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer dynamic-token',
+          'X-User': 'user-123',
+        }),
+      })
+    );
+  });
+
+  it('will add static header values and dynamic header values from sync callbacks', () => {
+    const transport = new OtlpHttpTransport({
+      logsURL: 'https://www.example.com/v1/logs',
+      requestOptions: {
+        headers: {
+          Authorization: () => 'Bearer dynamic-token',
+          'X-Static': 'static-value',
+        },
+      },
+    });
+
+    transport.internalLogger = mockInternalLogger;
+
+    transport.send([logTransportItem]);
+
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
+      'https://www.example.com/v1/logs',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer dynamic-token',
+          'X-Static': 'static-value',
+        }),
+      })
+    );
+  });
+
   it('will not send traces data if traces URL is not set', () => {
     const transport = new OtlpHttpTransport({
       logsURL: 'www.example.com/v1/logs',

experimental/transport-otlp-http/src/transport.ts

@@ -89,18 +89,23 @@ export class OtlpHttpTransport extends BaseTransport {
         const body = JSON.stringify({ [key]: value });
 
         const { requestOptions, apiKey } = this.options;
-        const { headers, ...restOfRequestOptions } = requestOptions ?? {};
+        const { headers = {}, ...restOfRequestOptions } = requestOptions ?? {};
 
         if (!url) {
           continue;
         }
 
+        const resolvedHeaders: Record<string, string> = {};
+        for (const [key, value] of Object.entries(headers)) {
+          resolvedHeaders[key] = typeof value === 'function' ? value() : value;
+        }
+
         this.promiseBuffer.add(() => {
           return fetch(url, {
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              ...(headers ?? {}),
+              ...resolvedHeaders,
               ...(apiKey ? { 'x-api-key': apiKey } : {}),
             },
             body,

experimental/transport-otlp-http/src/types.ts

@@ -1,7 +1,13 @@
 import type { ExceptionEvent, MeasurementEvent, TransportItem } from '@grafana/faro-core';
 
 export interface OtlpTransportRequestOptions extends Omit<RequestInit, 'body' | 'headers'> {
-  headers?: Record<string, string>;
+  /**
+   * Headers to include in every request.
+   * Each value can be:
+   * - a string (static value)
+   * - a function returning a string (dynamic value)
+   */
+  headers?: Record<string, string | (() => string)>;
 }
 
 export interface OtlpHttpTransportOptions {

packages/web-sdk/src/transports/fetch/transport.test.ts

@@ -249,6 +249,93 @@ describe('FetchTransport', () => {
     expect(ignoreUrls).toStrictEqual([collectorUrl, ...globalIgnoreUrls]);
   });
 
+  it('will add static header values', () => {
+    const transport = new FetchTransport({
+      url: 'http://example.com/collect',
+      requestOptions: {
+        headers: {
+          Authorization: 'Bearer static-token',
+          'X-Static': 'static-value',
+        },
+      },
+    });
+
+    transport.metas.value = { session: { id: mockSessionId } };
+
+    transport.internalLogger = mockInternalLogger;
+
+    transport.send([item]);
+
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
+      'http://example.com/collect',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer static-token',
+          'X-Static': 'static-value',
+        }),
+      })
+    );
+  });
+
+  it('will add dynamic header values from sync callbacks', () => {
+    const transport = new FetchTransport({
+      url: 'http://example.com/collect',
+      requestOptions: {
+        headers: {
+          Authorization: () => `Bearer ${mockSessionId}-token`,
+          'X-User': () => 'user-123',
+        },
+      },
+    });
+
+    transport.metas.value = { session: { id: mockSessionId } };
+
+    transport.internalLogger = mockInternalLogger;
+
+    transport.send([item]);
+
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
+      'http://example.com/collect',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: `Bearer ${mockSessionId}-token`,
+          'X-User': 'user-123',
+        }),
+      })
+    );
+  });
+
+  it('will add static header values and dynamic header values from sync callbacks', () => {
+    const transport = new FetchTransport({
+      url: 'http://example.com/collect',
+      requestOptions: {
+        headers: {
+          Authorization: () => `Bearer ${mockSessionId}-token`,
+          'X-Static': 'static-value',
+        },
+      },
+    });
+
+    transport.metas.value = { session: { id: mockSessionId } };
+
+    transport.internalLogger = mockInternalLogger;
+
+    transport.send([item]);
+
+    expect(fetch).toHaveBeenCalledTimes(1);
+    expect(fetch).toHaveBeenCalledWith(
+      'http://example.com/collect',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: `Bearer ${mockSessionId}-token`,
+          'X-Static': 'static-value',
+        }),
+      })
+    );
+  });
+
   it('creates a new faro session if collector response indicates an invalid session', async () => {
     fetch.mockImplementationOnce(() =>
       Promise.resolve({

packages/web-sdk/src/transports/fetch/transport.ts

@@ -49,19 +49,24 @@ export class FetchTransport extends BaseTransport {
 
         const { url, requestOptions, apiKey } = this.options;
 
-        const { headers, ...restOfRequestOptions } = requestOptions ?? {};
+        const { headers = {}, ...restOfRequestOptions } = requestOptions ?? {};
 
         let sessionId;
         const sessionMeta = this.metas.value.session;
         if (sessionMeta != null) {
           sessionId = sessionMeta.id;
         }
 
+        const resolvedHeaders: Record<string, string> = {};
+        for (const [key, value] of Object.entries(headers)) {
+          resolvedHeaders[key] = typeof value === 'function' ? value() : value;
+        }
+
         return fetch(url, {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
-            ...(headers ?? {}),
+            ...resolvedHeaders,
             ...(apiKey ? { 'x-api-key': apiKey } : {}),
             ...(sessionId ? { 'x-faro-session-id': sessionId } : {}),
           },

packages/web-sdk/src/transports/fetch/types.ts

@@ -1,5 +1,11 @@
 export interface FetchTransportRequestOptions extends Omit<RequestInit, 'body' | 'headers'> {
-  headers?: Record<string, string>;
+  /**
+   * Headers to include in every request.
+   * Each value can be:
+   * - a string (static value)
+   * - a function returning a string (dynamic value)
+   */
+  headers?: Record<string, string | (() => string)>;
 }
 
 export interface FetchTransportOptions {