serverless-plugin-datadog 3.0.1 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +35 -27
- package/dist/package.json +1 -1
- package/dist/src/env.d.ts +1 -0
- package/dist/src/env.d.ts.map +1 -1
- package/dist/src/env.js +5 -0
- package/dist/src/env.js.map +1 -1
- package/dist/src/forwarder.d.ts.map +1 -1
- package/dist/src/forwarder.js.map +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +26 -20
- package/dist/src/index.js.map +1 -1
- package/dist/src/layer.d.ts +3 -3
- package/dist/src/layer.d.ts.map +1 -1
- package/dist/src/layer.js +23 -23
- package/dist/src/layer.js.map +1 -1
- package/dist/src/layers-gov.json +16 -16
- package/dist/src/layers.json +168 -168
- package/dist/src/monitor-api-requests.js +5 -5
- package/dist/src/monitor-api-requests.js.map +1 -1
- package/dist/src/monitors.d.ts.map +1 -1
- package/dist/src/monitors.js +4 -4
- package/dist/src/monitors.js.map +1 -1
- package/dist/src/output.js +1 -1
- package/dist/src/output.js.map +1 -1
- package/dist/src/wrapper.js +1 -1
- package/dist/src/wrapper.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
---
|
|
2
|
+
title: Datadog Serverless Plugin
|
|
3
|
+
kind: documentation
|
|
4
|
+
aliases:
|
|
5
|
+
- /serverless/serverless_integrations/plugin/
|
|
6
|
+
dependencies: ["https://github.com/DataDog/serverless-plugin-datadog/blob/master/README.md"]
|
|
7
|
+
---
|
|
2
8
|
|
|
3
9
|
|
|
4
10
|
[](https://codecov.io/gh/DataDog/serverless-plugin-datadog)
|
|
@@ -25,31 +31,32 @@ Each version of the plugin is published with a [specific set of versions of the
|
|
|
25
31
|
|
|
26
32
|
To further configure your plugin, use the following custom parameters in your `serverless.yml`:
|
|
27
33
|
|
|
28
|
-
| Parameter
|
|
29
|
-
|
|
|
30
|
-
| `flushMetricsToLogs`
|
|
31
|
-
| `site`
|
|
32
|
-
| `apiKey`
|
|
33
|
-
| `apiKMSKey`
|
|
34
|
-
| `
|
|
35
|
-
| `
|
|
36
|
-
| `
|
|
37
|
-
| `
|
|
38
|
-
| `
|
|
39
|
-
| `
|
|
40
|
-
| `
|
|
41
|
-
| `
|
|
42
|
-
| `
|
|
43
|
-
| `
|
|
44
|
-
|
|
45
|
-
| `
|
|
46
|
-
| `
|
|
47
|
-
| `
|
|
48
|
-
| `
|
|
49
|
-
| `
|
|
50
|
-
| `
|
|
51
|
-
| `
|
|
52
|
-
| `
|
|
34
|
+
| Parameter | Description |
|
|
35
|
+
| --------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
36
|
+
| `flushMetricsToLogs` | Send custom metrics by using logs with the Datadog Forwarder Lambda function (recommended). Defaults to `true`. If you disable this parameter, it's required to set `apiKey` (or `apiKMSKey` if encrypted). `flushMetricsToLogs` is ignored when `addExtension` is true. |
|
|
37
|
+
| `site` | Set which Datadog site to send data, this is only used when `flushMetricsToLogs` is `false` or `addExtension` is `true`. Possible values are `datadoghq.com`, `datadoghq.eu`, `us3.datadoghq.com`, `us5.datadoghq.com`, and `ddog-gov.com`. The default is `datadoghq.com`. |
|
|
38
|
+
| `apiKey` | Datadog API Key, only needed when `flushMetricsToLogs` is `false` or `addExtension` is `true`. Defining `apiKey` will add the Datadog API key directly to your Lambda functions as an environment variable. For more information about getting a Datadog API key, see the [API key documentation][3]. |
|
|
39
|
+
| `apiKMSKey` | Datadog API Key encrypted using KMS. Use this parameter in place of `apiKey` when `flushMetricsToLogs` is `false` or `addExtension` is `true`, and you are using KMS encryption. Defining `apiKMSKey` will add the Datadog API Key directly to your Lambda functions as an environment variable. |
|
|
40
|
+
| `captureLambdaPayload` | (Experimental) This optional setting configures Datadog ingestion for incoming and outgoing AWS Lambda payloads. Function request and response values are added as part of outgoing APM spans sent to Datadog, and require Datadog APM to be configured on your function. Obfuscation of fields in the Lambda payload is available via the `replace_tags` block within `apm_config` settings in [datadog.yaml.][12] Defaults to `false`. |
|
|
41
|
+
| `monitorsApiKey` | Datadog API Key. Only needed when using plugin to create monitors for your functions and when `monitors` is defined. Separate from `apiKey` with your function, `monitorsApiKey` is only used to create monitors through the Datadog Monitors API. You may use the same API key for both `apiKey` and `monitorsApiKey`. |
|
|
42
|
+
| `monitorsAppKey` | Datadog Application Key. Only needed when using plugin to create monitors for your function and when `monitors` is defined. |
|
|
43
|
+
| `addLayers` | Whether to install the Datadog Lambda library as a layer. Defaults to `true`. Set to `false` when you plan to package the Datadog Lambda library to your function's deployment package on your own so that you can install a specific version of the Datadog Lambda library ([Python][4] or [Node.js][5]). |
|
|
44
|
+
| `addExtension` | Whether to install the Datadog Lambda Extension as a layer. Defaults to `false`. When enabled, it's required to set the `apiKey` (or `apiKMSKey`) parameter. Learn more about the Lambda Extension Layer [here][8]. Note: AWS only supports Lambda Extensions for [certain runtimes][9]. |
|
|
45
|
+
| `logLevel` | The log level, set to `DEBUG` for extended logging. |
|
|
46
|
+
| `enableXrayTracing` | Set `true` to enable X-Ray tracing on the Lambda functions and API Gateway integrations. Defaults to `false`. |
|
|
47
|
+
| `enableDDTracing` | Enable Datadog tracing on the Lambda function. Note: This applies only to integrations using the Datadog Extension. Defaults to `true`. |
|
|
48
|
+
| `enableDDLogs` | Enable Datadog log collection for the Lambda function. Note: This setting has no effect on logs sent via the Datadog Forwarder. Defaults to `true`. |
|
|
49
|
+
| `subscribeToApiGatewayLogs` | Enable automatic subscription of the Datadog Forwarder to API Gateway log groups. Defaults to `true`. |
|
|
50
|
+
| `subscribeToHttpApiLogs` | Enable automatic subscription of the Datadog Forwarder to Http-api log groups. Defaults to `true`. |
|
|
51
|
+
| `subscribeToWebsocketLogs` | Enable automatic subscription of the Datadog Forwarder to Websocket log groups. Defaults to `true`. |
|
|
52
|
+
| `forwarderArn` | Setting this parameter subscribes the given Datadog forwarder to the Lambda functions’ CloudWatch log groups. Required when `enableDDTracing` is set to `true` unless the subscription is otherwise applied. For example, if a Datadog Forwarder subscription is applied via Datadog's AWS Integration, then `forwarderArn` is not required. |
|
|
53
|
+
| `integrationTesting` | Set `true` when running integration tests. This will bypass the validation of the Forwarder ARN and the addition of Datadog Monitor output links. Defaults to `false`. |
|
|
54
|
+
| `enableTags` | When set, automatically tag the Lambda functions with the `service` and `env` tags using the `service` and `stage` values from the serverless application definition. It does NOT override if a `service` or `env` tag already exists. Defaults to `true`. |
|
|
55
|
+
| `injectLogContext` | When set, the lambda layer will automatically patch console.log with Datadog's tracing ids. Defaults to `true`. |
|
|
56
|
+
| `exclude` | When set, this plugin will ignore all specified functions. Use this parameter if you have any functions that should not include Datadog functionality. Defaults to `[]`. |
|
|
57
|
+
| `enabled` | When set to false, the Datadog plugin will stay inactive. Defaults to `true`. You can control this option using an environment variable, e.g. `enabled: ${strToBool(${env:DD_PLUGIN_ENABLED, true})}`, to activate/deactivate the plugin during deployment. Alternatively, you can also use the value passed in through `--stage` to control this option, [see example.](#disable-plugin-for-particular-environment) |
|
|
58
|
+
| `monitors` | When defined, the Datadog plugin will configure monitors for the deployed function. You must also have `monitorsApiKey` and `monitorsAppKey` defined. To learn how to define monitors, see [To Enable and Configure a Recommended Serverless Monitor.](#to-enable-and-configure-a-recommended-serverless-monitor) |
|
|
59
|
+
| `customHandler` | When set, the specified handler is set as the handler for all the functions. By deafult, the handler is set to `/opt/nodejs/node_modules/datadog-lambda-js/handler.handler` if `addLayers` is set to `true`, or `node_modules/datadog-lambda-js/dist/handler.handler` if `addLayers` is set to `false` |
|
|
53
60
|
|
|
54
61
|
To use any of these parameters, add a `custom` > `datadog` section to your `serverless.yml` similar to this example:
|
|
55
62
|
|
|
@@ -263,7 +270,7 @@ For product feedback and questions, join the `#serverless` channel in the [Datad
|
|
|
263
270
|
|
|
264
271
|
Unless explicitly stated otherwise, all files in this repository are licensed under the Apache License Version 2.0.
|
|
265
272
|
|
|
266
|
-
This product includes software developed at Datadog (https://www.datadoghq.com
|
|
273
|
+
This product includes software developed at Datadog (<https://www.datadoghq.com/>). Copyright 2021 Datadog, Inc.
|
|
267
274
|
|
|
268
275
|
[1]: https://docs.datadoghq.com/serverless/installation/python/?tab=serverlessframework
|
|
269
276
|
[2]: https://docs.datadoghq.com/serverless/installation/nodejs/?tab=serverlessframework
|
|
@@ -276,3 +283,4 @@ This product includes software developed at Datadog (https://www.datadoghq.com/)
|
|
|
276
283
|
[9]: https://docs.aws.amazon.com/lambda/latest/dg/using-extensions.html
|
|
277
284
|
[10]: https://github.com/DataDog/serverless-plugin-datadog/blob/master/CONTRIBUTING.md
|
|
278
285
|
[11]: https://github.com/DataDog/serverless-plugin-datadog/blob/master/src/layers.json
|
|
286
|
+
[12]: https://docs.datadoghq.com/tracing/setup_overview/configure_data_security/?tab=mongodb#replace-rules-for-tag-filtering
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "serverless-plugin-datadog",
|
|
3
|
-
"version": "3.0
|
|
3
|
+
"version": "3.2.0",
|
|
4
4
|
"description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"repository": "https://github.com/DataDog/serverless-plugin-datadog",
|
package/dist/src/env.d.ts
CHANGED
package/dist/src/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,MAAM,WAAW,aAAa;IAE5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,iBAAiB,EAAE,OAAO,CAAC;IAE3B,eAAe,EAAE,OAAO,CAAC;IAEzB,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,OAAO,CAAC;IAGtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAI7B,UAAU,EAAE,OAAO,CAAC;IAEpB,gBAAgB,EAAE,OAAO,CAAC;IAG1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC;IAGtD,qBAAqB,EAAE,OAAO,CAAC;IAE/B,wBAAwB,EAAE,OAAO,CAAC;IAGlC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,MAAM,WAAW,aAAa;IAE5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,iBAAiB,EAAE,OAAO,CAAC;IAE3B,eAAe,EAAE,OAAO,CAAC;IAEzB,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,OAAO,CAAC;IAGtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAI7B,UAAU,EAAE,OAAO,CAAC;IAEpB,gBAAgB,EAAE,OAAO,CAAC;IAG1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC;IAGtD,qBAAqB,EAAE,OAAO,CAAC;IAE/B,wBAAwB,EAAE,OAAO,CAAC;IAGlC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAYD,eAAO,MAAM,oBAAoB,EAAE,aAgBlC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,QAgClF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAczD;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,QAgB3D;AAiBD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,WAehD"}
|
package/dist/src/env.js
CHANGED
|
@@ -17,6 +17,7 @@ const logForwardingEnvVar = "DD_FLUSH_TO_LOG";
|
|
|
17
17
|
const ddTracingEnabledEnvVar = "DD_TRACE_ENABLED";
|
|
18
18
|
const logInjectionEnvVar = "DD_LOGS_INJECTION";
|
|
19
19
|
const ddLogsEnabledEnvVar = "DD_SERVERLESS_LOGS_ENABLED";
|
|
20
|
+
const ddCaptureLambdaPayloadEnvVar = "DD_CAPTURE_LAMBDA_PAYLOAD";
|
|
20
21
|
exports.defaultConfiguration = {
|
|
21
22
|
addLayers: true,
|
|
22
23
|
flushMetricsToLogs: true,
|
|
@@ -32,6 +33,7 @@ exports.defaultConfiguration = {
|
|
|
32
33
|
subscribeToAccessLogs: true,
|
|
33
34
|
subscribeToExecutionLogs: false,
|
|
34
35
|
enableDDLogs: true,
|
|
36
|
+
captureLambdaPayload: false,
|
|
35
37
|
};
|
|
36
38
|
function setEnvConfiguration(config, handlers) {
|
|
37
39
|
handlers.forEach(({ handler }) => {
|
|
@@ -62,6 +64,9 @@ function setEnvConfiguration(config, handlers) {
|
|
|
62
64
|
if (config.enableDDLogs !== undefined && environment[ddLogsEnabledEnvVar] === undefined) {
|
|
63
65
|
environment[ddLogsEnabledEnvVar] = config.enableDDLogs;
|
|
64
66
|
}
|
|
67
|
+
if (environment[ddCaptureLambdaPayloadEnvVar] === undefined) {
|
|
68
|
+
environment[ddCaptureLambdaPayloadEnvVar] = config.captureLambdaPayload;
|
|
69
|
+
}
|
|
65
70
|
});
|
|
66
71
|
}
|
|
67
72
|
exports.setEnvConfiguration = setEnvConfiguration;
|
package/dist/src/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../../src/forwarder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../../src/forwarder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,OAAO,MAAM,4BAA4B,CAAC;AACjD,OAAO,GAAG,GAAG,QAAQ,6CAA6C,CAAC,CAAC;AAqBpE,UAAU,gBAAgB;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,OAAO,GAAG,SAAS,CAAC;IACxC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAaD,aAAK,aAAa,GACd,OAAO,GACP;IACE,aAAa,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC,GACD,SAAS,CAAC;AAEd,aAAK,UAAU,GACX;IACE,OAAO,EAAE,aAAa,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,aAAa,CAAC;CAC1B,GACD,SAAS,CAAC;AAQd,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAmBD,wBAAsB,qCAAqC,CACzD,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,uBAAuB,GAAG,MAAM,iBA4B9C;AAED,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,uBAAuB,GAAG,MAAM,EAC7C,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,YAAY,EAAE,qBAyCzB;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,oBAejG;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM;;;;;;;;KAc/E;AAyHD,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,UAAU,CAuBxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../../src/forwarder.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../../src/forwarder.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAKhD,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACjC,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACzC"}
|
package/dist/src/index.js
CHANGED
|
@@ -86,22 +86,22 @@ module.exports = class ServerlessPlugin {
|
|
|
86
86
|
}
|
|
87
87
|
beforePackageFunction() {
|
|
88
88
|
return __awaiter(this, void 0, void 0, function* () {
|
|
89
|
-
const config = env_1.getConfig(this.serverless.service);
|
|
89
|
+
const config = (0, env_1.getConfig)(this.serverless.service);
|
|
90
90
|
if (config.enabled === false)
|
|
91
91
|
return;
|
|
92
92
|
this.serverless.cli.log("Auto instrumenting functions with Datadog");
|
|
93
93
|
configHasOldProperties(config);
|
|
94
94
|
validateConfiguration(config);
|
|
95
95
|
const defaultRuntime = this.serverless.service.provider.runtime;
|
|
96
|
-
const handlers = layer_1.findHandlers(this.serverless.service, config.exclude, defaultRuntime);
|
|
97
|
-
env_1.setEnvConfiguration(config, handlers);
|
|
96
|
+
const handlers = (0, layer_1.findHandlers)(this.serverless.service, config.exclude, defaultRuntime);
|
|
97
|
+
(0, env_1.setEnvConfiguration)(config, handlers);
|
|
98
98
|
const allLayers = { regions: Object.assign(Object.assign({}, layers.regions), govLayers.regions) };
|
|
99
99
|
if (config.addLayers) {
|
|
100
100
|
this.serverless.cli.log("Adding Lambda Library Layers to functions");
|
|
101
101
|
this.debugLogHandlers(handlers);
|
|
102
|
-
layer_1.applyLambdaLibraryLayers(this.serverless.service
|
|
103
|
-
if (env_1.hasWebpackPlugin(this.serverless.service)) {
|
|
104
|
-
env_1.forceExcludeDepsFromWebpack(this.serverless.service);
|
|
102
|
+
(0, layer_1.applyLambdaLibraryLayers)(this.serverless.service, handlers, allLayers);
|
|
103
|
+
if ((0, env_1.hasWebpackPlugin)(this.serverless.service)) {
|
|
104
|
+
(0, env_1.forceExcludeDepsFromWebpack)(this.serverless.service);
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
else {
|
|
@@ -110,7 +110,7 @@ module.exports = class ServerlessPlugin {
|
|
|
110
110
|
if (config.addExtension) {
|
|
111
111
|
this.serverless.cli.log("Adding Datadog Lambda Extension Layer to functions");
|
|
112
112
|
this.debugLogHandlers(handlers);
|
|
113
|
-
layer_1.applyExtensionLayer(this.serverless.service
|
|
113
|
+
(0, layer_1.applyExtensionLayer)(this.serverless.service, handlers, allLayers);
|
|
114
114
|
}
|
|
115
115
|
else {
|
|
116
116
|
this.serverless.cli.log("Skipping adding Lambda Extension Layer");
|
|
@@ -125,12 +125,12 @@ module.exports = class ServerlessPlugin {
|
|
|
125
125
|
else if (config.enableXrayTracing) {
|
|
126
126
|
tracingMode = tracing_1.TracingMode.XRAY;
|
|
127
127
|
}
|
|
128
|
-
tracing_1.enableTracing(this.serverless.service, tracingMode, handlers);
|
|
128
|
+
(0, tracing_1.enableTracing)(this.serverless.service, tracingMode, handlers);
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
131
|
afterPackageFunction() {
|
|
132
132
|
return __awaiter(this, void 0, void 0, function* () {
|
|
133
|
-
const config = env_1.getConfig(this.serverless.service);
|
|
133
|
+
const config = (0, env_1.getConfig)(this.serverless.service);
|
|
134
134
|
if (config.enabled === false)
|
|
135
135
|
return;
|
|
136
136
|
// Create an object that contains some of our booleans for the forwarder
|
|
@@ -141,24 +141,24 @@ module.exports = class ServerlessPlugin {
|
|
|
141
141
|
SubToExecutionLogGroups: config.subscribeToExecutionLogs,
|
|
142
142
|
};
|
|
143
143
|
const defaultRuntime = this.serverless.service.provider.runtime;
|
|
144
|
-
const handlers = layer_1.findHandlers(this.serverless.service, config.exclude, defaultRuntime);
|
|
144
|
+
const handlers = (0, layer_1.findHandlers)(this.serverless.service, config.exclude, defaultRuntime);
|
|
145
145
|
let datadogForwarderArn;
|
|
146
146
|
datadogForwarderArn = setDatadogForwarder(config);
|
|
147
147
|
this.serverless.cli.log("Setting Datadog Forwarder");
|
|
148
148
|
if (datadogForwarderArn) {
|
|
149
149
|
const aws = this.serverless.getProvider("aws");
|
|
150
|
-
const errors = yield forwarder_1.addCloudWatchForwarderSubscriptions(this.serverless.service, aws, datadogForwarderArn, forwarderConfigs, handlers);
|
|
150
|
+
const errors = yield (0, forwarder_1.addCloudWatchForwarderSubscriptions)(this.serverless.service, aws, datadogForwarderArn, forwarderConfigs, handlers);
|
|
151
151
|
if (config.subscribeToExecutionLogs) {
|
|
152
|
-
yield forwarder_1.addExecutionLogGroupsAndSubscriptions(this.serverless.service, aws, datadogForwarderArn);
|
|
152
|
+
yield (0, forwarder_1.addExecutionLogGroupsAndSubscriptions)(this.serverless.service, aws, datadogForwarderArn);
|
|
153
153
|
}
|
|
154
154
|
for (const error of errors) {
|
|
155
155
|
this.serverless.cli.log(error);
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
this.addTags(handlers, config.enableTags);
|
|
159
|
-
wrapper_1.redirectHandlers(handlers, config.addLayers, config.customHandler);
|
|
159
|
+
(0, wrapper_1.redirectHandlers)(handlers, config.addLayers, config.customHandler);
|
|
160
160
|
if (config.integrationTesting === false) {
|
|
161
|
-
yield output_1.addOutputLinks(this.serverless, config.site, handlers);
|
|
161
|
+
yield (0, output_1.addOutputLinks)(this.serverless, config.site, handlers);
|
|
162
162
|
}
|
|
163
163
|
else {
|
|
164
164
|
this.serverless.cli.log("Skipped adding output links because 'integrationTesting' is set true");
|
|
@@ -167,15 +167,15 @@ module.exports = class ServerlessPlugin {
|
|
|
167
167
|
}
|
|
168
168
|
afterDeploy() {
|
|
169
169
|
return __awaiter(this, void 0, void 0, function* () {
|
|
170
|
-
const config = env_1.getConfig(this.serverless.service);
|
|
170
|
+
const config = (0, env_1.getConfig)(this.serverless.service);
|
|
171
171
|
const service = this.serverless.service.getServiceName();
|
|
172
172
|
const env = this.serverless.getProvider("aws").getStage();
|
|
173
173
|
if (config.enabled === false)
|
|
174
174
|
return;
|
|
175
175
|
if (config.monitors && config.monitorsApiKey && config.monitorsAppKey) {
|
|
176
|
-
const cloudFormationStackId = yield monitor_api_requests_1.getCloudFormationStackId(this.serverless);
|
|
176
|
+
const cloudFormationStackId = yield (0, monitor_api_requests_1.getCloudFormationStackId)(this.serverless);
|
|
177
177
|
try {
|
|
178
|
-
const logStatements = yield monitors_1.setMonitors(config.site, config.monitors, config.monitorsApiKey, config.monitorsAppKey, cloudFormationStackId, service, env);
|
|
178
|
+
const logStatements = yield (0, monitors_1.setMonitors)(config.site, config.monitors, config.monitorsApiKey, config.monitorsAppKey, cloudFormationStackId, service, env);
|
|
179
179
|
for (const logStatement of logStatements) {
|
|
180
180
|
this.serverless.cli.log(logStatement);
|
|
181
181
|
}
|
|
@@ -184,7 +184,7 @@ module.exports = class ServerlessPlugin {
|
|
|
184
184
|
this.serverless.cli.log("Error occurred when configuring monitors.");
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
|
-
return output_1.printOutputs(this.serverless, config.site);
|
|
187
|
+
return (0, output_1.printOutputs)(this.serverless, config.site);
|
|
188
188
|
});
|
|
189
189
|
}
|
|
190
190
|
debugLogHandlers(handlers) {
|
|
@@ -246,12 +246,18 @@ function configHasOldProperties(obj) {
|
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
function validateConfiguration(config) {
|
|
249
|
-
const siteList = [
|
|
249
|
+
const siteList = [
|
|
250
|
+
"datadoghq.com",
|
|
251
|
+
"datadoghq.eu",
|
|
252
|
+
"us3.datadoghq.com",
|
|
253
|
+
"us5.datadoghq.com",
|
|
254
|
+
"ddog-gov.com",
|
|
255
|
+
];
|
|
250
256
|
if (config.apiKey !== undefined && config.apiKMSKey !== undefined) {
|
|
251
257
|
throw new Error("`apiKey` and `apiKMSKey` should not be set at the same time.");
|
|
252
258
|
}
|
|
253
259
|
if (config.site !== undefined && !siteList.includes(config.site.toLowerCase())) {
|
|
254
|
-
throw new Error("Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, or ddog-gov.com.");
|
|
260
|
+
throw new Error("Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, or ddog-gov.com.");
|
|
255
261
|
}
|
|
256
262
|
if (config.addExtension) {
|
|
257
263
|
if (config.apiKey === undefined && config.apiKMSKey === undefined) {
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,sDAAwC;AACxC,6DAA+C;AAC/C,kDAA0C;AAE1C,+BAAqH;AACrH,mCAAiH;AACjH,uCAAuD;AACvD,uCAA6C;AAC7C,2CAAyG;AACzG,qCAAwD;AAExD,yCAAyC;AACzC,iEAAkE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/layer.d.ts
CHANGED
|
@@ -22,8 +22,8 @@ export declare const runtimeLookup: {
|
|
|
22
22
|
[key: string]: RuntimeType;
|
|
23
23
|
};
|
|
24
24
|
export declare function findHandlers(service: Service, exclude: string[], defaultRuntime?: string): FunctionInfo[];
|
|
25
|
-
export declare function applyLambdaLibraryLayers(
|
|
26
|
-
export declare function applyExtensionLayer(
|
|
27
|
-
export declare function pushLayerARN(
|
|
25
|
+
export declare function applyLambdaLibraryLayers(service: Service, handlers: FunctionInfo[], layers: LayerJSON): void;
|
|
26
|
+
export declare function applyExtensionLayer(service: Service, handlers: FunctionInfo[], layers: LayerJSON): void;
|
|
27
|
+
export declare function pushLayerARN(layerARN: string, currentLayers: string[]): string[];
|
|
28
28
|
export declare function isFunctionDefinitionHandler(funcDef: FunctionDefinition): funcDef is FunctionDefinitionHandler;
|
|
29
29
|
//# sourceMappingURL=layer.d.ts.map
|
package/dist/src/layer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,WAAW,IAAA;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE;QACP,CAAC,MAAM,EAAE,MAAM,GACX;YACE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvC,GACD,SAAS,CAAC;KACf,CAAC;CACH;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CASvD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAgBzG;AAED,wBAAgB,wBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,WAAW,IAAA;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE;QACP,CAAC,MAAM,EAAE,MAAM,GACX;YACE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvC,GACD,SAAS,CAAC;KACf,CAAC;CACH;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CASvD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAgBzG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,QAoBrG;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,QAiBhG;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAIhF;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,IAAI,yBAAyB,CAE7G"}
|
package/dist/src/layer.js
CHANGED
|
@@ -34,7 +34,8 @@ function findHandlers(service, exclude, defaultRuntime) {
|
|
|
34
34
|
.filter((result) => exclude === undefined || (exclude !== undefined && !exclude.includes(result.name)));
|
|
35
35
|
}
|
|
36
36
|
exports.findHandlers = findHandlers;
|
|
37
|
-
function applyLambdaLibraryLayers(
|
|
37
|
+
function applyLambdaLibraryLayers(service, handlers, layers) {
|
|
38
|
+
const { region } = service.provider;
|
|
38
39
|
const regionRuntimes = layers.regions[region];
|
|
39
40
|
if (regionRuntimes === undefined) {
|
|
40
41
|
return;
|
|
@@ -45,15 +46,14 @@ function applyLambdaLibraryLayers(region, handlers, layers) {
|
|
|
45
46
|
}
|
|
46
47
|
const { runtime } = handler;
|
|
47
48
|
const lambdaLayerARN = runtime !== undefined ? regionRuntimes[runtime] : undefined;
|
|
48
|
-
let currentLayers = getLayers(handler);
|
|
49
49
|
if (lambdaLayerARN) {
|
|
50
|
-
|
|
51
|
-
setLayers(handler, currentLayers);
|
|
50
|
+
addLayer(service, handler, lambdaLayerARN);
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
53
|
}
|
|
55
54
|
exports.applyLambdaLibraryLayers = applyLambdaLibraryLayers;
|
|
56
|
-
function applyExtensionLayer(
|
|
55
|
+
function applyExtensionLayer(service, handlers, layers) {
|
|
56
|
+
const { region } = service.provider;
|
|
57
57
|
const regionRuntimes = layers.regions[region];
|
|
58
58
|
if (regionRuntimes === undefined) {
|
|
59
59
|
return;
|
|
@@ -64,35 +64,35 @@ function applyExtensionLayer(region, handlers, layers) {
|
|
|
64
64
|
}
|
|
65
65
|
let extensionLayerARN;
|
|
66
66
|
extensionLayerARN = regionRuntimes[extensionLayerKey];
|
|
67
|
-
let currentLayers = getLayers(handler);
|
|
68
67
|
if (extensionLayerARN) {
|
|
69
|
-
|
|
70
|
-
setLayers(handler, currentLayers);
|
|
68
|
+
addLayer(service, handler, extensionLayerARN);
|
|
71
69
|
}
|
|
72
70
|
}
|
|
73
71
|
}
|
|
74
72
|
exports.applyExtensionLayer = applyExtensionLayer;
|
|
75
|
-
function pushLayerARN(
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return currentLayers;
|
|
73
|
+
function pushLayerARN(layerARN, currentLayers) {
|
|
74
|
+
const layerSet = new Set(currentLayers);
|
|
75
|
+
layerSet.add(layerARN);
|
|
76
|
+
return Array.from(layerSet);
|
|
82
77
|
}
|
|
83
78
|
exports.pushLayerARN = pushLayerARN;
|
|
84
79
|
function isFunctionDefinitionHandler(funcDef) {
|
|
85
80
|
return typeof funcDef.handler === "string";
|
|
86
81
|
}
|
|
87
82
|
exports.isFunctionDefinitionHandler = isFunctionDefinitionHandler;
|
|
88
|
-
function
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
|
|
83
|
+
function addLayer(service, handler, layerArn) {
|
|
84
|
+
const functionLayersList = handler.handler.layers || [];
|
|
85
|
+
const serviceLayersList = service.provider.layers || [];
|
|
86
|
+
// Function-level layers override service-level layers
|
|
87
|
+
// Append to the function-level layers if other function-level layers are present
|
|
88
|
+
// If service-level layers are present
|
|
89
|
+
// Set them at the function level, as our layers are runtime-dependent and could vary
|
|
90
|
+
// between functions in the same project
|
|
91
|
+
if (functionLayersList.length > 0 || serviceLayersList.length === 0) {
|
|
92
|
+
handler.handler.layers = pushLayerARN(layerArn, functionLayersList);
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
handler.handler.layers = pushLayerARN(layerArn, serviceLayersList);
|
|
92
96
|
}
|
|
93
|
-
return layersList;
|
|
94
|
-
}
|
|
95
|
-
function setLayers(handler, layers) {
|
|
96
|
-
handler.handler.layers = layers;
|
|
97
97
|
}
|
|
98
98
|
//# sourceMappingURL=layer.js.map
|
package/dist/src/layer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":";;;AASA,MAAM,iBAAiB,GAAW,WAAW,CAAC;AAC9C,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,6CAAI,CAAA;IACJ,iDAAM,CAAA;IACN,2DAAW,CAAA;AACb,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB;AAmBY,QAAA,aAAa,GAAmC;IAC3D,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;CAChC,CAAC;AAEF,SAAgB,YAAY,CAAC,OAAgB,EAAE,OAAiB,EAAE,cAAuB;IACvF,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;SACrC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;QACvB,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,GAAG,cAAc,CAAC;SAC1B;QACD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,qBAAa,EAAE;YACrD,OAAO,EAAE,IAAI,EAAE,qBAAa,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAkB,CAAC;SACjF;QACD,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAkB,CAAC;IACnF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC;SACxC,MAAM,CACL,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAC7E,CAAC;AACxB,CAAC;AAhBD,oCAgBC;AAED,SAAgB,wBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"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"}
|