feat: moved EnvService to commons + exposed getXrayTraceId in tracer

Author: dreamorosi

packages/commons/src/config/ConfigService.ts

@@ -0,0 +1,37 @@
+/**
+ * Abstract class ConfigService
+ *
+ * This class defines common methods and variables that can be set by the developer
+ * in the runtime.
+ *
+ * @class
+ * @abstract
+ */
+abstract class ConfigService {
+
+  /**
+   * @see https://awslabs.github.io/aws-lambda-powertools-typescript/latest/#environment-variables
+   * @protected
+   */
+  protected serviceNameVariable = 'POWERTOOLS_SERVICE_NAME';
+
+  /**
+   * It returns the value of an environment variable that has given name.
+   *
+   * @param {string} name
+   * @returns {string}
+   */
+  public abstract get(name: string): string;
+
+  /**
+   * It returns the value of the POWERTOOLS_SERVICE_NAME environment variable.
+   *
+   * @returns {string}
+   */
+  public abstract getServiceName(): string;
+
+}
+
+export {
+  ConfigService,
+};

packages/commons/src/config/EnvironmentVariablesService.ts

@@ -0,0 +1,60 @@
+import { ConfigService } from '.';
+
+/**
+ * Class EnvironmentVariablesService
+ *
+ * This class is used to return environment variables that are available in the runtime of
+ * the current Lambda invocation.
+ * These variables can be a mix of runtime environment variables set by AWS and
+ * variables that can be set by the developer additionally.
+ *
+ * @class
+ * @extends {ConfigService}
+ * @see https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime
+ * @see https://awslabs.github.io/aws-lambda-powertools-typescript/latest/#environment-variables
+ */
+class EnvironmentVariablesService extends ConfigService {
+
+  // Reserved environment variables
+  private xRayTraceIdVariable = '_X_AMZN_TRACE_ID';
+
+  /**
+   * It returns the value of an environment variable that has given name.
+   *
+   * @param {string} name
+   * @returns {string}
+   */
+  public get(name: string): string {
+    return process.env[name]?.trim() || '';
+  }
+
+  /**
+   * It returns the value of the POWERTOOLS_SERVICE_NAME environment variable.
+   *
+   * @returns {string}
+   */
+  public getServiceName(): string {
+    return this.get(this.serviceNameVariable);
+  }
+
+  /**
+   * It returns the value of the _X_AMZN_TRACE_ID environment variable.
+   * 
+   * The AWS X-Ray Trace data available in the environment variable has this format:
+   * `Root=1-5759e988-bd862e3fe1be46a994272793;Parent=557abcec3ee5a047;Sampled=1`,
+   *
+   * The actual Trace ID is: `1-5759e988-bd862e3fe1be46a994272793`.
+   *
+   * @returns {string}
+   */
+  public getXrayTraceId(): string {
+    const xRayTraceId = this.get(this.xRayTraceIdVariable);
+
+    return xRayTraceId.split(';')[0].replace('Root=', '');
+  }
+
+}
+
+export {
+  EnvironmentVariablesService,
+};

packages/commons/src/config/index.ts

@@ -0,0 +1,2 @@
+export * from './ConfigService';
+export * from './EnvironmentVariablesService';

packages/commons/src/index.ts

@@ -1,4 +1,5 @@
 export * from './utils/lambda';
 export * from './Utility';
+export * from './config';
 export * as ContextExamples from './samples/resources/contexts';
 export * as Events from './samples/resources/events';

packages/commons/tests/unit/config/EnvironmentVariablesService.test.ts

@@ -0,0 +1,88 @@
+/**
+ * Test EnvironmentVariablesService class
+ *
+ * @group unit/commons/all
+ */
+
+import { EnvironmentVariablesService } from '../../../src/config';
+
+describe('Class: EnvironmentVariablesService', () => {
+
+  const ENVIRONMENT_VARIABLES = process.env;
+
+  beforeEach(() => {
+    jest.resetModules();
+    process.env = { ...ENVIRONMENT_VARIABLES };
+  });
+
+  afterAll(() => {
+    process.env = ENVIRONMENT_VARIABLES;
+  });
+
+  describe('Method: get', () => {
+
+    test('When the variable IS present, it returns the value of a runtime variable', () => {
+
+      // Prepare
+      process.env.CUSTOM_VARIABLE = 'my custom value';
+      const service = new EnvironmentVariablesService();
+
+      // Act
+      const value = service.get('CUSTOM_VARIABLE');
+
+      // Assess
+      expect(value).toEqual('my custom value');
+
+    });
+
+    test('When the variable IS NOT present, it returns an empty string', () => {
+
+      // Prepare
+      delete process.env.CUSTOM_VARIABLE;
+      const service = new EnvironmentVariablesService();
+
+      // Act
+      const value = service.get('CUSTOM_VARIABLE');
+
+      // Assess
+      expect(value).toEqual('');
+
+    });
+
+  });
+
+  describe('Method: getServiceName', () => {
+
+    test('It returns the value of the environment variable POWERTOOLS_SERVICE_NAME', () => {
+
+      // Prepare
+      process.env.POWERTOOLS_SERVICE_NAME = 'shopping-cart-api';
+      const service = new EnvironmentVariablesService();
+
+      // Act
+      const value = service.getServiceName();
+
+      // Assess
+      expect(value).toEqual('shopping-cart-api');
+    });
+
+  });
+
+  describe('Method: getXrayTraceId', () => {
+
+    test('It returns the value of the environment variable _X_AMZN_TRACE_ID', () => {
+
+      // Prepare
+      process.env._X_AMZN_TRACE_ID = 'abcd123456789';
+      const service = new EnvironmentVariablesService();
+
+      // Act
+      const value = service.getXrayTraceId();
+
+      // Assess
+      expect(value).toEqual('abcd123456789');
+    });
+
+  });
+
+});

packages/logger/src/Logger.ts

@@ -117,7 +117,8 @@ class Logger extends Utility implements ClassThatLogs {
 
   private static readonly defaultServiceName: string = 'service_undefined';
 
-  private envVarsService?: EnvironmentVariablesService;
+  // envVarsService is always initialized in the constructor in setOptions()
+  private envVarsService!: EnvironmentVariablesService;
 
   private logEvent: boolean = false;
 
@@ -455,7 +456,7 @@ class Logger extends Utility implements ClassThatLogs {
       logLevel,
       timestamp: new Date(),
       message: typeof input === 'string' ? input : input.message,
-      xRayTraceId: this.getXrayTraceId(),
+      xRayTraceId: this.envVarsService.getXrayTraceId(),
     }, this.getPowertoolLogData());
 
     const logItem = new LogItem({
@@ -545,23 +546,6 @@ class Logger extends Utility implements ClassThatLogs {
     return <number> this.powertoolLogData.sampleRateValue;
   }
 
-  /**
-   * It returns the current X-Ray Trace ID parsing the content of the `_X_AMZN_TRACE_ID` env variable.
-   *
-   * The X-Ray Trace data available in the environment variable has this format:
-   * `Root=1-5759e988-bd862e3fe1be46a994272793;Parent=557abcec3ee5a047;Sampled=1`,
-   *
-   * The actual Trace ID is: `1-5759e988-bd862e3fe1be46a994272793`.
-   *
-   * @private
-   * @returns {string}
-   */
-  private getXrayTraceId(): string {
-    const xRayTraceId = this.getEnvVarsService().getXrayTraceId();
-
-    return xRayTraceId.length > 0 ? xRayTraceId.split(';')[0].replace('Root=', '') : xRayTraceId;
-  }
-
   /**
    * It returns true if the provided log level is valid.
    *

packages/logger/src/config/ConfigService.ts

@@ -1,4 +1,5 @@
-import { ConfigService } from '.';
+import { ConfigServiceInterface } from './ConfigServiceInterface';
+import { EnvironmentVariablesService as CommonEnvironmentVariablesService } from '@aws-lambda-powertools/commons';
 
 /**
  * Class EnvironmentVariablesService
@@ -9,28 +10,22 @@ import { ConfigService } from '.';
  * variables that can be set by the developer additionally.
  *
  * @class
- * @extends {ConfigService}
+ * @extends {CommonEnvironmentVariablesService}
+ * @implements {ConfigServiceInterface}
  * @see https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime
  * @see https://awslabs.github.io/aws-lambda-powertools-typescript/latest/#environment-variables
  */
-class EnvironmentVariablesService extends ConfigService {
+class EnvironmentVariablesService extends CommonEnvironmentVariablesService implements ConfigServiceInterface {
 
   // Reserved environment variables
   private awsRegionVariable = 'AWS_REGION';
+  private currentEnvironmentVariable = 'ENVIRONMENT';
   private functionNameVariable = 'AWS_LAMBDA_FUNCTION_NAME';
   private functionVersionVariable = 'AWS_LAMBDA_FUNCTION_VERSION';
+  private logEventVariable = 'POWERTOOLS_LOGGER_LOG_EVENT';
+  private logLevelVariable = 'LOG_LEVEL';
   private memoryLimitInMBVariable = 'AWS_LAMBDA_FUNCTION_MEMORY_SIZE';
-  private xRayTraceIdVariable = '_X_AMZN_TRACE_ID';
-
-  /**
-   * It returns the value of an environment variable that has given name.
-   *
-   * @param {string} name
-   * @returns {string}
-   */
-  public get(name: string): string {
-    return process.env[name]?.trim() || '';
-  }
+  private sampleRateValueVariable = 'POWERTOOLS_LOGGER_SAMPLE_RATE';
 
   /**
    * It returns the value of the AWS_REGION environment variable.
@@ -85,7 +80,9 @@ class EnvironmentVariablesService extends ConfigService {
    * @returns {boolean}
    */
   public getLogEvent(): boolean {
-    return this.isValueTrue(this.get(this.logEventVariable));
+    const value = this.get(this.logEventVariable);
+
+    return value.toLowerCase() === 'true' || value === '1';
   }
 
   /**
@@ -123,7 +120,7 @@ class EnvironmentVariablesService extends ConfigService {
    * @returns {string}
    */
   public getXrayTraceId(): string {
-    return this.get(this.xRayTraceIdVariable);
+    return super.getXrayTraceId();
   }
 
 }

packages/logger/src/config/EnvironmentVariablesService.ts

@@ -1,3 +1,2 @@
-export * from './ConfigService';
 export * from './ConfigServiceInterface';
 export * from './EnvironmentVariablesService';