c

kloudmate · Apr 22, 2024 · f67e6e6 · f67e6e6
1 parent 87947cf
commit f67e6e6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/packages/session-recorder/src/index.ts b/packages/session-recorder/src/index.ts
@@ -152,7 +152,7 @@ const SplunkRumRecorder = {
 
     const headers = {};
     if (apiToken) {
-      headers['X-SF-Token'] = apiToken;
+      headers['authorization'] = apiToken;
     }
 
     if (rumAccessToken) {

diff --git a/packages/web/src/exporters/common.ts b/packages/web/src/exporters/common.ts
@@ -22,6 +22,7 @@ export interface SplunkExporterConfig {
   onAttributesSerializing?: (attributes: Attributes, span: ReadableSpan) => Attributes,
   xhrSender?: (url: string, data: string, headers?: Record<string, string>) => void,
   beaconSender?: (url: string, data: string, headers?: Record<string, string>) => void,
+  apiToken?: string;
 }
 
 export function NOOP_ATTRIBUTES_TRANSFORMER(attributes: Attributes): Attributes {

diff --git a/packages/web/src/exporters/otlp.ts b/packages/web/src/exporters/otlp.ts
@@ -24,10 +24,12 @@ export class SplunkOTLPTraceExporter extends OTLPTraceExporter {
   protected readonly _onAttributesSerializing: SplunkExporterConfig['onAttributesSerializing'];
   protected readonly _xhrSender: SplunkExporterConfig['xhrSender'] = NATIVE_XHR_SENDER;
   protected readonly _beaconSender: SplunkExporterConfig['beaconSender'] = typeof navigator !== 'undefined' && navigator.sendBeacon ? NATIVE_BEACON_SENDER : undefined;
+  private readonly apiToken: string;
 
   constructor(options: SplunkExporterConfig) {
     super(options);
     this._onAttributesSerializing = options.onAttributesSerializing || NOOP_ATTRIBUTES_TRANSFORMER;
+    this.apiToken = options.apiToken as string;
   }
 
   convert(spans: ReadableSpan[]): IExportTraceServiceRequest {
@@ -61,7 +63,8 @@ export class SplunkOTLPTraceExporter extends OTLPTraceExporter {
         // need to test with actual ingest
         Accept: 'application/json',
         'Content-Type': 'application/json',
-        ...this.headers
+        authorization: this.apiToken,
+        ...this.headers,
       });
     }
 

diff --git a/packages/web/src/exporters/zipkin.ts b/packages/web/src/exporters/zipkin.ts
@@ -70,31 +70,35 @@ export class SplunkZipkinExporter implements SpanExporter {
   private readonly _onAttributesSerializing: SplunkExporterConfig['onAttributesSerializing'];
   private readonly _xhrSender: SplunkExporterConfig['xhrSender'];
   private readonly _beaconSender: SplunkExporterConfig['beaconSender'];
+  private readonly apiToken: string;
 
   constructor({
     url,
     onAttributesSerializing = NOOP_ATTRIBUTES_TRANSFORMER,
     xhrSender = NATIVE_XHR_SENDER,
     beaconSender = NATIVE_BEACON_SENDER,
+    apiToken,
   }: SplunkExporterConfig) {
     this.beaconUrl = url;
     this._onAttributesSerializing = onAttributesSerializing;
     this._xhrSender = xhrSender;
     this._beaconSender = beaconSender;
+    this.apiToken = apiToken as string;
   }
 
   export(
     spans: ReadableSpan[],
     resultCallback: (result: ExportResult) => void
   ): void {
-    const zspans = spans.map(span => this._mapToZipkinSpan(span));
+    const zspans = spans.map((span) => this._mapToZipkinSpan(span));
     const zJson = JSON.stringify(zspans);
     if (document.hidden && this._beaconSender && zJson.length <= 64000) {
       this._beaconSender(this.beaconUrl, zJson);
     } else {
       this._xhrSender!(this.beaconUrl, zJson, {
         Accept: '*/*',
         'Content-Type': 'text/plain;charset=UTF-8',
+        authorization: this.apiToken,
       });
     }
     resultCallback({ code: ExportResultCode.SUCCESS });

diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
@@ -186,6 +186,8 @@ export interface SplunkOtelWebConfig {
    * Config options passed to web tracer
    */
   tracer?: WebTracerConfig;
+
+  apiToken?: string;
 }
 
 interface SplunkOtelWebConfigInternal extends SplunkOtelWebConfig {
@@ -274,8 +276,9 @@ function buildExporter(options: SplunkOtelWebConfigInternal) {
   const url = options.beaconEndpoint + (options.rumAccessToken ? '?auth='+options.rumAccessToken : '');
   return options.exporter.factory({
     url,
-    otlp: options.exporter.otlp,
+    otlp: true,
     onAttributesSerializing: options.exporter.onAttributesSerializing,
+    apiToken: options.apiToken,
   });
 }