fixed issue where sigv4 headers were not cleaned after each export request

Author: liustve

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts

@@ -448,6 +448,7 @@ export class AwsSpanProcessorProvider {
         return new OTLPHttpTraceExporter();
       case 'http/protobuf':
         if (otlp_exporter_traces_endpoint && isXrayOtlpEndpoint(otlp_exporter_traces_endpoint)) {
+          diag.debug('Detected XRay OTLP Traces endpoint. Switching exporter to OtlpAwsSpanExporter');
           return new OTLPAwsSpanExporter(otlp_exporter_traces_endpoint);
         }
         return new OTLPProtoTraceExporter();
@@ -457,6 +458,7 @@ export class AwsSpanProcessorProvider {
       default:
         diag.warn(`Unsupported OTLP traces protocol: ${protocol}. Using http/protobuf.`);
         if (otlp_exporter_traces_endpoint && isXrayOtlpEndpoint(otlp_exporter_traces_endpoint)) {
+          diag.debug('Detected XRay OTLP Traces endpoint. Switching exporter to OtlpAwsSpanExporter');
           return new OTLPAwsSpanExporter(otlp_exporter_traces_endpoint);
         }
         return new OTLPProtoTraceExporter();
@@ -672,3 +674,4 @@ function isXrayOtlpEndpoint(otlpEndpoint: string | undefined) {
 }
 
 // END The OpenTelemetry Authors code
+

aws-distro-opentelemetry-node-autoinstrumentation/src/otlp-aws-span-exporter.ts

@@ -66,7 +66,7 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
           path: url.pathname,
           body: serializedSpans,
           headers: {
-            ...oldHeaders,
+            ...this.removeSigV4Headers(oldHeaders),
             host: url.hostname,
           },
         });
@@ -93,6 +93,18 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
     await super.export(items, resultCallback);
   }
 
+  // Need to ensure old SigV4 headers do not remain when we inject new SigV4 authorization headers.
+  private removeSigV4Headers(headers: Record<string, string>) {
+    const newHeaders: Record<string, string> = {};
+
+    for (const key in headers) {
+      if (!key.toLowerCase().startsWith('x-amz-') && key.toLowerCase() !== 'authorization') {
+        newHeaders[key] = headers[key];
+      }
+    }
+    return newHeaders;
+  }
+
   private initDependencies(): any {
     if (getNodeVersion() < 16) {
       diag.error('SigV4 signing requires atleast Node major version 16');
@@ -127,3 +139,4 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
     return newConfig;
   }
 }
+