From f08260e10b70e20a35ad33c1ffb4a6a5c34ea608 Mon Sep 17 00:00:00 2001 From: Kevin <23527353+Strazz1337@users.noreply.github.com> Date: Fri, 29 Mar 2024 14:09:33 +0100 Subject: [PATCH] refactor(logging): moved constants to separate file (#12) --- .../adapters/nest-winston-logger.adapter.ts | 24 ++----------------- .../src/logging/constants.ts | 23 ++++++++++++++++++ 2 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 packages/open-telemetry-nest/src/logging/constants.ts diff --git a/packages/open-telemetry-nest/src/logging/adapters/nest-winston-logger.adapter.ts b/packages/open-telemetry-nest/src/logging/adapters/nest-winston-logger.adapter.ts index 8837ccc..50f6e03 100644 --- a/packages/open-telemetry-nest/src/logging/adapters/nest-winston-logger.adapter.ts +++ b/packages/open-telemetry-nest/src/logging/adapters/nest-winston-logger.adapter.ts @@ -6,28 +6,8 @@ import { GlobalProviders } from '@zonneplan/open-telemetry-node'; import { LogAttributes, SeverityNumber } from '@opentelemetry/api-logs'; import { LoggerService } from '../services/logger.service'; import { context } from '@opentelemetry/api'; +import { NEST_LOG_LEVEL_WINSTON_SEVERITY, SEVERITY_TEXT_TO_NEST_LOG_LEVEL } from '../constants'; -/** - * @see https://github.com/winstonjs/winston?tab=readme-ov-file#logging - */ -const NEST_LOG_LEVEL_WINSTON_SEVERITY: Record = { - fatal: 0, - error: 0, - warn: 1, - log: 2, - verbose: 4, - debug: 5 -}; - -const SEVERITY_TEXT_TO_NEST_LOG_LEVEL: Record = { - FATAL: 'fatal', - ERROR: 'error', - WARN: 'warn', - INFO: 'log', - DEBUG: 'debug', - TRACE: 'verbose', - UNSPECIFIED: 'log' -}; export class NestWinstonLoggerAdapter extends LoggerService { private severityNumberToSeverityTextMap: Record = { @@ -127,7 +107,7 @@ export class NestWinstonLoggerAdapter extends LoggerService { const winstonLogLevel = this.toWinstonLogLevel(nestLogLevel); this.logger[winstonLogLevel](body, attributes); - + if (!GlobalProviders.logProvider) { console.error('OpenTelemetry log provider not initialized'); return; diff --git a/packages/open-telemetry-nest/src/logging/constants.ts b/packages/open-telemetry-nest/src/logging/constants.ts new file mode 100644 index 0000000..35f0f65 --- /dev/null +++ b/packages/open-telemetry-nest/src/logging/constants.ts @@ -0,0 +1,23 @@ +import { LogLevel } from '@nestjs/common'; + +/** + * @see https://github.com/winstonjs/winston?tab=readme-ov-file#logging + */ +export const NEST_LOG_LEVEL_WINSTON_SEVERITY: Record = { + fatal: 0, + error: 0, + warn: 1, + log: 2, + verbose: 4, + debug: 5 +}; + +export const SEVERITY_TEXT_TO_NEST_LOG_LEVEL: Record = { + FATAL: 'fatal', + ERROR: 'error', + WARN: 'warn', + INFO: 'log', + DEBUG: 'debug', + TRACE: 'verbose', + UNSPECIFIED: 'log' +};