@bitblit/ratchet-epsilon-common 5.0.566-alpha → 5.0.570-alpha
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.
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { EpsilonInstance } from "../epsilon-instance";
|
|
2
|
+
import { Context } from "aws-lambda";
|
|
3
|
+
export interface ContextGlobalData {
|
|
4
|
+
epsilonInstance: EpsilonInstance;
|
|
5
|
+
context: Context;
|
|
6
|
+
event: any;
|
|
7
|
+
logVariables: Record<string, string | number | boolean>;
|
|
8
|
+
processLabel: string;
|
|
9
|
+
overrideTraceId: string;
|
|
10
|
+
overrideTraceDepth: number;
|
|
11
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-global-data.js","sourceRoot":"","sources":["../../src/util/context-global-data.ts"],"names":[],"mappings":""}
|
|
@@ -3,14 +3,9 @@ import { EpsilonInstance } from '../epsilon-instance.js';
|
|
|
3
3
|
import { InternalBackgroundEntry } from '../background/internal-background-entry.js';
|
|
4
4
|
import { InterApiEntry } from '../inter-api/inter-api-entry.js';
|
|
5
5
|
export declare class ContextUtil {
|
|
6
|
-
|
|
7
|
-
private static CURRENT_CONTEXT;
|
|
8
|
-
private static CURRENT_EVENT;
|
|
9
|
-
private static CURRENT_LOG_VARS;
|
|
10
|
-
private static CURRENT_PROCESS_LABEL;
|
|
11
|
-
private static CURRENT_OVERRIDE_TRACE_ID;
|
|
12
|
-
private static CURRENT_OVERRIDE_TRACE_DEPTH;
|
|
6
|
+
static readonly CONTEXT_DATA_GLOBAL_NAME = "EpsilonGlobalContextData";
|
|
13
7
|
private constructor();
|
|
8
|
+
private static fetchContextData;
|
|
14
9
|
static initContext(epsilon: EpsilonInstance, evt: any, ctx: Context, processLabel: string): void;
|
|
15
10
|
static clearContext(): void;
|
|
16
11
|
static setOverrideTrace(traceId: string, traceDepth: number): void;
|
package/lib/util/context-util.js
CHANGED
|
@@ -1,34 +1,35 @@
|
|
|
1
1
|
import { StringRatchet } from '@bitblit/ratchet-common/lang/string-ratchet';
|
|
2
2
|
import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
|
|
3
3
|
import { NumberRatchet } from '@bitblit/ratchet-common/lang/number-ratchet';
|
|
4
|
+
import { GlobalRatchet } from "@bitblit/ratchet-common/lang/global-ratchet";
|
|
4
5
|
export class ContextUtil {
|
|
5
|
-
static
|
|
6
|
-
static CURRENT_CONTEXT;
|
|
7
|
-
static CURRENT_EVENT;
|
|
8
|
-
static CURRENT_LOG_VARS = {};
|
|
9
|
-
static CURRENT_PROCESS_LABEL;
|
|
10
|
-
static CURRENT_OVERRIDE_TRACE_ID;
|
|
11
|
-
static CURRENT_OVERRIDE_TRACE_DEPTH;
|
|
6
|
+
static CONTEXT_DATA_GLOBAL_NAME = 'EpsilonGlobalContextData';
|
|
12
7
|
constructor() { }
|
|
8
|
+
static fetchContextData() {
|
|
9
|
+
return GlobalRatchet.fetchGlobalVar(ContextUtil.CONTEXT_DATA_GLOBAL_NAME, {
|
|
10
|
+
epsilonInstance: null,
|
|
11
|
+
context: null,
|
|
12
|
+
event: null,
|
|
13
|
+
logVariables: {},
|
|
14
|
+
processLabel: 'UNSET',
|
|
15
|
+
overrideTraceDepth: null,
|
|
16
|
+
overrideTraceId: null
|
|
17
|
+
});
|
|
18
|
+
}
|
|
13
19
|
static initContext(epsilon, evt, ctx, processLabel) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
20
|
+
const cd = ContextUtil.fetchContextData();
|
|
21
|
+
cd.epsilonInstance = epsilon;
|
|
22
|
+
cd.context = ctx;
|
|
23
|
+
cd.event = evt;
|
|
24
|
+
cd.processLabel = processLabel;
|
|
19
25
|
}
|
|
20
26
|
static clearContext() {
|
|
21
|
-
ContextUtil.
|
|
22
|
-
ContextUtil.CURRENT_CONTEXT = null;
|
|
23
|
-
ContextUtil.CURRENT_EVENT = null;
|
|
24
|
-
ContextUtil.CURRENT_LOG_VARS = {};
|
|
25
|
-
ContextUtil.CURRENT_PROCESS_LABEL = null;
|
|
26
|
-
ContextUtil.CURRENT_OVERRIDE_TRACE_ID = null;
|
|
27
|
-
ContextUtil.CURRENT_OVERRIDE_TRACE_DEPTH = null;
|
|
27
|
+
GlobalRatchet.setGlobalVar(ContextUtil.CONTEXT_DATA_GLOBAL_NAME, null);
|
|
28
28
|
}
|
|
29
29
|
static setOverrideTrace(traceId, traceDepth) {
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
const cd = ContextUtil.fetchContextData();
|
|
31
|
+
cd.overrideTraceId = traceId || cd.overrideTraceId;
|
|
32
|
+
cd.overrideTraceDepth = traceDepth || cd.overrideTraceDepth;
|
|
32
33
|
}
|
|
33
34
|
static setOverrideTraceFromInternalBackgroundEntry(entry) {
|
|
34
35
|
ContextUtil.setOverrideTrace(entry.traceId, entry.traceDepth);
|
|
@@ -54,51 +55,60 @@ export class ContextUtil {
|
|
|
54
55
|
ContextUtil.addHeadersToRecord(ri.headers, 1);
|
|
55
56
|
}
|
|
56
57
|
static setProcessLabel(processLabel) {
|
|
57
|
-
|
|
58
|
+
const cd = ContextUtil.fetchContextData();
|
|
59
|
+
cd.processLabel = processLabel;
|
|
58
60
|
}
|
|
59
61
|
static currentRequestId() {
|
|
60
|
-
const
|
|
61
|
-
return
|
|
62
|
+
const cd = ContextUtil.fetchContextData();
|
|
63
|
+
return cd?.context?.awsRequestId;
|
|
62
64
|
}
|
|
63
65
|
static defaultedCurrentRequestId(defaultValueIfMissing = StringRatchet.createType4Guid()) {
|
|
64
66
|
return ContextUtil.currentRequestId() ?? defaultValueIfMissing;
|
|
65
67
|
}
|
|
66
68
|
static remainingTimeMS() {
|
|
67
|
-
const
|
|
68
|
-
return
|
|
69
|
+
const cd = ContextUtil.fetchContextData();
|
|
70
|
+
return cd?.context?.getRemainingTimeInMillis();
|
|
69
71
|
}
|
|
70
72
|
static currentProcessLabel() {
|
|
71
|
-
|
|
73
|
+
const cd = ContextUtil.fetchContextData();
|
|
74
|
+
return cd?.processLabel || 'unset';
|
|
72
75
|
}
|
|
73
76
|
static traceHeaderName() {
|
|
74
|
-
const
|
|
77
|
+
const cd = ContextUtil.fetchContextData();
|
|
78
|
+
const headerName = cd?.epsilonInstance?.config?.loggerConfig?.traceHeaderName || 'X-TRACE-ID';
|
|
75
79
|
return headerName;
|
|
76
80
|
}
|
|
77
81
|
static traceDepthHeaderName() {
|
|
78
|
-
const
|
|
82
|
+
const cd = ContextUtil.fetchContextData();
|
|
83
|
+
const headerName = cd?.epsilonInstance?.config?.loggerConfig?.traceDepthHeaderName || 'X-TRACE-DEPTH';
|
|
79
84
|
return headerName;
|
|
80
85
|
}
|
|
81
86
|
static currentTraceId() {
|
|
82
|
-
const
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
87
|
+
const cd = ContextUtil.fetchContextData();
|
|
88
|
+
const traceFn = cd?.epsilonInstance?.config?.loggerConfig?.traceIdGenerator || ContextUtil.defaultedCurrentRequestId;
|
|
89
|
+
const traceId = cd?.overrideTraceId ||
|
|
90
|
+
cd?.event?.headers?.[ContextUtil.traceHeaderName()] ||
|
|
91
|
+
traceFn(cd?.event, cd?.context);
|
|
86
92
|
return traceId;
|
|
87
93
|
}
|
|
88
94
|
static currentTraceDepth() {
|
|
89
|
-
const
|
|
90
|
-
|
|
95
|
+
const cd = ContextUtil.fetchContextData();
|
|
96
|
+
const caller = cd?.overrideTraceDepth ||
|
|
97
|
+
NumberRatchet.safeNumber(cd?.event?.headers?.[ContextUtil.traceDepthHeaderName()]) ||
|
|
91
98
|
1;
|
|
92
99
|
return caller;
|
|
93
100
|
}
|
|
94
101
|
static addLogVariable(name, val) {
|
|
95
|
-
|
|
102
|
+
const cd = ContextUtil.fetchContextData();
|
|
103
|
+
cd.logVariables[name] = val;
|
|
96
104
|
}
|
|
97
105
|
static fetchLogVariable(name) {
|
|
98
|
-
|
|
106
|
+
const cd = ContextUtil.fetchContextData();
|
|
107
|
+
return cd?.logVariables?.[name];
|
|
99
108
|
}
|
|
100
109
|
static fetchLogVariables() {
|
|
101
|
-
|
|
110
|
+
const cd = ContextUtil.fetchContextData();
|
|
111
|
+
return Object.assign({}, cd?.logVariables || {});
|
|
102
112
|
}
|
|
103
113
|
}
|
|
104
114
|
//# sourceMappingURL=context-util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-util.js","sourceRoot":"","sources":["../../src/util/context-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"context-util.js","sourceRoot":"","sources":["../../src/util/context-util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bitblit/ratchet-epsilon-common",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.570-alpha",
|
|
4
4
|
"description": "Tiny adapter to simplify building API gateway Lambda APIS",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"bin": {
|
|
@@ -62,19 +62,19 @@
|
|
|
62
62
|
},
|
|
63
63
|
"license": "Apache-2.0",
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@aws-sdk/client-s3": "3.
|
|
66
|
-
"@aws-sdk/client-sns": "3.
|
|
67
|
-
"@aws-sdk/client-sqs": "3.
|
|
68
|
-
"@aws-sdk/types": "3.
|
|
69
|
-
"@bitblit/ratchet-aws": "5.0.
|
|
70
|
-
"@bitblit/ratchet-common": "5.0.
|
|
71
|
-
"@bitblit/ratchet-misc": "5.0.
|
|
72
|
-
"@bitblit/ratchet-node-only": "5.0.
|
|
65
|
+
"@aws-sdk/client-s3": "3.735.0",
|
|
66
|
+
"@aws-sdk/client-sns": "3.734.0",
|
|
67
|
+
"@aws-sdk/client-sqs": "3.734.0",
|
|
68
|
+
"@aws-sdk/types": "3.734.0",
|
|
69
|
+
"@bitblit/ratchet-aws": "5.0.570-alpha",
|
|
70
|
+
"@bitblit/ratchet-common": "5.0.570-alpha",
|
|
71
|
+
"@bitblit/ratchet-misc": "5.0.570-alpha",
|
|
72
|
+
"@bitblit/ratchet-node-only": "5.0.570-alpha",
|
|
73
73
|
"@smithy/abort-controller": "4.0.0",
|
|
74
74
|
"@smithy/smithy-client": "4.0.0",
|
|
75
75
|
"@smithy/util-waiter": "4.0.1",
|
|
76
76
|
"clear": "0.1.0",
|
|
77
|
-
"commander": "13.
|
|
77
|
+
"commander": "13.1.0",
|
|
78
78
|
"cross-fetch": "4.1.0",
|
|
79
79
|
"js-yaml": "4.1.0",
|
|
80
80
|
"jwks-rsa": "3.1.0",
|
|
@@ -86,10 +86,10 @@
|
|
|
86
86
|
},
|
|
87
87
|
"peerDependencies": {
|
|
88
88
|
"@apollo/server": "^4.11.3",
|
|
89
|
-
"@bitblit/ratchet-aws": "5.0.
|
|
90
|
-
"@bitblit/ratchet-common": "5.0.
|
|
91
|
-
"@bitblit/ratchet-misc": "5.0.
|
|
92
|
-
"@bitblit/ratchet-node-only": "5.0.
|
|
89
|
+
"@bitblit/ratchet-aws": "5.0.570-alpha",
|
|
90
|
+
"@bitblit/ratchet-common": "5.0.570-alpha",
|
|
91
|
+
"@bitblit/ratchet-misc": "5.0.570-alpha",
|
|
92
|
+
"@bitblit/ratchet-node-only": "5.0.570-alpha",
|
|
93
93
|
"graphql": "^16.10.0"
|
|
94
94
|
},
|
|
95
95
|
"peerDependenciesMeta": {
|