chore: rebase

Author: dreamorosi

packages/logger/src/constants.ts

@@ -28,6 +28,7 @@ const LogLevel = {
  * Numeric values for each log level.
  */
 const LogLevelThreshold = {
+  TRACE: 6,
   DEBUG: 8,
   INFO: 12,
   WARN: 16,

packages/logger/tests/unit/EnvironmentVariablesService.test.ts renamed to packages/logger/tests/unit/configFromEnv.test.ts

@@ -4,19 +4,19 @@
  * @group unit/logger/logFormatter
  */
 import { AssertionError } from 'node:assert';
-import { EnvironmentVariablesService } from '../../../src/config/EnvironmentVariablesService.js';
-import { PowertoolsLogFormatter } from '../../../src/formatter/PowertoolsLogFormatter.js';
+import { EnvironmentVariablesService } from '../../src/config/EnvironmentVariablesService.js';
+import { PowertoolsLogFormatter } from '../../src/formatter/PowertoolsLogFormatter.js';
 import {
   LogFormatter,
   LogItem,
   LogLevelThreshold,
   Logger,
-} from '../../../src/index.js';
-import type { LogAttributes, LogLevel } from '../../../src/types/Log.js';
+} from '../../src/index.js';
+import type { LogAttributes, LogLevel } from '../../src/types/Log.js';
 import type {
   CustomJsonReplacerFn,
   UnformattedAttributes,
-} from '../../../src/types/Logger.js';
+} from '../../src/types/Logger.js';
 
 const fileNameRegexp = new RegExp(/index.js:\d+$/);
 const fileNameRegexpWithLine = new RegExp(/formatters.test.ts:\d+:\d+/);

packages/logger/tests/unit/logger/formatters.test.ts renamed to packages/logger/tests/unit/formatters.test.ts

@@ -3,8 +3,8 @@
  *
  * @group unit/logger/logger/logLevels
  */
-import { Logger } from '../../../src/Logger.js';
-import { LogJsonIndent, LogLevel } from '../../../src/constants.js';
+import { Logger } from '../../src/Logger.js';
+import { LogJsonIndent, LogLevel } from '../../src/constants.js';
 
 const logSpy = jest.spyOn(console, 'info');
 

packages/logger/tests/unit/logger/initializeLogger.test.ts renamed to packages/logger/tests/unit/initializeLogger.test.ts

@@ -6,8 +6,8 @@
 import context from '@aws-lambda-powertools/testing-utils/context';
 import middy from '@middy/core';
 import type { Context } from 'aws-lambda';
-import { Logger } from '../../../src/Logger.js';
-import { injectLambdaContext } from '../../../src/middleware/middy.js';
+import { Logger } from '../../src/Logger.js';
+import { injectLambdaContext } from '../../src/middleware/middy.js';
 
 const event = {
   foo: 'bar',

packages/logger/tests/unit/logger/injectLambdaContext.test.ts renamed to packages/logger/tests/unit/injectLambdaContext.test.ts

@@ -6,8 +6,8 @@
 import context from '@aws-lambda-powertools/testing-utils/context';
 import middy from '@middy/core';
 import type { Context } from 'aws-lambda';
-import { Logger } from '../../../src/Logger.js';
-import { injectLambdaContext } from '../../../src/middleware/middy.js';
+import { Logger } from '../../src/Logger.js';
+import { injectLambdaContext } from '../../src/middleware/middy.js';
 
 const event = {
   foo: 'bar',

packages/logger/tests/unit/logger/logEvent.test.ts renamed to packages/logger/tests/unit/logEvent.test.ts

@@ -3,17 +3,19 @@
  *
  * @group unit/logger/logger/logLevels
  */
-import { Logger } from '../../../src/Logger.js';
-import { LogLevel, LogLevelThreshold } from '../../../src/constants.js';
-import type { LogLevel as LogLevelType } from '../../../src/types/Log.js';
-import type { LogFunction } from '../../../src/types/Logger.js';
+import { Logger } from '../../src/Logger.js';
+import { LogLevel, LogLevelThreshold } from '../../src/constants.js';
+import type { LogLevel as LogLevelType } from '../../src/types/Log.js';
+import type { LogFunction } from '../../src/types/Logger.js';
 
 const getConsoleMethod = (
   method: string
-): keyof Omit<LogFunction, 'critical'> =>
+): keyof Omit<LogFunction, 'critical'> | 'log' =>
   method.toLowerCase() === 'critical'
     ? 'error'
-    : (method.toLowerCase() as keyof Omit<LogFunction, 'critical'>);
+    : method.toLowerCase() === 'trace'
+      ? 'log'
+      : (method.toLowerCase() as keyof Omit<LogFunction, 'critical'>);
 
 describe('Log levels', () => {
   const ENVIRONMENT_VARIABLES = process.env;
@@ -79,6 +81,7 @@ describe('Log levels', () => {
   });
 
   it.each([
+    { level: LogLevel.TRACE },
     { level: LogLevel.DEBUG },
     { level: LogLevel.INFO },
     { level: LogLevel.WARN },
@@ -100,6 +103,7 @@ describe('Log levels', () => {
   });
 
   it.each([
+    { level: LogLevel.DEBUG, moreVerboseLevel: LogLevel.TRACE },
     { level: LogLevel.INFO, moreVerboseLevel: LogLevel.DEBUG },
     { level: LogLevel.WARN, moreVerboseLevel: LogLevel.INFO },
     { level: LogLevel.ERROR, moreVerboseLevel: LogLevel.WARN },
@@ -120,6 +124,7 @@ describe('Log levels', () => {
   );
 
   it.each([
+    { level: LogLevel.TRACE, lessVerboseLevel: LogLevel.DEBUG },
     { level: LogLevel.DEBUG, lessVerboseLevel: LogLevel.INFO },
     { level: LogLevel.INFO, lessVerboseLevel: LogLevel.WARN },
     { level: LogLevel.WARN, lessVerboseLevel: LogLevel.ERROR },

packages/logger/tests/unit/logger/logLevels.test.ts renamed to packages/logger/tests/unit/logLevels.test.ts

@@ -3,8 +3,8 @@
  *
  * @group unit/logger/logger/sampling
  */
-import { EnvironmentVariablesService } from '../../../src/config/EnvironmentVariablesService.js';
-import { LogLevel, LogLevelThreshold, Logger } from '../../../src/index.js';
+import { EnvironmentVariablesService } from '../../src/config/EnvironmentVariablesService.js';
+import { LogLevel, LogLevelThreshold, Logger } from '../../src/index.js';
 
 class CustomConfigService extends EnvironmentVariablesService {
   #sampleRateValue = 1;
@@ -33,7 +33,7 @@ describe('Log sampling', () => {
     const debugSpy = jest.spyOn(console, 'debug');
 
     // Act
-    new Logger({ sampleRateValue: 1 });
+    new Logger({ sampleRateValue: 1, logLevel: LogLevel.CRITICAL });
 
     // Assess
     expect(debugSpy).toHaveBeenCalledTimes(1);

packages/logger/tests/unit/logger/sampling.test.ts renamed to packages/logger/tests/unit/sampling.test.ts

@@ -6,9 +6,9 @@
 import context from '@aws-lambda-powertools/testing-utils/context';
 import middy from '@middy/core';
 import type { Context } from 'aws-lambda';
-import { Logger } from '../../../src/Logger.js';
-import { injectLambdaContext } from '../../../src/middleware/middy.js';
-import type { ConstructorOptions } from '../../../src/types/Logger.js';
+import { Logger } from '../../src/Logger.js';
+import { injectLambdaContext } from '../../src/middleware/middy.js';
+import type { ConstructorOptions } from '../../src/types/Logger.js';
 
 const logSpy = jest.spyOn(console, 'info');