@vrplatform/log 2.0.43 → 2.0.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/log/common.d.ts +1 -0
- package/build/main/log/common.js +10 -0
- package/build/main/log/common.js.map +1 -1
- package/build/main/log/index.d.ts +2 -1
- package/build/main/log/index.js +4 -1
- package/build/main/log/index.js.map +1 -1
- package/build/main/log/type.d.ts +1 -0
- package/build/main/log/type.js +2 -1
- package/build/main/log/type.js.map +1 -1
- package/build/module/log/common.d.ts +1 -0
- package/build/module/log/common.js +10 -1
- package/build/module/log/common.js.map +1 -1
- package/build/module/log/index.d.ts +2 -1
- package/build/module/log/index.js +5 -2
- package/build/module/log/index.js.map +1 -1
- package/build/module/log/type.d.ts +1 -0
- package/build/module/log/type.js +1 -0
- package/build/module/log/type.js.map +1 -1
- package/package.json +1 -1
- package/src/log/common.ts +16 -1
- package/src/log/index.ts +11 -1
- package/src/log/type.ts +1 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type RequestLike } from './type';
|
|
2
2
|
export declare const requestHeadersToCapture: string[];
|
|
3
3
|
export declare function getCorrelationId(request?: RequestLike): string | undefined;
|
|
4
|
+
export declare function getSessionId(request?: RequestLike): string | undefined;
|
|
4
5
|
export declare function getEnvironment(env?: Record<string, any>): any;
|
|
5
6
|
export type RequestContext = {
|
|
6
7
|
url?: {
|
package/build/main/log/common.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.requestHeadersToCapture = void 0;
|
|
4
4
|
exports.getCorrelationId = getCorrelationId;
|
|
5
|
+
exports.getSessionId = getSessionId;
|
|
5
6
|
exports.getEnvironment = getEnvironment;
|
|
6
7
|
exports.requestToContext = requestToContext;
|
|
7
8
|
const type_1 = require("./type");
|
|
@@ -20,6 +21,15 @@ function getCorrelationId(request) {
|
|
|
20
21
|
request.headers.get('request-id') ||
|
|
21
22
|
undefined);
|
|
22
23
|
}
|
|
24
|
+
function getSessionId(request) {
|
|
25
|
+
if (!request?.headers)
|
|
26
|
+
return undefined;
|
|
27
|
+
return (request.headers.get(type_1.SESSION_ID_HEADER) ||
|
|
28
|
+
request.headers.get('fi-session-id') ||
|
|
29
|
+
request.headers.get('x-session-id') ||
|
|
30
|
+
request.headers.get('session-id') ||
|
|
31
|
+
undefined);
|
|
32
|
+
}
|
|
23
33
|
function getEnvironment(env) {
|
|
24
34
|
if (env?.NODE_ENV)
|
|
25
35
|
return env?.NODE_ENV;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { type LogBindings, type RequestLike, type WorkerLog } from './type';
|
|
|
4
4
|
export * from './common';
|
|
5
5
|
export * from './baselog';
|
|
6
6
|
export * from './type';
|
|
7
|
-
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext, }: {
|
|
7
|
+
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, sessionId: sid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext, }: {
|
|
8
8
|
environment?: string;
|
|
9
9
|
name: string;
|
|
10
10
|
request?: RequestLike & {
|
|
@@ -13,6 +13,7 @@ export declare function useLog({ environment: _environment, name, request, body,
|
|
|
13
13
|
logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
|
|
14
14
|
body?: any;
|
|
15
15
|
correlationId?: string;
|
|
16
|
+
sessionId?: string;
|
|
16
17
|
version?: string;
|
|
17
18
|
dataset?: string;
|
|
18
19
|
env?: LogBindings;
|
package/build/main/log/index.js
CHANGED
|
@@ -21,10 +21,11 @@ const type_1 = require("./type");
|
|
|
21
21
|
__exportStar(require("./common"), exports);
|
|
22
22
|
__exportStar(require("./baselog"), exports);
|
|
23
23
|
__exportStar(require("./type"), exports);
|
|
24
|
-
function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
|
|
24
|
+
function useLog({ environment: _environment, name, request, body, env, correlationId: cid, sessionId: sid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
|
|
25
25
|
const environment = _environment || (0, common_1.getEnvironment)(env);
|
|
26
26
|
// const colorLogs = env?.[LOG_ENV] === '*' || ;
|
|
27
27
|
const correlationId = cid || (0, common_1.getCorrelationId)(request); //const logger = nodeColorLog;
|
|
28
|
+
const sessionId = sid || (0, common_1.getSessionId)(request);
|
|
28
29
|
const axiomToken = env?.[type_1.AXIOM_AUTH_TOKEN_ENV];
|
|
29
30
|
const isNodeJsCompat = typeof process !== 'undefined';
|
|
30
31
|
const isDev = environment === 'development';
|
|
@@ -45,10 +46,12 @@ function useLog({ environment: _environment, name, request, body, env, correlati
|
|
|
45
46
|
app: name || 'default',
|
|
46
47
|
version: version || 'default',
|
|
47
48
|
correlationId,
|
|
49
|
+
sessionId,
|
|
48
50
|
context: {
|
|
49
51
|
...initialContext,
|
|
50
52
|
rootCorrelationId: correlationId,
|
|
51
53
|
correlationId,
|
|
54
|
+
sessionId,
|
|
52
55
|
taskQueue: request?.headers?.get(type_1.TASK_QUEUE_HEADER) || undefined,
|
|
53
56
|
workflowId: request?.headers?.get(type_1.WORKFLOW_ID_HEADER) || undefined,
|
|
54
57
|
child: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"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"}
|
package/build/main/log/type.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
|
|
|
2
2
|
export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
|
|
3
3
|
export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
|
|
4
4
|
export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
|
|
5
|
+
export declare const SESSION_ID_HEADER = "X-Session-ID";
|
|
5
6
|
export declare const VERIFICATION_HEADER = "X-Verification-Key";
|
|
6
7
|
export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
7
8
|
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
package/build/main/log/type.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.LOG_ENV = exports.AXIOM_DATASET_ENV = exports.AXIOM_ORG_ID_ENV = exports.AXIOM_AUTH_TOKEN_ENV = exports.VERIFICATION_HEADER = exports.CORRELATION_ID_HEADER = exports.TASK_QUEUE_HEADER = exports.WORKFLOW_ID_HEADER = exports.CONNECTION_ID_HEADER = void 0;
|
|
3
|
+
exports.LOG_ENV = exports.AXIOM_DATASET_ENV = exports.AXIOM_ORG_ID_ENV = exports.AXIOM_AUTH_TOKEN_ENV = exports.VERIFICATION_HEADER = exports.SESSION_ID_HEADER = exports.CORRELATION_ID_HEADER = exports.TASK_QUEUE_HEADER = exports.WORKFLOW_ID_HEADER = exports.CONNECTION_ID_HEADER = void 0;
|
|
4
4
|
// Headers
|
|
5
5
|
exports.CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
6
6
|
exports.WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
7
7
|
exports.TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
8
8
|
exports.CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
9
|
+
exports.SESSION_ID_HEADER = 'X-Session-ID';
|
|
9
10
|
exports.VERIFICATION_HEADER = 'X-Verification-Key';
|
|
10
11
|
// Env
|
|
11
12
|
exports.AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":";;;AAAA,UAAU;AACG,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AAC3C,QAAA,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACO,QAAA,oBAAoB,GAAG,kBAAkB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAClC,QAAA,iBAAiB,GAAG,eAAe,CAAC;AACpC,QAAA,OAAO,GAAG,KAAK,CAAC"}
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":";;;AAAA,UAAU;AACG,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AAC3C,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACO,QAAA,oBAAoB,GAAG,kBAAkB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAClC,QAAA,iBAAiB,GAAG,eAAe,CAAC;AACpC,QAAA,OAAO,GAAG,KAAK,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type RequestLike } from './type';
|
|
2
2
|
export declare const requestHeadersToCapture: string[];
|
|
3
3
|
export declare function getCorrelationId(request?: RequestLike): string | undefined;
|
|
4
|
+
export declare function getSessionId(request?: RequestLike): string | undefined;
|
|
4
5
|
export declare function getEnvironment(env?: Record<string, any>): any;
|
|
5
6
|
export type RequestContext = {
|
|
6
7
|
url?: {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CORRELATION_ID_HEADER } from './type';
|
|
1
|
+
import { CORRELATION_ID_HEADER, SESSION_ID_HEADER, } from './type';
|
|
2
2
|
export const requestHeadersToCapture = ['user-agent'];
|
|
3
3
|
export function getCorrelationId(request) {
|
|
4
4
|
if (!request?.headers)
|
|
@@ -14,6 +14,15 @@ export function getCorrelationId(request) {
|
|
|
14
14
|
request.headers.get('request-id') ||
|
|
15
15
|
undefined);
|
|
16
16
|
}
|
|
17
|
+
export function getSessionId(request) {
|
|
18
|
+
if (!request?.headers)
|
|
19
|
+
return undefined;
|
|
20
|
+
return (request.headers.get(SESSION_ID_HEADER) ||
|
|
21
|
+
request.headers.get('fi-session-id') ||
|
|
22
|
+
request.headers.get('x-session-id') ||
|
|
23
|
+
request.headers.get('session-id') ||
|
|
24
|
+
undefined);
|
|
25
|
+
}
|
|
17
26
|
export function getEnvironment(env) {
|
|
18
27
|
if (env?.NODE_ENV)
|
|
19
28
|
return env?.NODE_ENV;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { type LogBindings, type RequestLike, type WorkerLog } from './type';
|
|
|
4
4
|
export * from './common';
|
|
5
5
|
export * from './baselog';
|
|
6
6
|
export * from './type';
|
|
7
|
-
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext, }: {
|
|
7
|
+
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, sessionId: sid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext, }: {
|
|
8
8
|
environment?: string;
|
|
9
9
|
name: string;
|
|
10
10
|
request?: RequestLike & {
|
|
@@ -13,6 +13,7 @@ export declare function useLog({ environment: _environment, name, request, body,
|
|
|
13
13
|
logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
|
|
14
14
|
body?: any;
|
|
15
15
|
correlationId?: string;
|
|
16
|
+
sessionId?: string;
|
|
16
17
|
version?: string;
|
|
17
18
|
dataset?: string;
|
|
18
19
|
env?: LogBindings;
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { createBaseLog } from './baselog';
|
|
2
|
-
import { getCorrelationId, getEnvironment, requestToContext } from './common';
|
|
2
|
+
import { getCorrelationId, getEnvironment, getSessionId, requestToContext, } from './common';
|
|
3
3
|
import { AXIOM_AUTH_TOKEN_ENV, AXIOM_DATASET_ENV, AXIOM_ORG_ID_ENV, LOG_ENV, TASK_QUEUE_HEADER, WORKFLOW_ID_HEADER, } from './type';
|
|
4
4
|
export * from './common';
|
|
5
5
|
export * from './baselog';
|
|
6
6
|
export * from './type';
|
|
7
|
-
export function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
|
|
7
|
+
export function useLog({ environment: _environment, name, request, body, env, correlationId: cid, sessionId: sid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
|
|
8
8
|
const environment = _environment || getEnvironment(env);
|
|
9
9
|
// const colorLogs = env?.[LOG_ENV] === '*' || ;
|
|
10
10
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
11
|
+
const sessionId = sid || getSessionId(request);
|
|
11
12
|
const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
|
|
12
13
|
const isNodeJsCompat = typeof process !== 'undefined';
|
|
13
14
|
const isDev = environment === 'development';
|
|
@@ -28,10 +29,12 @@ export function useLog({ environment: _environment, name, request, body, env, co
|
|
|
28
29
|
app: name || 'default',
|
|
29
30
|
version: version || 'default',
|
|
30
31
|
correlationId,
|
|
32
|
+
sessionId,
|
|
31
33
|
context: {
|
|
32
34
|
...initialContext,
|
|
33
35
|
rootCorrelationId: correlationId,
|
|
34
36
|
correlationId,
|
|
37
|
+
sessionId,
|
|
35
38
|
taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
|
|
36
39
|
workflowId: request?.headers?.get(WORKFLOW_ID_HEADER) || undefined,
|
|
37
40
|
child: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,aAAa,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
|
|
|
2
2
|
export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
|
|
3
3
|
export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
|
|
4
4
|
export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
|
|
5
|
+
export declare const SESSION_ID_HEADER = "X-Session-ID";
|
|
5
6
|
export declare const VERIFICATION_HEADER = "X-Verification-Key";
|
|
6
7
|
export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
7
8
|
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
package/build/module/log/type.js
CHANGED
|
@@ -3,6 +3,7 @@ export const CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
|
3
3
|
export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
4
4
|
export const TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
5
5
|
export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
6
|
+
export const SESSION_ID_HEADER = 'X-Session-ID';
|
|
6
7
|
export const VERIFICATION_HEADER = 'X-Verification-Key';
|
|
7
8
|
// Env
|
|
8
9
|
export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACN,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC"}
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACN,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC"}
|
package/package.json
CHANGED
package/src/log/common.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
CORRELATION_ID_HEADER,
|
|
3
|
+
type RequestLike,
|
|
4
|
+
SESSION_ID_HEADER,
|
|
5
|
+
} from './type';
|
|
2
6
|
|
|
3
7
|
export const requestHeadersToCapture = ['user-agent'];
|
|
4
8
|
|
|
@@ -18,6 +22,17 @@ export function getCorrelationId(request?: RequestLike) {
|
|
|
18
22
|
);
|
|
19
23
|
}
|
|
20
24
|
|
|
25
|
+
export function getSessionId(request?: RequestLike) {
|
|
26
|
+
if (!request?.headers) return undefined;
|
|
27
|
+
return (
|
|
28
|
+
request.headers.get(SESSION_ID_HEADER) ||
|
|
29
|
+
request.headers.get('fi-session-id') ||
|
|
30
|
+
request.headers.get('x-session-id') ||
|
|
31
|
+
request.headers.get('session-id') ||
|
|
32
|
+
undefined
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
|
|
21
36
|
export function getEnvironment(env?: Record<string, any>) {
|
|
22
37
|
if (env?.NODE_ENV) return env?.NODE_ENV;
|
|
23
38
|
return env?.IS_LOCAL_DEV ? 'development' : 'production';
|
package/src/log/index.ts
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { type ConsoleLog, createBaseLog } from './baselog';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
getCorrelationId,
|
|
4
|
+
getEnvironment,
|
|
5
|
+
getSessionId,
|
|
6
|
+
requestToContext,
|
|
7
|
+
} from './common';
|
|
3
8
|
import {
|
|
4
9
|
AXIOM_AUTH_TOKEN_ENV,
|
|
5
10
|
AXIOM_DATASET_ENV,
|
|
@@ -23,6 +28,7 @@ export function useLog({
|
|
|
23
28
|
body,
|
|
24
29
|
env,
|
|
25
30
|
correlationId: cid,
|
|
31
|
+
sessionId: sid,
|
|
26
32
|
version,
|
|
27
33
|
executionContext,
|
|
28
34
|
logRequest,
|
|
@@ -36,6 +42,7 @@ export function useLog({
|
|
|
36
42
|
logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
|
|
37
43
|
body?: any;
|
|
38
44
|
correlationId?: string;
|
|
45
|
+
sessionId?: string;
|
|
39
46
|
version?: string;
|
|
40
47
|
dataset?: string;
|
|
41
48
|
env?: LogBindings;
|
|
@@ -48,6 +55,7 @@ export function useLog({
|
|
|
48
55
|
const environment = _environment || getEnvironment(env);
|
|
49
56
|
// const colorLogs = env?.[LOG_ENV] === '*' || ;
|
|
50
57
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
58
|
+
const sessionId = sid || getSessionId(request);
|
|
51
59
|
|
|
52
60
|
const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
|
|
53
61
|
|
|
@@ -73,10 +81,12 @@ export function useLog({
|
|
|
73
81
|
app: name || 'default',
|
|
74
82
|
version: version || 'default',
|
|
75
83
|
correlationId,
|
|
84
|
+
sessionId,
|
|
76
85
|
context: {
|
|
77
86
|
...initialContext,
|
|
78
87
|
rootCorrelationId: correlationId,
|
|
79
88
|
correlationId,
|
|
89
|
+
sessionId,
|
|
80
90
|
taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
|
|
81
91
|
workflowId: request?.headers?.get(WORKFLOW_ID_HEADER) || undefined,
|
|
82
92
|
child: undefined as any as string,
|
package/src/log/type.ts
CHANGED
|
@@ -3,6 +3,7 @@ export const CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
|
3
3
|
export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
4
4
|
export const TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
5
5
|
export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
6
|
+
export const SESSION_ID_HEADER = 'X-Session-ID';
|
|
6
7
|
export const VERIFICATION_HEADER = 'X-Verification-Key';
|
|
7
8
|
|
|
8
9
|
// Env
|