serverless-plugin-datadog - npm Package Compare versions

Comparing version 2.14.0 to 2.15.0

dist/package.json

 {
     "name": "serverless-plugin-datadog",
-    "version": "2.14.0",
+    "version": "2.15.0",
     "description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
@@ -5,0 +5,0 @@ "main": "dist/src/index.js",

dist/src/env.d.ts

@@ -12,2 +12,3 @@ import Service from "serverless/classes/Service";
     enableDDTracing: boolean;
+    forwarderArn?: string;
     forwarder?: string;
@@ -14,0 +15,0 @@ enableTags: boolean;

dist/src/env.js

@@ -11,2 +11,3 @@ "use strict";
 exports.hasWebpackPlugin = exports.forceExcludeDepsFromWebpack = exports.getConfig = exports.setEnvConfiguration = exports.defaultConfiguration = void 0;
+const webpackPluginName = "serverless-webpack";
 const apiKeyEnvVar = "DD_API_KEY";
@@ -108,5 +109,14 @@ const apiKeyKMSEnvVar = "DD_KMS_API_KEY";
     }
-    return plugins.find((plugin) => plugin === "serverless-webpack") !== undefined;
+    if (Array.isArray(plugins)) {
+        // We have a normal plugin array
+        return plugins.find((plugin) => plugin === webpackPluginName) !== undefined;
+    }
+    // We have an enhanced plugins object
+    const modules = service.plugins.modules;
+    if (modules === undefined) {
+        return false;
+    }
+    return modules.find((plugin) => plugin === webpackPluginName) !== undefined;
 }
 exports.hasWebpackPlugin = hasWebpackPlugin;
 //# sourceMappingURL=env.js.map

dist/src/forwarder.js

@@ -16,5 +16,27 @@ "use strict";
 const maxAllowableLogGroupSubscriptions = 2;
+class DatadogForwarderNotFoundError extends Error {
+    constructor(message) {
+        super(...message);
+        this.name = "DatadogForwarderNotFoundError";
+        this.message = message;
+    }
+}
 function isLogGroup(value) {
     return value.Type === logGroupKey;
 }
+/**
+ * Validates whether Lambda forwarder exists in the account
+ * @param aws Serverless framework provided AWS client
+ * @param functionArn The forwarder ARN to be validated
+ */
+function doesForwarderExist(aws, functionArn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield aws.request("Lambda", "getFunction", { FunctionName: functionArn });
+        }
+        catch (err) {
+            throw new DatadogForwarderNotFoundError(`Could not perform GetFunction on ${functionArn}.`);
+        }
+    });
+}
 function addCloudWatchForwarderSubscriptions(service, aws, functionArn) {
@@ -27,2 +49,3 @@ var _a;
         }
+        yield doesForwarderExist(aws, functionArn);
         const errors = [];
@@ -29,0 +52,0 @@ for (const [name, resource] of Object.entries(resources)) {

dist/src/index.js

@@ -121,7 +121,19 @@ "use strict";
             const config = env_1.getConfig(this.serverless.service);
+            const forwarderArn = config.forwarderArn;
+            const forwarder = config.forwarder;
+            let datadogForwarderArn;
             if (config.enabled === false)
                 return;
-            if (config.forwarder) {
+            if (forwarderArn && forwarder) {
+                throw new Error("Both 'forwarderArn' and 'forwarder' parameters are set. Please only use the 'forwarderArn' parameter.");
+            }
+            else if (forwarderArn !== undefined && forwarder === undefined) {
+                datadogForwarderArn = forwarderArn;
+            }
+            else if (forwarder !== undefined && forwarderArn === undefined) {
+                datadogForwarderArn = forwarder;
+            }
+            if (datadogForwarderArn) {
                 const aws = this.serverless.getProvider("aws");
-                const errors = yield forwarder_1.addCloudWatchForwarderSubscriptions(this.serverless.service, aws, config.forwarder);
+                const errors = yield forwarder_1.addCloudWatchForwarderSubscriptions(this.serverless.service, aws, datadogForwarderArn);
                 for (const error of errors) {
@@ -128,0 +140,0 @@ this.serverless.cli.log(error);

dist/src/layer.js

@@ -13,2 +13,3 @@ "use strict";
     "nodejs12.x": RuntimeType.NODE,
+    "nodejs14.x": RuntimeType.NODE,
     "nodejs8.10": RuntimeType.NODE,
@@ -15,0 +16,0 @@ "python2.7": RuntimeType.PYTHON,

dist/src/layers-gov.json

 {
     "regions": {
         "us-gov-west-1": {
-            "nodejs10.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python38:28"
         },
         "us-gov-east-1": {
-            "nodejs10.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python38:28"
         }
     }
 }

dist/src/layers.json

 {
     "regions": {
         "af-south-1": {
-            "nodejs10.x": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:af-south-1:464622532012:layer:Datadog-Python38:28"
         },
         "eu-north-1": {
             "nodejs8.10": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python38:28"
         },
         "ap-south-1": {
             "nodejs8.10": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python38:28"
         },
         "eu-west-3": {
             "nodejs8.10": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python38:28"
         },
         "eu-west-2": {
             "nodejs8.10": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python38:28"
         },
         "eu-south-1": {
-            "nodejs10.x": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:eu-south-1:464622532012:layer:Datadog-Python38:28"
         },
         "eu-west-1": {
             "nodejs8.10": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python38:28"
         },
         "ap-northeast-2": {
             "nodejs8.10": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python38:28"
         },
         "me-south-1": {
-            "nodejs10.x": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:me-south-1:464622532012:layer:Datadog-Python38:28"
         },
         "ap-northeast-1": {
             "nodejs8.10": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python38:28"
         },
         "sa-east-1": {
             "nodejs8.10": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node10-x:45",
-            "nodejs12.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python38:28"
         },
         "ca-central-1": {
             "nodejs8.10": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python38:28"
         },
         "ap-east-1": {
-            "nodejs10.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python38:28"
         },
         "ap-southeast-1": {
             "nodejs8.10": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python38:28"
         },
         "ap-southeast-2": {
             "nodejs8.10": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python38:28"
         },
         "eu-central-1": {
             "nodejs8.10": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python38:28"
         },
         "us-east-1": {
             "nodejs8.10": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python38:28"
         },
         "us-east-2": {
             "nodejs8.10": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python38:28"
         },
         "us-west-1": {
             "nodejs8.10": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python38:28"
         },
         "us-west-2": {
             "nodejs8.10": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node8-10:18",
-            "nodejs10.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node10-x:44",
-            "nodejs12.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node12-x:44",
-            "python2.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python27:27",
-            "python3.6": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python36:27",
-            "python3.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python37:27",
-            "python3.8": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python38:27"
+            "nodejs10.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node10-x:47",
+            "nodejs12.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node12-x:47",
+            "nodejs14.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node14-x:47",
+            "python2.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python27:28",
+            "python3.6": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python36:28",
+            "python3.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python37:28",
+            "python3.8": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python38:28"
         }
     }
 }

package.json

 {
   "name": "serverless-plugin-datadog",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
@@ -5,0 +5,0 @@ "main": "dist/src/index.js",

README.md

@@ -34,4 +34,4 @@ # Datadog Serverless Plugin
 | `enableXrayTracing`  | Set `true` to enable X-Ray tracing on the Lambda functions and API Gateway integrations. Defaults to `false`.                                                                                                                                                                                                                                                                                   |
-| `enableDDTracing`    | Enable Datadog tracing on the Lambda function. Defaults to `true`. When enabled, it's required to set the `forwarder` parameter.                                                                                                                                                                                                                                                                         |
-| `forwarder`          | Setting this parameter subscribes the Lambda functions' CloudWatch log groups to the given Datadog forwarder Lambda function. Required when `enableDDTracing` is set to `true`.                                                                                                                                                                                                                 |
+| `enableDDTracing`    | Enable Datadog tracing on the Lambda function. Defaults to `true`. When enabled, it's required to set the `forwarderArn` parameter.                                                                                                                                                                                                                                                                         |
+| `forwarderArn`          | Setting this parameter subscribes the Lambda functions' CloudWatch log groups to the given Datadog forwarder Lambda function. Required when `enableDDTracing` is set to `true`.                                                                                                                                                                                                                 |
 | `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,3 +55,3 @@ | `injectLogContext`         | When set, the lambda layer will automatically patch console.log with Datadog's tracing ids. Defaults to `true`.                                                                                                                                      |
     enableDDTracing: true
-    forwarder: arn:aws:lambda:us-east-1:000000000000:function:datadog-forwarder
+    forwarderArn: arn:aws:lambda:us-east-1:000000000000:function:datadog-forwarder
     enableTags: true
@@ -108,3 +108,3 @@ injectLogContext: true
 
-The [Datadog Forwarder Lambda function][7] needs to be installed and subscribed to your Lambda functions' log groups. The plugin automatically creates the log subscriptions when the Forwarder's ARN is supplied via the `forwarder` option.
+The [Datadog Forwarder Lambda function][7] needs to be installed and subscribed to your Lambda functions' log groups. The plugin automatically creates the log subscriptions when the Forwarder's ARN is supplied via the `forwarderArn` option.
 
@@ -111,0 +111,0 @@ If you run into the following error, double check the supplied Forwarder ARN is correct and ensure it is from the same region and account where your serverless application is deployed.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

101401

increased by5.34%

Lines of code

1010

increased by7.33%

No dependency changes