@grafana/faro-react-native-tracing 1.3.0 → 2.0.0

package/dist/esm/processors/httpRequestMonitorSpanProcessor.js

@@ -1,4 +1,7 @@
+import { hrTimeToMilliseconds } from '@opentelemetry/core';
 import { notifyHttpRequestEnd, notifyHttpRequestStart, } from '@grafana/faro-react-native';
+import { captureFetchUserAction } from '../instrumentations/instrumentationUtils';
+// Optional XHR instrumentation still emits these attributes.
 const ATTR_HTTP_METHOD = 'http.method';
 const ATTR_HTTP_STATUS_CODE = 'http.status_code';
 const ATTR_HTTP_URL = 'http.url';
@@ -27,7 +30,16 @@ function getAttr(span, key) {
  * Check if a span is an HTTP span (from FetchInstrumentation).
  */
 function isHttpSpan(span) {
-    return getAttr(span, ATTR_HTTP_URL) != null || getAttr(span, ATTR_HTTP_METHOD) != null;
+    // url.full is shared by non-HTTP spans; stable HTTP spans identify their method at creation.
+    return getHttpMethod(span) != null || getAttr(span, ATTR_HTTP_URL) != null;
+}
+function getHttpUrl(span) {
+    var _a;
+    return (_a = getAttr(span, 'url.full')) !== null && _a !== void 0 ? _a : getAttr(span, ATTR_HTTP_URL);
+}
+function getHttpMethod(span) {
+    var _a;
+    return (_a = getAttr(span, 'http.request.method')) !== null && _a !== void 0 ? _a : getAttr(span, ATTR_HTTP_METHOD);
 }
 /**
  * SpanProcessor that notifies httpRequestMonitor when HTTP spans start and end.
@@ -44,10 +56,15 @@ export class HttpRequestMonitorSpanProcessor {
     onStart(span, parentContext) {
         var _a, _b;
         if (isHttpSpan(span)) {
-            const url = (_a = getAttr(span, ATTR_HTTP_URL)) !== null && _a !== void 0 ? _a : '';
-            const method = (_b = getAttr(span, ATTR_HTTP_METHOD)) !== null && _b !== void 0 ? _b : 'GET';
+            // Capture before notifyStart changes Started to Halted. New requests while
+            // already Halted are not tracked by the controller and must not inherit it.
+            if (span.instrumentationScope.name === '@opentelemetry/instrumentation-fetch') {
+                captureFetchUserAction(span);
+            }
+            const url = (_a = getHttpUrl(span)) !== null && _a !== void 0 ? _a : '';
+            const method = (_b = getHttpMethod(span)) !== null && _b !== void 0 ? _b : 'GET';
             const requestId = span.spanContext().spanId;
-            const startTimeMs = Date.now();
+            const startTimeMs = hrTimeToMilliseconds(span.startTime);
             const payload = {
                 requestId,
                 url,
@@ -59,18 +76,15 @@ export class HttpRequestMonitorSpanProcessor {
         this.processor.onStart(span, parentContext);
     }
     onEnd(span) {
-        var _a, _b;
+        var _a, _b, _c;
         if (isHttpSpan(span)) {
-            const url = (_a = getAttr(span, ATTR_HTTP_URL)) !== null && _a !== void 0 ? _a : '';
-            const method = (_b = getAttr(span, ATTR_HTTP_METHOD)) !== null && _b !== void 0 ? _b : 'GET';
+            const url = (_a = getHttpUrl(span)) !== null && _a !== void 0 ? _a : '';
+            const method = (_b = getHttpMethod(span)) !== null && _b !== void 0 ? _b : 'GET';
             const requestId = span.spanContext().spanId;
-            const statusAttr = getAttr(span, ATTR_HTTP_STATUS_CODE);
+            const statusAttr = (_c = getAttr(span, 'http.response.status_code')) !== null && _c !== void 0 ? _c : getAttr(span, ATTR_HTTP_STATUS_CODE);
             const status = statusAttr != null ? parseInt(statusAttr, 10) : undefined;
-            const spanWithTime = span;
-            const startNs = spanWithTime.startTimeUnixNano;
-            const endNs = spanWithTime.endTimeUnixNano;
-            const startTimeMs = startNs != null && !Number.isNaN(Number(startNs)) ? Number(startNs) / 1000000 : Date.now();
-            const endTimeMs = endNs != null && !Number.isNaN(Number(endNs)) ? Number(endNs) / 1000000 : Date.now();
+            const startTimeMs = hrTimeToMilliseconds(span.startTime);
+            const endTimeMs = hrTimeToMilliseconds(span.endTime);
             const payload = {
                 requestId,
                 url,

package/dist/esm/processors/httpRequestMonitorSpanProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpRequestMonitorSpanProcessor.js","sourceRoot":"","sources":["../../../src/processors/httpRequestMonitorSpanProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@opentelemetry/api';\nimport type { ReadableSpan, Span, SpanProcessor } from '@opentelemetry/sdk-trace-base';\n\nimport {\n  type HttpRequestMessagePayload,\n  notifyHttpRequestEnd,\n  notifyHttpRequestStart,\n} from '@grafana/faro-react-native';\n\nconst ATTR_HTTP_METHOD = 'http.method';\nconst ATTR_HTTP_STATUS_CODE = 'http.status_code';\nconst ATTR_HTTP_URL = 'http.url';\n\n/**\n * Get string attribute from span.\n * Handles both SDK attribute format and OTLP-style attribute values.\n */\nfunction getAttr(span: Span | ReadableSpan, key: string): string | undefined {\n  const attrs = span.attributes as Record<string, unknown> | undefined;\n  if (attrs == null) return undefined;\n  const raw = typeof attrs['get'] === 'function' ? (attrs as { get: (k: string) => unknown })['get'](key) : attrs[key];\n  if (raw == null) return undefined;\n  if (typeof raw === 'string') return raw.length > 0 ? raw : undefined;\n  if (typeof raw === 'object' && raw !== null && 'stringValue' in raw) {\n    const s = String((raw as { stringValue?: string }).stringValue ?? '');\n    return s.length > 0 ? s : undefined;\n  }\n  const str = String(raw);\n  return str.length > 0 ? str : undefined;\n}\n\n/**\n * Check if a span is an HTTP span (from FetchInstrumentation).\n */\nfunction isHttpSpan(span: Span | ReadableSpan): boolean {\n  return getAttr(span, ATTR_HTTP_URL) != null || getAttr(span, ATTR_HTTP_METHOD) != null;\n}\n\n/**\n * SpanProcessor that notifies httpRequestMonitor when HTTP spans start and end.\n *\n * This enables user action correlation (UserActionController halt logic) when\n * TracingInstrumentation is used instead of HttpInstrumentation.\n *\n * IMPORTANT: Must not use console or trigger any instrumentation to avoid loops.\n */\nexport class HttpRequestMonitorSpanProcessor implements SpanProcessor {\n  constructor(private readonly processor: SpanProcessor) {}\n\n  onStart(span: Span, parentContext: Context): void {\n    if (isHttpSpan(span)) {\n      const url = getAttr(span, ATTR_HTTP_URL) ?? '';\n      const method = getAttr(span, ATTR_HTTP_METHOD) ?? 'GET';\n      const requestId = span.spanContext().spanId;\n      const startTimeMs = Date.now();\n\n      const payload: HttpRequestMessagePayload = {\n        requestId,\n        url,\n        method,\n        startTime: startTimeMs,\n      };\n      notifyHttpRequestStart(payload);\n    }\n\n    this.processor.onStart(span, parentContext);\n  }\n\n  onEnd(span: ReadableSpan): void {\n    if (isHttpSpan(span)) {\n      const url = getAttr(span, ATTR_HTTP_URL) ?? '';\n      const method = getAttr(span, ATTR_HTTP_METHOD) ?? 'GET';\n      const requestId = span.spanContext().spanId;\n      const statusAttr = getAttr(span, ATTR_HTTP_STATUS_CODE);\n      const status = statusAttr != null ? parseInt(statusAttr, 10) : undefined;\n      const spanWithTime = span as ReadableSpan & {\n        startTimeUnixNano?: number | bigint;\n        endTimeUnixNano?: number | bigint;\n      };\n      const startNs = spanWithTime.startTimeUnixNano;\n      const endNs = spanWithTime.endTimeUnixNano;\n      const startTimeMs = startNs != null && !Number.isNaN(Number(startNs)) ? Number(startNs) / 1_000_000 : Date.now();\n      const endTimeMs = endNs != null && !Number.isNaN(Number(endNs)) ? Number(endNs) / 1_000_000 : Date.now();\n\n      const payload: HttpRequestMessagePayload = {\n        requestId,\n        url,\n        method,\n        startTime: startTimeMs,\n        endTime: endTimeMs,\n        status: !Number.isNaN(status) ? status : undefined,\n      };\n      notifyHttpRequestEnd(payload);\n    }\n\n    this.processor.onEnd(span);\n  }\n\n  forceFlush(): Promise<void> {\n    return this.processor.forceFlush();\n  }\n\n  shutdown(): Promise<void> {\n    return this.processor.shutdown();\n  }\n}\n"]}
+{"version":3,"file":"httpRequestMonitorSpanProcessor.js","sourceRoot":"","sources":["../../../src/processors/httpRequestMonitorSpanProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@opentelemetry/api';\nimport { hrTimeToMilliseconds } from '@opentelemetry/core';\nimport type { ReadableSpan, Span, SpanProcessor } from '@opentelemetry/sdk-trace-base';\n\nimport {\n  type HttpRequestMessagePayload,\n  notifyHttpRequestEnd,\n  notifyHttpRequestStart,\n} from '@grafana/faro-react-native';\n\nimport { captureFetchUserAction } from '../instrumentations/instrumentationUtils';\n\n// Optional XHR instrumentation still emits these attributes.\nconst ATTR_HTTP_METHOD = 'http.method';\nconst ATTR_HTTP_STATUS_CODE = 'http.status_code';\nconst ATTR_HTTP_URL = 'http.url';\n\n/**\n * Get string attribute from span.\n * Handles both SDK attribute format and OTLP-style attribute values.\n */\nfunction getAttr(span: Span | ReadableSpan, key: string): string | undefined {\n  const attrs = span.attributes as Record<string, unknown> | undefined;\n  if (attrs == null) return undefined;\n  const raw = typeof attrs['get'] === 'function' ? (attrs as { get: (k: string) => unknown })['get'](key) : attrs[key];\n  if (raw == null) return undefined;\n  if (typeof raw === 'string') return raw.length > 0 ? raw : undefined;\n  if (typeof raw === 'object' && raw !== null && 'stringValue' in raw) {\n    const s = String((raw as { stringValue?: string }).stringValue ?? '');\n    return s.length > 0 ? s : undefined;\n  }\n  const str = String(raw);\n  return str.length > 0 ? str : undefined;\n}\n\n/**\n * Check if a span is an HTTP span (from FetchInstrumentation).\n */\nfunction isHttpSpan(span: Span | ReadableSpan): boolean {\n  // url.full is shared by non-HTTP spans; stable HTTP spans identify their method at creation.\n  return getHttpMethod(span) != null || getAttr(span, ATTR_HTTP_URL) != null;\n}\n\nfunction getHttpUrl(span: Span | ReadableSpan): string | undefined {\n  return getAttr(span, 'url.full') ?? getAttr(span, ATTR_HTTP_URL);\n}\n\nfunction getHttpMethod(span: Span | ReadableSpan): string | undefined {\n  return getAttr(span, 'http.request.method') ?? getAttr(span, ATTR_HTTP_METHOD);\n}\n\n/**\n * SpanProcessor that notifies httpRequestMonitor when HTTP spans start and end.\n *\n * This enables user action correlation (UserActionController halt logic) when\n * TracingInstrumentation is used instead of HttpInstrumentation.\n *\n * IMPORTANT: Must not use console or trigger any instrumentation to avoid loops.\n */\nexport class HttpRequestMonitorSpanProcessor implements SpanProcessor {\n  constructor(private readonly processor: SpanProcessor) {}\n\n  onStart(span: Span, parentContext: Context): void {\n    if (isHttpSpan(span)) {\n      // Capture before notifyStart changes Started to Halted. New requests while\n      // already Halted are not tracked by the controller and must not inherit it.\n      if (span.instrumentationScope.name === '@opentelemetry/instrumentation-fetch') {\n        captureFetchUserAction(span);\n      }\n      const url = getHttpUrl(span) ?? '';\n      const method = getHttpMethod(span) ?? 'GET';\n      const requestId = span.spanContext().spanId;\n      const startTimeMs = hrTimeToMilliseconds(span.startTime);\n\n      const payload: HttpRequestMessagePayload = {\n        requestId,\n        url,\n        method,\n        startTime: startTimeMs,\n      };\n      notifyHttpRequestStart(payload);\n    }\n\n    this.processor.onStart(span, parentContext);\n  }\n\n  onEnd(span: ReadableSpan): void {\n    if (isHttpSpan(span)) {\n      const url = getHttpUrl(span) ?? '';\n      const method = getHttpMethod(span) ?? 'GET';\n      const requestId = span.spanContext().spanId;\n      const statusAttr = getAttr(span, 'http.response.status_code') ?? getAttr(span, ATTR_HTTP_STATUS_CODE);\n      const status = statusAttr != null ? parseInt(statusAttr, 10) : undefined;\n      const startTimeMs = hrTimeToMilliseconds(span.startTime);\n      const endTimeMs = hrTimeToMilliseconds(span.endTime);\n\n      const payload: HttpRequestMessagePayload = {\n        requestId,\n        url,\n        method,\n        startTime: startTimeMs,\n        endTime: endTimeMs,\n        status: !Number.isNaN(status) ? status : undefined,\n      };\n      notifyHttpRequestEnd(payload);\n    }\n\n    this.processor.onEnd(span);\n  }\n\n  forceFlush(): Promise<void> {\n    return this.processor.forceFlush();\n  }\n\n  shutdown(): Promise<void> {\n    return this.processor.shutdown();\n  }\n}\n"]}

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Attributes, ContextManager, TextMapPropagator } from '@opentelemetry/api';\nimport type { Instrumentation } from '@opentelemetry/instrumentation';\nimport type { FetchCustomAttributeFunction } from '@opentelemetry/instrumentation-fetch';\nimport type { XHRCustomAttributeFunction } from '@opentelemetry/instrumentation-xml-http-request';\nimport type { SpanProcessor } from '@opentelemetry/sdk-trace-base';\n\nimport type { API, Patterns } from '@grafana/faro-core';\n\nexport type InstrumentationOption = Instrumentation | Instrumentation[];\n\nexport interface FaroTraceExporterConfig {\n  api: API;\n}\n\nexport interface TracingInstrumentationOptions {\n  resourceAttributes?: Attributes;\n  propagator?: TextMapPropagator;\n  contextManager?: ContextManager;\n  instrumentations?: InstrumentationOption[];\n  spanProcessor?: SpanProcessor;\n  instrumentationOptions?: Omit<DefaultInstrumentationsOptions, 'ignoreUrls'>;\n}\n\nexport type MatchUrlDefinitions = Patterns;\n\nexport type DefaultInstrumentationsOptions = {\n  ignoreUrls?: MatchUrlDefinitions;\n  propagateTraceHeaderCorsUrls?: MatchUrlDefinitions;\n  enableFetchInstrumentation?: boolean;\n  enableXhrInstrumentation?: boolean;\n\n  fetchInstrumentationOptions?: {\n    applyCustomAttributesOnSpan?: FetchCustomAttributeFunction;\n    ignoreNetworkEvents?: boolean;\n  };\n\n  xhrInstrumentationOptions?: {\n    applyCustomAttributesOnSpan?: XHRCustomAttributeFunction;\n    ignoreNetworkEvents?: boolean;\n  };\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Attributes, ContextManager, TextMapPropagator } from '@opentelemetry/api';\nimport type { Instrumentation } from '@opentelemetry/instrumentation';\nimport type { FetchCustomAttributeFunction } from '@opentelemetry/instrumentation-fetch';\nimport type { XHRCustomAttributeFunction } from '@opentelemetry/instrumentation-xml-http-request';\nimport type { SpanProcessor } from '@opentelemetry/sdk-trace-base';\n\nimport type { API, Patterns } from '@grafana/faro-core';\n\nexport type InstrumentationOption = Instrumentation | Instrumentation[];\n\nexport interface FaroTraceExporterConfig {\n  api: API;\n}\n\nexport interface TracingInstrumentationOptions {\n  resourceAttributes?: Attributes;\n  propagator?: TextMapPropagator;\n  contextManager?: ContextManager;\n  instrumentations?: InstrumentationOption[];\n  /**\n   * A caller-supplied processor. Faro removal flushes it so the tracing instrumentation can be re-added;\n   * TracingInstrumentation.shutdown() shuts it down and is terminal for that processor.\n   */\n  spanProcessor?: SpanProcessor;\n  instrumentationOptions?: Omit<DefaultInstrumentationsOptions, 'ignoreUrls'>;\n}\n\nexport type MatchUrlDefinitions = Patterns;\n\nexport type DefaultInstrumentationsOptions = {\n  ignoreUrls?: MatchUrlDefinitions;\n  propagateTraceHeaderCorsUrls?: MatchUrlDefinitions;\n  enableFetchInstrumentation?: boolean;\n  enableXhrInstrumentation?: boolean;\n\n  fetchInstrumentationOptions?: {\n    applyCustomAttributesOnSpan?: FetchCustomAttributeFunction;\n    ignoreNetworkEvents?: boolean;\n  };\n\n  xhrInstrumentationOptions?: {\n    applyCustomAttributesOnSpan?: XHRCustomAttributeFunction;\n    ignoreNetworkEvents?: boolean;\n  };\n};\n"]}

package/dist/types/instrumentation.d.ts

@@ -31,7 +31,10 @@ export declare class TracingInstrumentation extends BaseInstrumentation {
     name: string;
     version: string;
     static SCHEDULED_BATCH_DELAY_MS: number;
-    private provider?;
+    private activeRegistration?;
+    private defaultInstrumentations?;
+    private pendingShutdowns;
+    private suppliedSpanProcessorShutdown?;
     constructor(options?: TracingInstrumentationOptions);
     initialize(): void;
     /**
@@ -39,8 +42,13 @@ export declare class TracingInstrumentation extends BaseInstrumentation {
      * CRITICAL: This prevents infinite loops where trace exports trigger more traces
      */
     private getIgnoreUrls;
-    /**
-     * Shutdown the tracer provider
-     */
+    private detachRegistration;
+    private runCleanup;
+    private logCleanupError;
+    private startProviderShutdown;
+    private startSuppliedSpanProcessorShutdown;
+    /** Detach request instrumentations and wait for the tracer provider to flush. */
     shutdown(): Promise<void>;
+    /** Detach synchronously when Faro removes this instrumentation. */
+    destroy(): void;
 }

package/dist/types/instrumentations/getDefaultOTELInstrumentations.d.ts

@@ -1,3 +1,4 @@
+import type { Instrumentation } from '@opentelemetry/instrumentation';
 import type { DefaultInstrumentationsOptions, InstrumentationOption } from '../types';
 /**
  * Get default OTEL instrumentations for React Native
@@ -15,3 +16,4 @@ import type { DefaultInstrumentationsOptions, InstrumentationOption } from '../t
  * @returns Array of OTEL instrumentations
  */
 export declare function getDefaultOTELInstrumentations(options?: DefaultInstrumentationsOptions): InstrumentationOption[];
+export declare function updateDefaultOTELInstrumentations(instrumentations: Instrumentation[], options?: DefaultInstrumentationsOptions): void;

package/dist/types/instrumentations/instrumentationUtils.d.ts

@@ -1,6 +1,8 @@
 import type { Span } from '@opentelemetry/api';
 import type { FetchCustomAttributeFunction } from '@opentelemetry/instrumentation-fetch';
 import type { XHRCustomAttributeFunction } from '@opentelemetry/instrumentation-xml-http-request';
+/** Capture request ownership at start, before the monitor can halt the action. */
+export declare function captureFetchUserAction(span: Span): void;
 /**
  * Set span status to ERROR when fetch fails
  *

package/dist/types/types.d.ts

@@ -13,6 +13,10 @@ export interface TracingInstrumentationOptions {
     propagator?: TextMapPropagator;
     contextManager?: ContextManager;
     instrumentations?: InstrumentationOption[];
+    /**
+     * A caller-supplied processor. Faro removal flushes it so the tracing instrumentation can be re-added;
+     * TracingInstrumentation.shutdown() shuts it down and is terminal for that processor.
+     */
     spanProcessor?: SpanProcessor;
     instrumentationOptions?: Omit<DefaultInstrumentationsOptions, 'ignoreUrls'>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/faro-react-native-tracing",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Faro React Native tracing implementation with OpenTelemetry.",
   "keywords": [
     "observability",
@@ -51,18 +51,18 @@
     "quality:circular-deps": "madge --circular ."
   },
   "dependencies": {
-    "@grafana/faro-core": "^2.7.0",
-    "@grafana/faro-react-native": "^1.3.0",
+    "@grafana/faro-core": "^2.8.2",
+    "@grafana/faro-react-native": "^1.4.0",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/instrumentation": "^0.208.0",
-    "@opentelemetry/instrumentation-fetch": "^0.208.0",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.208.0",
-    "@opentelemetry/otlp-transformer": "^0.208.0",
-    "@opentelemetry/resources": "^2.0.0",
-    "@opentelemetry/sdk-trace-base": "^2.0.0",
-    "@opentelemetry/sdk-trace-web": "^2.0.0",
-    "@opentelemetry/semantic-conventions": "^1.32.0"
+    "@opentelemetry/core": "^2.9.0",
+    "@opentelemetry/instrumentation": "^0.220.0",
+    "@opentelemetry/instrumentation-fetch": "^0.220.0",
+    "@opentelemetry/instrumentation-xml-http-request": "^0.220.0",
+    "@opentelemetry/otlp-transformer": "^0.220.0",
+    "@opentelemetry/resources": "^2.9.0",
+    "@opentelemetry/sdk-trace-base": "^2.9.0",
+    "@opentelemetry/sdk-trace-web": "^2.9.0",
+    "@opentelemetry/semantic-conventions": "^1.43.0"
   },
   "peerDependencies": {
     "react-native": ">=0.70.0"
@@ -74,5 +74,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7cd0482f59a7eefad5a812e468d259e17ad39ed6"
+  "gitHead": "38d87a3474585e1177c38d2e9acd04860a4236e6"
 }

package/src/exporters/faroTraceExporter.events.test.ts

@@ -0,0 +1,90 @@
+import type { IResourceSpans } from '@opentelemetry/otlp-transformer/build/src/trace/internal-types';
+
+import { initializeFaro, TransportItemType } from '@grafana/faro-core';
+import type { Config, EventEvent } from '@grafana/faro-core';
+import { mockConfig, MockTransport } from '@grafana/faro-test-utils';
+
+import { sendFaroEvents as send } from './faroTraceExporter.utils';
+
+function fixture(paths = ['/same']): IResourceSpans[] {
+  return [
+    {
+      scopeSpans: [
+        {
+          scope: { name: '@opentelemetry/instrumentation-fetch' },
+          spans: paths.map((path, i) => ({
+            kind: 3,
+            traceId: 'trace',
+            spanId: String(i),
+            startTimeUnixNano: '1000000000',
+            endTimeUnixNano: '1001000000',
+            attributes: Object.entries({
+              'http.request.method': 'GET',
+              'url.full': 'https://example.com' + path,
+              'http.response.status_code': '200',
+              'server.address': 'example.com',
+            }).map(([key, value]) => ({ key, value: { stringValue: value } })),
+          })),
+        },
+      ],
+    },
+  ] as unknown as IResourceSpans[];
+}
+
+describe('span-derived event pipeline', () => {
+  function setup(beforeSend?: Config['beforeSend']) {
+    const transport = new MockTransport();
+    const faro = initializeFaro(
+      mockConfig({ transports: [transport], dedupe: true, ...(beforeSend ? { beforeSend } : {}) })
+    );
+    const events = () =>
+      transport.items.filter((item) => item.type === TransportItemType.EVENT).map((item) => item.payload as EventEvent);
+    return { transport, faro, events };
+  }
+  it('keeps payment-failed, fetch, payment-failed', () => {
+    const { faro, events } = setup();
+    faro.api.pushEvent('payment-failed');
+    send(fixture());
+    faro.api.pushEvent('payment-failed');
+    expect(events().map((e) => e.name)).toEqual(['payment-failed', 'faro.tracing.fetch', 'payment-failed']);
+  });
+  it('keeps fetch, other event, identical fetch', () => {
+    const { faro, events } = setup();
+    send(fixture());
+    faro.api.pushEvent('other-event');
+    send(fixture());
+    expect(events().map((e) => e.name)).toEqual(['faro.tracing.fetch', 'other-event', 'faro.tracing.fetch']);
+  });
+  it('continues after a throwing beforeSend hook', () => {
+    const { events } = setup((item) => {
+      if (
+        item.type === TransportItemType.EVENT &&
+        (item.payload as EventEvent).attributes?.['http.url'] === 'https://example.com/first'
+      )
+        throw new Error('test hook failure');
+      return item;
+    });
+    send(fixture(['/first', '/second', '/third']));
+    expect(events().map((e) => e.attributes?.['http.url'])).toEqual([
+      'https://example.com/second',
+      'https://example.com/third',
+    ]);
+  });
+  it('continues after a throwing transport', () => {
+    const { transport, events } = setup();
+    const originalSend = transport.send.bind(transport);
+    let first = true;
+    transport.send = (...args: Parameters<typeof transport.send>) => {
+      if (first) {
+        first = false;
+        throw new Error('test transport failure');
+      }
+      return originalSend(...args);
+    };
+    send(fixture(['/first', '/second', '/third']));
+    expect(events().map((e) => e.attributes?.['http.url'])).toEqual([
+      'https://example.com/second',
+      'https://example.com/third',
+    ]);
+  });
+});

package/src/exporters/faroTraceExporter.ts

@@ -1,5 +1,6 @@
 import { ExportResultCode } from '@opentelemetry/core';
 import type { ExportResult } from '@opentelemetry/core';
+import { JSON_ENCODER } from '@opentelemetry/otlp-transformer/build/src/common/utils';
 import { createExportTraceServiceRequest } from '@opentelemetry/otlp-transformer/build/src/trace/internal';
 import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 
@@ -35,7 +36,7 @@ export class FaroTraceExporter implements SpanExporter {
 
     try {
       // Convert spans to OTLP format
-      const traceEvent = createExportTraceServiceRequest(spans, { useHex: true, useLongBits: false });
+      const traceEvent = createExportTraceServiceRequest(spans, JSON_ENCODER);
 
       // Send traces to Faro
       this.config.api.pushTraces(traceEvent);

package/src/exporters/faroTraceExporter.utils.ts

@@ -7,6 +7,34 @@ import type { EventAttributes as FaroEventAttributes } from '@grafana/faro-core'
 const internalLogger = createInternalLogger();
 
 const DURATION_NS_KEY = 'duration_ns';
+/** Map stable OTel span attributes to Faro's fetch event contract. */
+function projectFetchEventAttributes(attributes: FaroEventAttributes): void {
+  const fields = {
+    'http.request.method': 'http.method',
+    'url.full': 'http.url',
+    'http.response.status_code': 'http.status_code',
+  };
+  for (const [spanField, eventField] of Object.entries(fields)) {
+    if (attributes[spanField] != null) {
+      attributes[eventField] = attributes[spanField];
+      delete attributes[spanField];
+    }
+  }
+
+  const url = attributes['http.url'];
+  if (url) {
+    try {
+      const parsed = new URL(url);
+      attributes['http.host'] = attributes['http.host'] ?? parsed.host;
+      attributes['http.scheme'] = attributes['http.scheme'] ?? parsed.protocol.replace(':', '');
+    } catch {
+      // Keep the captured URL even if it cannot supply host/scheme metadata.
+    }
+  }
+  delete attributes['server.address'];
+  delete attributes['server.port'];
+  attributes['component'] = attributes['component'] ?? 'fetch';
+}
 
 /**
  * Send Faro events for CLIENT spans (HTTP requests, navigation, etc.)
@@ -48,6 +76,10 @@ export function sendFaroEvents(resourceSpans: IResourceSpans[] = []) {
             faroEventAttributes[attribute.key] = String(Object.values(attribute.value)[0]);
           }
 
+          if (scope?.name === '@opentelemetry/instrumentation-fetch') {
+            projectFetchEventAttributes(faroEventAttributes);
+          }
+
           // Add span duration in nanoseconds
           if (!Number.isNaN(span.endTimeUnixNano) && !Number.isNaN(span.startTimeUnixNano)) {
             faroEventAttributes[DURATION_NS_KEY] = String(