@comicrelief/lambda-wrapper 2.0.0-beta.7 → 2.0.0-beta.8
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/README.md +8 -0
- package/dist/core/LambdaWrapper.d.ts +19 -3
- package/dist/core/LambdaWrapper.d.ts.map +1 -1
- package/dist/core/LambdaWrapper.js +55 -11
- package/dist/core/LambdaWrapper.js.map +1 -1
- package/dist/services/LoggerService.d.ts.map +1 -1
- package/dist/services/LoggerService.js +8 -17
- package/dist/services/LoggerService.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -204,6 +204,14 @@ lambdaWrapper.configure<WithSQSServiceConfig & WithOtherServiceConfig>({
|
|
|
204
204
|
});
|
|
205
205
|
```
|
|
206
206
|
|
|
207
|
+
## Monitoring
|
|
208
|
+
|
|
209
|
+
At Comic Relief we use [Lumigo](https://lumigo.io/) for monitoring and observability of our deployed services. Lambda Wrapper includes the Lumigo tracer to allow us to tag traces with custom labels and metrics ([execution tags](https://docs.lumigo.io/docs/execution-tags)).
|
|
210
|
+
|
|
211
|
+
Lumigo integration works out-of-the-box with Lumigo's [auto-trace feature](https://docs.lumigo.io/docs/serverless-applications#automatic-instrumentation). If you prefer manual tracing, enable it by setting `LUMIGO_TRACER_TOKEN` in your Lambda environment variables.
|
|
212
|
+
|
|
213
|
+
And if you don't use Lumigo, don't worry, their tracer will not be instantiated in your functions and no calls will be made to their servers unless `LUMIGO_TRACER_TOKEN` is set.
|
|
214
|
+
|
|
207
215
|
## Notes
|
|
208
216
|
|
|
209
217
|
Lambda Wrapper's dependency injection relies on class names being preserved. If your build process includes minifying or uglifying your code, you'll need to disable these transformations.
|
|
@@ -25,6 +25,23 @@ export default class LambdaWrapper<TConfig extends LambdaWrapperConfig = LambdaW
|
|
|
25
25
|
* Wrap the given function.
|
|
26
26
|
*/
|
|
27
27
|
wrap<T>(handler: (di: DependencyInjection<TConfig>) => T | Promise<T>, options?: WrapOptions): (event: any, context: Context) => Promise<any>;
|
|
28
|
+
/**
|
|
29
|
+
* `true` if we will send traces to Lumigo.
|
|
30
|
+
*
|
|
31
|
+
* The `LUMIGO_TRACER_TOKEN` env var is present in both manually traced and
|
|
32
|
+
* auto-traced functions.
|
|
33
|
+
*/
|
|
34
|
+
static get isLumigoEnabled(): boolean;
|
|
35
|
+
/**
|
|
36
|
+
* `true` if the Lambda function is already being traced by a higher-level
|
|
37
|
+
* Lumigo wrapper, in which case we don't need to manually wrap our handlers.
|
|
38
|
+
*
|
|
39
|
+
* There are two ways that this can be done, based on the documentation
|
|
40
|
+
* [here](https://docs.lumigo.io/docs/lambda-layers): using a Lambda runtime
|
|
41
|
+
* wrapper, or handler redirection. Each method can be detected via its
|
|
42
|
+
* environment variables. Auto-trace uses the runtime wrapper.
|
|
43
|
+
*/
|
|
44
|
+
static get isLumigoWrappingUs(): boolean;
|
|
28
45
|
/**
|
|
29
46
|
* Process the result once we have one.
|
|
30
47
|
*
|
|
@@ -33,11 +50,10 @@ export default class LambdaWrapper<TConfig extends LambdaWrapperConfig = LambdaW
|
|
|
33
50
|
*/
|
|
34
51
|
static handleSuccess(di: DependencyInjection, result: any): any;
|
|
35
52
|
/**
|
|
36
|
-
* Gracefully handles an error, logging in
|
|
53
|
+
* Gracefully handles an error, logging in Lumigo and generating a response
|
|
37
54
|
* reflecting the `code` of the error, if defined.
|
|
38
55
|
*
|
|
39
|
-
*
|
|
40
|
-
* Epsagon generates alerts for logs on level ERROR. This means that
|
|
56
|
+
* Lumigo generates alerts for logs on level ERROR. This means that
|
|
41
57
|
* `logger.error` will produce an alert. To avoid meaningless notifications,
|
|
42
58
|
* most likely coming from tests, we log INFO unless either:
|
|
43
59
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LambdaWrapper.d.ts","sourceRoot":"","sources":["../../src/core/LambdaWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAInC,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAe,MAAM,UAAU,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC1B;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IAC9E,QAAQ,CAAC,MAAM,EAAE,OAAO;gBAAf,MAAM,EAAE,OAAO;IAEpC;;;;OAIG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,aAAa,CAAC,OAAO,GAAG,WAAW,CAAC;IAIpG;;OAEG;IACH,IAAI,CAAC,CAAC,EACJ,OAAO,EAAE,CAAC,EAAE,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC7D,OAAO,CAAC,EAAE,WAAW,WAMO,GAAG,WAAW,OAAO;IAyDnD;;;;;OAKG;IACH,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG;IASzD
|
|
1
|
+
{"version":3,"file":"LambdaWrapper.d.ts","sourceRoot":"","sources":["../../src/core/LambdaWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAInC,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAe,MAAM,UAAU,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC1B;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IAC9E,QAAQ,CAAC,MAAM,EAAE,OAAO;gBAAf,MAAM,EAAE,OAAO;IAEpC;;;;OAIG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,aAAa,CAAC,OAAO,GAAG,WAAW,CAAC;IAIpG;;OAEG;IACH,IAAI,CAAC,CAAC,EACJ,OAAO,EAAE,CAAC,EAAE,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC7D,OAAO,CAAC,EAAE,WAAW,WAMO,GAAG,WAAW,OAAO;IAyDnD;;;;;OAKG;IACH,MAAM,KAAK,eAAe,IAAI,OAAO,CAEpC;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,kBAAkB,IAAI,OAAO,CAKvC;IAED;;;;;OAKG;IACH,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG;IASzD;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,UAAQ;;;;;CA8B7E"}
|
|
@@ -1,9 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
29
|
+
const lumigo = __importStar(require("@lumigo/tracer"));
|
|
7
30
|
const ResponseModel_1 = __importDefault(require("../models/ResponseModel"));
|
|
8
31
|
const LoggerService_1 = __importDefault(require("../services/LoggerService"));
|
|
9
32
|
const RequestService_1 = __importDefault(require("../services/RequestService"));
|
|
@@ -63,16 +86,38 @@ class LambdaWrapper {
|
|
|
63
86
|
return handled;
|
|
64
87
|
}
|
|
65
88
|
};
|
|
66
|
-
// If
|
|
67
|
-
if (
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
wrapper =
|
|
89
|
+
// If Lumigo is enabled, wrap the handler in the Lumigo wrapper
|
|
90
|
+
if (LambdaWrapper.isLumigoEnabled && !LambdaWrapper.isLumigoWrappingUs) {
|
|
91
|
+
const tracer = lumigo.initTracer({ token: process.env.LUMIGO_TRACER_TOKEN });
|
|
92
|
+
// Lumigo's wrapper works with both callbacks or promises handlers, and
|
|
93
|
+
// the returned function behaves the same way as the original. For our
|
|
94
|
+
// promise-based handler we can safely coerce the type.
|
|
95
|
+
wrapper = tracer.trace(wrapper);
|
|
73
96
|
}
|
|
74
97
|
return wrapper;
|
|
75
98
|
}
|
|
99
|
+
/**
|
|
100
|
+
* `true` if we will send traces to Lumigo.
|
|
101
|
+
*
|
|
102
|
+
* The `LUMIGO_TRACER_TOKEN` env var is present in both manually traced and
|
|
103
|
+
* auto-traced functions.
|
|
104
|
+
*/
|
|
105
|
+
static get isLumigoEnabled() {
|
|
106
|
+
return !!process.env.LUMIGO_TRACER_TOKEN;
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* `true` if the Lambda function is already being traced by a higher-level
|
|
110
|
+
* Lumigo wrapper, in which case we don't need to manually wrap our handlers.
|
|
111
|
+
*
|
|
112
|
+
* There are two ways that this can be done, based on the documentation
|
|
113
|
+
* [here](https://docs.lumigo.io/docs/lambda-layers): using a Lambda runtime
|
|
114
|
+
* wrapper, or handler redirection. Each method can be detected via its
|
|
115
|
+
* environment variables. Auto-trace uses the runtime wrapper.
|
|
116
|
+
*/
|
|
117
|
+
static get isLumigoWrappingUs() {
|
|
118
|
+
return this.isLumigoEnabled && (process.env.AWS_LAMBDA_EXEC_WRAPPER === '/opt/lumigo_wrapper'
|
|
119
|
+
|| !!process.env.LUMIGO_ORIGINAL_HANDLER);
|
|
120
|
+
}
|
|
76
121
|
/**
|
|
77
122
|
* Process the result once we have one.
|
|
78
123
|
*
|
|
@@ -86,11 +131,10 @@ class LambdaWrapper {
|
|
|
86
131
|
return result;
|
|
87
132
|
}
|
|
88
133
|
/**
|
|
89
|
-
* Gracefully handles an error, logging in
|
|
134
|
+
* Gracefully handles an error, logging in Lumigo and generating a response
|
|
90
135
|
* reflecting the `code` of the error, if defined.
|
|
91
136
|
*
|
|
92
|
-
*
|
|
93
|
-
* Epsagon generates alerts for logs on level ERROR. This means that
|
|
137
|
+
* Lumigo generates alerts for logs on level ERROR. This means that
|
|
94
138
|
* `logger.error` will produce an alert. To avoid meaningless notifications,
|
|
95
139
|
* most likely coming from tests, we log INFO unless either:
|
|
96
140
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LambdaWrapper.js","sourceRoot":"","sources":["../../src/core/LambdaWrapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LambdaWrapper.js","sourceRoot":"","sources":["../../src/core/LambdaWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerService.d.ts","sourceRoot":"","sources":["../../src/services/LoggerService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LoggerService.d.ts","sourceRoot":"","sources":["../../src/services/LoggerService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,oBAAoB,MAAM,8BAA8B,CAAC;AAChE,OAAO,mBAAmB,MAAM,6BAA6B,CAAC;AAc9D;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,oBAAoB;IAC7D,OAAO,CAAC,MAAM,CAAuB;IAErC,OAAO,CAAC,OAAO,CAAwB;gBAE3B,EAAE,EAAE,mBAAmB;IA6BnC;;;;;OAKG;IACH,SAAS;IA6BT;;;;;OAKG;IACH,IAAI,MAAM,mBAMT;IAED;;OAEG;IACH,SAAS;IAIT;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,UAAU;IAkB1C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG;IAUlC;;;;;OAKG;IACH,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,SAAK;IAc9B;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG;IAIjB;;;;;;;;;OASG;IACH,OAAO,CAAC,KAAK,EAAE,GAAG;IAUlB;;;;;OAKG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,UAAQ;IAUxC;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,UAAQ;IAUhE;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAE,OAAO,GAAG,SAAS,GAAG,MAAe;CASjF"}
|
|
@@ -26,10 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
const lumigo = __importStar(require("@lumigo/tracer"));
|
|
29
30
|
const Sentry = __importStar(require("@sentry/node"));
|
|
30
|
-
const epsagon_1 = __importDefault(require("epsagon"));
|
|
31
31
|
const winston_1 = __importDefault(require("winston"));
|
|
32
32
|
const DependencyAwareClass_1 = __importDefault(require("../core/DependencyAwareClass"));
|
|
33
|
+
const LambdaWrapper_1 = __importDefault(require("../core/LambdaWrapper"));
|
|
33
34
|
const sentryIsAvailable = typeof process.env.RAVEN_DSN !== 'undefined' && typeof process.env.RAVEN_DSN === 'string' && process.env.RAVEN_DSN !== 'undefined';
|
|
34
35
|
// initialise the Sentry client if available
|
|
35
36
|
if (sentryIsAvailable) {
|
|
@@ -168,12 +169,8 @@ class LoggerService extends DependencyAwareClass_1.default {
|
|
|
168
169
|
if (sentryIsAvailable && error instanceof Error) {
|
|
169
170
|
Sentry.captureException(error);
|
|
170
171
|
}
|
|
171
|
-
if (
|
|
172
|
-
|
|
173
|
-
&& typeof process.env.EPSAGON_SERVICE_NAME === 'string'
|
|
174
|
-
&& process.env.EPSAGON_SERVICE_NAME !== 'undefined'
|
|
175
|
-
&& error instanceof Error) {
|
|
176
|
-
epsagon_1.default.setError(error);
|
|
172
|
+
if (LambdaWrapper_1.default.isLumigoEnabled && error instanceof Error) {
|
|
173
|
+
lumigo.error(message || error.message, { err: error });
|
|
177
174
|
}
|
|
178
175
|
this.logger.log('error', message, { error: LoggerService.processMessage(error) });
|
|
179
176
|
this.label('error', true);
|
|
@@ -211,11 +208,8 @@ class LoggerService extends DependencyAwareClass_1.default {
|
|
|
211
208
|
* @param silent If `false`, the label will also be logged. (default: false)
|
|
212
209
|
*/
|
|
213
210
|
label(descriptor, silent = false) {
|
|
214
|
-
if (
|
|
215
|
-
|
|
216
|
-
&& typeof process.env.EPSAGON_SERVICE_NAME === 'string'
|
|
217
|
-
&& process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
|
|
218
|
-
epsagon_1.default.label(descriptor, true);
|
|
211
|
+
if (LambdaWrapper_1.default.isLumigoEnabled) {
|
|
212
|
+
lumigo.addExecutionTag(descriptor, true);
|
|
219
213
|
}
|
|
220
214
|
if (!silent) {
|
|
221
215
|
this.logger.log('info', `label - ${descriptor}`);
|
|
@@ -229,11 +223,8 @@ class LoggerService extends DependencyAwareClass_1.default {
|
|
|
229
223
|
* @param silent If `false`, the metric will also be logged. (default: false)
|
|
230
224
|
*/
|
|
231
225
|
metric(descriptor, stat, silent = false) {
|
|
232
|
-
if (
|
|
233
|
-
|
|
234
|
-
&& typeof process.env.EPSAGON_SERVICE_NAME === 'string'
|
|
235
|
-
&& process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
|
|
236
|
-
epsagon_1.default.label(descriptor, stat);
|
|
226
|
+
if (LambdaWrapper_1.default.isLumigoEnabled) {
|
|
227
|
+
lumigo.addExecutionTag(descriptor, stat);
|
|
237
228
|
}
|
|
238
229
|
if (silent === false) {
|
|
239
230
|
this.logger.log('info', `metric - ${descriptor} - ${stat}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerService.js","sourceRoot":"","sources":["../../src/services/LoggerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AAEvC,sDAA8B;
|
|
1
|
+
{"version":3,"file":"LoggerService.js","sourceRoot":"","sources":["../../src/services/LoggerService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comicrelief/lambda-wrapper",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.8",
|
|
4
4
|
"description": "Lambda wrapper for all Comic Relief Serverless Projects",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"author": "Adam Clark",
|
|
@@ -47,12 +47,12 @@
|
|
|
47
47
|
"aws-sdk": "^2.831.0"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
+
"@lumigo/tracer": "^1.87.0",
|
|
50
51
|
"@sentry/node": "^6.0.1",
|
|
51
52
|
"@types/aws-lambda": "^8.10.120",
|
|
52
53
|
"alai": "1.0.3",
|
|
53
54
|
"async": "^3.2.4",
|
|
54
55
|
"axios": "^0.27.2",
|
|
55
|
-
"epsagon": "^1.123.3",
|
|
56
56
|
"useragent": "2.3.0",
|
|
57
57
|
"uuid": "^9.0.1",
|
|
58
58
|
"validate.js": "0.13.1",
|