fix sigv4 tests

Author: liustve

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

@@ -608,7 +608,7 @@ export class AwsSpanProcessorProvider {
       case 'http/protobuf':
         if (otlpExporterTracesEndpoint && isAwsOtlpEndpoint(otlpExporterTracesEndpoint, 'xray')) {
           diag.debug('Detected XRay OTLP Traces endpoint. Switching exporter to OtlpAwsSpanExporter');
-          return new OTLPAwsSpanExporter(otlpExporterTracesEndpoint);
+          return new OTLPAwsSpanExporter(otlpExporterTracesEndpoint, { compression: CompressionAlgorithm.GZIP });
         }
         return new OTLPProtoTraceExporter();
       case 'udp':
@@ -618,7 +618,7 @@ export class AwsSpanProcessorProvider {
         diag.warn(`Unsupported OTLP traces protocol: ${protocol}. Using http/protobuf.`);
         if (otlpExporterTracesEndpoint && isAwsOtlpEndpoint(otlpExporterTracesEndpoint, 'xray')) {
           diag.debug('Detected XRay OTLP Traces endpoint. Switching exporter to OtlpAwsSpanExporter');
-          return new OTLPAwsSpanExporter(otlpExporterTracesEndpoint);
+          return new OTLPAwsSpanExporter(otlpExporterTracesEndpoint, { compression: CompressionAlgorithm.GZIP });
         }
         return new OTLPProtoTraceExporter();
     }

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

@@ -26,35 +26,30 @@ if (getNodeVersion() >= 16) {
 const SIG_V4_HEADERS = ['x-amz-date', 'authorization', 'x-amz-content-sha256', 'x-amz-security-token'];
 
 export class AwsAuthenticator {
+  private endpoint: URL;
   private region: string;
   private service: string;
 
-  constructor(region: string, service: string) {
-    this.region = region;
+  constructor(endpoint: string, service: string) {
+    this.endpoint = new URL(endpoint);
+    this.region = endpoint.split('.')[1];
     this.service = service;
   }
 
-  public async authenticate(endpoint: string, headers: Record<string, string>, serializedData: Uint8Array | undefined) {
+  public async authenticate(headers: Record<string, string>, serializedData: Uint8Array | undefined) {
     // Only do SigV4 Signing if the required dependencies are installed.
-    if (dependenciesLoaded) {
-      const url = new URL(endpoint);
-
-      if (serializedData === undefined) {
-        diag.error('Given serialized data is undefined. Not authenticating.');
-        return headers;
-      }
-
+    if (dependenciesLoaded && serializedData) {
       const cleanedHeaders = this.removeSigV4Headers(headers);
 
       const request = new HttpRequest({
         method: 'POST',
         protocol: 'https',
-        hostname: url.hostname,
-        path: url.pathname,
+        hostname: this.endpoint.hostname,
+        path: this.endpoint.pathname,
         body: serializedData,
         headers: {
           ...cleanedHeaders,
-          host: url.hostname,
+          host: this.endpoint.hostname,
         },
       });
 
@@ -74,6 +69,7 @@ export class AwsAuthenticator {
       }
     }
 
+    diag.debug('Given serialized data is undefined. Not authenticating.');
     return headers;
   }
 

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

@@ -21,7 +21,6 @@ import { diag } from '@opentelemetry/api';
 export class OTLPAwsLogExporter extends OTLPProtoLogExporter {
   private compression: CompressionAlgorithm | undefined;
   private endpoint: string;
-  private region: string;
   private serializer: PassthroughSerializer<IExportLogsServiceResponse>;
   private authenticator: AwsAuthenticator;
 
@@ -34,9 +33,8 @@ export class OTLPAwsLogExporter extends OTLPProtoLogExporter {
 
     super(modifiedConfig);
     this.compression = config?.compression;
-    this.region = endpoint.split('.')[1];
     this.endpoint = endpoint;
-    this.authenticator = new AwsAuthenticator(this.region, 'logs');
+    this.authenticator = new AwsAuthenticator(this.endpoint, 'logs');
 
     // This is used in order to prevent serializing and compressing the data twice. Once for signing Sigv4 and
     // once when we pass the data to super.export() which will serialize and compress the data again.
@@ -84,7 +82,7 @@ export class OTLPAwsLogExporter extends OTLPProtoLogExporter {
         delete headers['Content-Encoding'];
       }
 
-      const signedRequestHeaders = await this.authenticator.authenticate(this.endpoint, headers, serializedLogs);
+      const signedRequestHeaders = await this.authenticator.authenticate(headers, serializedLogs);
 
       if ('authorization' in signedRequestHeaders) {
         this['_delegate']._transport._transport._parameters.headers = () => signedRequestHeaders;

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

@@ -21,7 +21,6 @@ import { diag } from '@opentelemetry/api';
 export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
   private compression: CompressionAlgorithm | undefined;
   private endpoint: string;
-  private region: string;
   private serializer: PassthroughSerializer<IExportTraceServiceResponse>;
   private authenticator: AwsAuthenticator;
 
@@ -33,9 +32,8 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
     };
 
     super(modifiedConfig);
-    this.region = endpoint.split('.')[1];
     this.endpoint = endpoint;
-    this.authenticator = new AwsAuthenticator(this.region, 'xray');
+    this.authenticator = new AwsAuthenticator(this.endpoint, 'xray');
 
     // This is used in order to prevent serializing and compressing the data twice. Once for signing Sigv4 and
     // once when we pass the data to super.export() which will serialize and compress the data again.
@@ -81,7 +79,7 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
         delete headers['Content-Encoding'];
       }
 
-      const signedRequestHeaders = await this.authenticator.authenticate(this.endpoint, headers, serializedSpans);
+      const signedRequestHeaders = await this.authenticator.authenticate(headers, serializedSpans);
 
       if ('authorization' in signedRequestHeaders) {
         this['_delegate']._transport._transport._parameters.headers = () => signedRequestHeaders;

aws-distro-opentelemetry-node-autoinstrumentation/test/exporter/otlp/aws/common/aws-authenticator.test.ts

@@ -54,8 +54,7 @@ describe('AwsAuthenticator', () => {
 
         const { AwsAuthenticator: MockThrowableModuleAuthenticator } = require(AWS_AUTH_PATH);
 
-        const result = await new MockThrowableModuleAuthenticator('us-east-1', 'xray').authenticate(
-          AWS_OTLP_TRACES_ENDPOINT,
+        const result = await new MockThrowableModuleAuthenticator(AWS_OTLP_TRACES_ENDPOINT, 'xray').authenticate(
           {},
           new Uint8Array()
         );
@@ -68,8 +67,8 @@ describe('AwsAuthenticator', () => {
   });
 
   it('should not inject SigV4 Headers if serialized data is undefined', async () => {
-    const authenticator = new AwsAuthenticator('us-east-1', 'xray');
-    const result = await authenticator.authenticate(AWS_OTLP_TRACES_ENDPOINT, {}, undefined);
+    const authenticator = new AwsAuthenticator(AWS_OTLP_TRACES_ENDPOINT, 'xray');
+    const result = await authenticator.authenticate({}, undefined);
 
     expect(result).not.toHaveProperty(AUTHORIZATION_HEADER);
     expect(result).not.toHaveProperty(X_AMZ_DATE_HEADER);
@@ -99,8 +98,7 @@ describe('AwsAuthenticator', () => {
       },
     }).AwsAuthenticator;
 
-    const result = await new AwsAuthenticatorWithMock('us-east-1', 'xray').authenticate(
-      AWS_OTLP_TRACES_ENDPOINT,
+    const result = await new AwsAuthenticatorWithMock(AWS_OTLP_TRACES_ENDPOINT, 'xray').authenticate(
       { test: 'test' },
       new Uint8Array()
     );
@@ -149,8 +147,7 @@ describe('AwsAuthenticator', () => {
       },
     }).AwsAuthenticator;
 
-    const result = await new AwsAuthenticatorWithMock('us-east-1', 'xray').authenticate(
-      AWS_OTLP_TRACES_ENDPOINT,
+    const result = await new AwsAuthenticatorWithMock(AWS_OTLP_TRACES_ENDPOINT, 'xray').authenticate(
       notExpected,
       new Uint8Array()
     );

aws-distro-opentelemetry-node-autoinstrumentation/test/exporter/otlp/aws/logs/otlp-aws-log-exporter.test.ts

@@ -36,7 +36,7 @@ describe('OTLPAwsLogExporter', () => {
       '../common/aws-authenticator': {
         AwsAuthenticator: class MockAwsAuthenticator {
           constructor() {}
-          async authenticate(endpoint: string, headers: Record<string, string>) {
+          async authenticate(headers: Record<string, string>, serializedData: Uint8Array | undefined) {
             return {
               ...headers,
               [AUTHORIZATION_HEADER]: EXPECTED_AUTH_HEADER,
@@ -61,6 +61,7 @@ describe('OTLPAwsLogExporter', () => {
       .then(() => {
         scope.on('request', (req, interceptor, body) => {
           const headers = req.headers;
+          console.log('SDJASDJAJSDAJSDJJDAJSDJAS' + JSON.stringify(req.headers));
           expect(headers).toHaveProperty(AUTHORIZATION_HEADER.toLowerCase());
           expect(headers).toHaveProperty(X_AMZ_SECURITY_TOKEN_HEADER.toLowerCase());
           expect(headers).toHaveProperty(X_AMZ_DATE_HEADER.toLowerCase());

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

@@ -35,7 +35,7 @@ describe('OTLPAwsSpanExporter', () => {
       '../common/aws-authenticator': {
         AwsAuthenticator: class MockAwsAuthenticator {
           constructor() {}
-          async authenticate(endpoint: string, headers: Record<string, string>) {
+          async authenticate(headers: Record<string, string>, serializedData: Uint8Array | undefined) {
             return {
               ...headers,
               [AUTHORIZATION_HEADER]: EXPECTED_AUTH_HEADER,