fix: change requestId header name (#37)

* fix: change requestId header name

* fix: separate span and requesrId checks

* feat: add param name const

src/index.ts

@@ -2,3 +2,4 @@ export {NodeKit} from './nodekit';
 export {AppContext} from './lib/context';
 export {AppConfig, AppContextParams, AppDynamicConfig} from './types';
 export {AppError} from './lib/app-error';
+export {REQUEST_ID_HEADER, REQUEST_ID_PARAM_NAME} from './lib/consts';

src/lib/consts.ts

@@ -1,2 +1,3 @@
 export const REQUEST_ID_HEADER = 'x-request-id';
+export const REQUEST_ID_PARAM_NAME = 'requestId';
 export const TRACE_KEY = 'uber-trace-id';

src/lib/context.ts

@@ -8,6 +8,7 @@ import {NodeKit} from '../nodekit';
 import {AppConfig, AppContextParams, AppDynamicConfig, Dict} from '../types';
 
 import {AppError} from './app-error';
+import {REQUEST_ID_HEADER, REQUEST_ID_PARAM_NAME} from './consts';
 import {extractErrorInfo} from './error-parser';
 
 type ContextParams = ContextInitialParams | ContextParentParams;
@@ -213,14 +214,15 @@ export class AppContext {
     }
 
     getMetadata() {
+        const metadata: Record<string, string> = {};
+        const requestId = this.get(REQUEST_ID_PARAM_NAME);
+        if (requestId) {
+            metadata[REQUEST_ID_HEADER] = requestId;
+        }
         if (this.span) {
-            const requestId = this.get('requestId');
-            const metadata = requestId ? {requestId} : {};
             this.tracer.inject(this.span, FORMAT_HTTP_HEADERS, metadata);
-            return metadata;
-        } else {
-            return {};
         }
+        return metadata;
     }
 
     getTraceId() {

src/types.ts

@@ -1,5 +1,6 @@
 import type {pino} from 'pino';
 
+import {REQUEST_ID_PARAM_NAME} from './lib/consts';
 import type {LoggingLevel} from './lib/logging';
 
 export interface AppConfig {
@@ -43,7 +44,7 @@ export interface AppConfig {
 }
 
 export interface AppContextParams {
-    requestId?: string;
+    [REQUEST_ID_PARAM_NAME]?: string;
 }
 
 export interface AppDynamicConfig {}