serverless-plugin-datadog - npm Package Compare versions

Comparing version 2.6.0 to 2.6.1

dist/forwarder.js

@@ -31,3 +31,7 @@ "use strict";
             const scopedSubName = `${name}Subscription`;
-            const expectedSubName = `${service.getServiceName()}-${aws.getStage()}-${scopedSubName}-`;
+            let expectedSubName = `${service.getServiceName()}-${aws.getStage()}-${scopedSubName}-`;
+            const stackName = aws.naming.getStackName();
+            if (stackName) {
+                expectedSubName = `${stackName}-${scopedSubName}-`;
+            }
             const canSub = yield canSubscribeLogGroup(aws, logGroupName, expectedSubName);
@@ -34,0 +38,0 @@ if (!canSub) {

dist/layers.json

@@ -7,6 +7,6 @@ {
             "nodejs12.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python38:21"
         },
@@ -17,6 +17,6 @@ "us-east-1": {
             "nodejs12.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -27,6 +27,6 @@ "us-west-1": {
             "nodejs12.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -37,6 +37,6 @@ "us-west-2": {
             "nodejs12.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python38:21"
         },
@@ -46,6 +46,6 @@ "ap-east-1": {
             "nodejs12.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -56,6 +56,6 @@ "ap-south-1": {
             "nodejs12.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -66,6 +66,6 @@ "ap-northeast-2": {
             "nodejs12.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python38:21"
         },
@@ -76,6 +76,6 @@ "ap-southeast-1": {
             "nodejs12.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -86,6 +86,6 @@ "ap-southeast-2": {
             "nodejs12.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python38:21"
         },
@@ -96,6 +96,6 @@ "ap-northeast-1": {
             "nodejs12.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -106,6 +106,6 @@ "ca-central-1": {
             "nodejs12.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -116,6 +116,6 @@ "eu-north-1": {
             "nodejs12.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -126,6 +126,6 @@ "eu-central-1": {
             "nodejs12.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -136,6 +136,6 @@ "eu-west-1": {
             "nodejs12.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python38:21"
         },
@@ -146,6 +146,6 @@ "eu-west-2": {
             "nodejs12.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python38:21"
         },
@@ -156,6 +156,6 @@ "eu-west-3": {
             "nodejs12.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node12-x:29",
-            "python2.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python38:21"
         },
@@ -166,8 +166,8 @@ "sa-east-1": {
             "nodejs12.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:27",
-            "python2.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python27:19",
-            "python3.6": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python36:19",
-            "python3.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python37:19",
-            "python3.8": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python38:19"
+            "python2.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python27:21",
+            "python3.6": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python36:21",
+            "python3.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python37:21",
+            "python3.8": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python38:21"
         }
     }
 }

dist/package.json

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

dist/src/index.js

@@ -33,2 +33,3 @@ "use strict";
 const forwarder_1 = require("./forwarder");
+const output_1 = require("./output");
 var TagKeys;
@@ -52,2 +53,3 @@ (function (TagKeys) {
             "before:step-functions-offline:start": this.beforePackageFunction.bind(this),
+            "after:deploy:deploy": output_1.printOutputs.bind(null, this.serverless),
         };
@@ -117,2 +119,3 @@ this.commands = {
             wrapper_1.redirectHandlers(handlers, config.addLayers);
+            output_1.addOutputLinks(this.serverless, config.site);
         });
@@ -119,0 +122,0 @@ }

dist/src/layers.json

@@ -5,4 +5,4 @@ {
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python27:23",
@@ -15,4 +15,4 @@ "python3.6": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python27:23",
@@ -25,4 +25,4 @@ "python3.6": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python27:23",
@@ -35,4 +35,4 @@ "python3.6": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python27:23",
@@ -44,4 +44,4 @@ "python3.6": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python36:23",
         "ap-east-1": {
-            "nodejs10.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node10-x:35",
-            "nodejs12.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python27:23",
@@ -54,4 +54,4 @@ "python3.6": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python27:23",
@@ -64,4 +64,4 @@ "python3.6": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python27:23",
@@ -74,4 +74,4 @@ "python3.6": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python27:23",
@@ -84,4 +84,4 @@ "python3.6": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python27:23",
@@ -94,4 +94,4 @@ "python3.6": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python27:23",
@@ -104,4 +104,4 @@ "python3.6": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python27:23",
@@ -114,4 +114,4 @@ "python3.6": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python27:23",
@@ -124,4 +124,4 @@ "python3.6": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python27:23",
@@ -134,4 +134,4 @@ "python3.6": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python27:23",
@@ -144,4 +144,4 @@ "python3.6": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python27:23",
@@ -154,4 +154,4 @@ "python3.6": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python36:23",
             "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:35",
-            "nodejs12.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node12-x:35",
+            "nodejs10.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node10-x:36",
+            "nodejs12.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node12-x:36",
             "python2.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python27:23",
@@ -164,4 +164,4 @@ "python3.6": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python36:23",
             "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:36",
-            "nodejs12.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:34",
+            "nodejs10.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node10-x:37",
+            "nodejs12.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:35",
             "python2.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python27:23",
@@ -168,0 +168,0 @@ "python3.6": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python36:23",

dist/templates/node-es6-template.d.ts

@@ -1,3 +0,2 @@
-import { TracingMode } from "./common";
-export declare function es6Template(filePath: string, methods: string[], mode: TracingMode): string;
+export declare function es6Template(filePath: string, methods: string[]): string;
 //# sourceMappingURL=node-es6-template.d.ts.map

dist/templates/node-es6-template.js

@@ -10,29 +10,14 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("./common");
-function es6Template(filePath, methods, mode) {
-    const methodsString = methodsTemplate(methods, mode);
-    const tracerString = tracerTemplate(mode);
-    return `/* eslint-disable */
-${tracerString}
-const { datadog } = require("datadog-lambda-js");
-import * as original from "../${filePath}";
-${methodsString}`;
+function es6Template(filePath, methods) {
+    const methodsString = methodsTemplate(methods);
+    return (`/* eslint-disable */
+  const { datadog } = require("datadog-lambda-js");
+  import * as original from "../${filePath}";` + methodsString);
 }
 exports.es6Template = es6Template;
-function tracerTemplate(mode) {
-    switch (mode) {
-        case common_1.TracingMode.DD_TRACE:
-        case common_1.TracingMode.HYBRID:
-            return 'require("dd-trace").init();';
-        case common_1.TracingMode.XRAY:
-        case common_1.TracingMode.NONE:
-            return "";
-    }
-}
-function methodsTemplate(methods, tracingMode) {
-    const optionsStr = common_1.optionsTemplate(tracingMode);
+function methodsTemplate(methods) {
     let data = "";
     for (const method of methods) {
         data += "\n";
-        data += `export const ${method} = datadog(original.${method},${optionsStr});`;
+        data += `  export const ${method} = datadog(original.${method});`;
     }
@@ -39,0 +24,0 @@ return data;

dist/templates/node-js-template.d.ts

@@ -1,3 +0,2 @@
-import { TracingMode } from "./common";
-export declare function nodeTemplate(filePath: string, methods: string[], mode: TracingMode): string;
+export declare function nodeTemplate(filePath: string, methods: string[]): string;
 //# sourceMappingURL=node-js-template.d.ts.map

dist/templates/node-js-template.js

@@ -10,28 +10,13 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("./common");
-function nodeTemplate(filePath, methods, mode) {
-    const methodsString = methodsTemplate(methods, mode);
-    const tracerString = tracerTemplate(mode);
-    return `const { datadog } = require("datadog-lambda-js");
-${tracerString}
-const original = require("../${filePath}");
-${methodsString}`;
+function nodeTemplate(filePath, methods) {
+    const methodsString = methodsTemplate(methods);
+    return (`const { datadog } = require("datadog-lambda-js");
+const original = require("../${filePath}");` + methodsString);
 }
 exports.nodeTemplate = nodeTemplate;
-function tracerTemplate(mode) {
-    switch (mode) {
-        case common_1.TracingMode.DD_TRACE:
-        case common_1.TracingMode.HYBRID:
-            return 'require("dd-trace").init();';
-        case common_1.TracingMode.XRAY:
-        case common_1.TracingMode.NONE:
-            return "";
-    }
-}
-function methodsTemplate(methods, tracingMode) {
-    const optionsStr = common_1.optionsTemplate(tracingMode);
+function methodsTemplate(methods) {
     let data = "";
     for (const method of methods) {
         data += "\n";
-        data += `module.exports.${method} = datadog(original.${method}, ${optionsStr});`;
+        data += `module.exports.${method} = datadog(original.${method});`;
     }
@@ -38,0 +23,0 @@ return data;

dist/templates/node-ts-template.d.ts

@@ -1,3 +0,2 @@
-import { TracingMode } from "./common";
-export declare function typescriptTemplate(filePath: string, methods: string[], mode: TracingMode): string;
+export declare function typescriptTemplate(filePath: string, methods: string[]): string;
 //# sourceMappingURL=node-ts-template.d.ts.map

dist/templates/node-ts-template.js

@@ -10,30 +10,15 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("./common");
-function typescriptTemplate(filePath, methods, mode) {
-    const methodsString = methodsTemplate(methods, mode);
-    const tracerString = tracerTemplate(mode);
-    return `/* tslint:disable */
+function typescriptTemplate(filePath, methods) {
+    const methodsString = methodsTemplate(methods);
+    return (`/* tslint:disable */
 /* eslint-disable */
-${tracerString}
 const { datadog } = require("datadog-lambda-js") as any;
-import * as original from "../${filePath}";
-${methodsString}`;
+import * as original from "../${filePath}";` + methodsString);
 }
 exports.typescriptTemplate = typescriptTemplate;
-function tracerTemplate(mode) {
-    switch (mode) {
-        case common_1.TracingMode.DD_TRACE:
-        case common_1.TracingMode.HYBRID:
-            return 'const tracer = require("dd-trace") as any;\ntracer.init();';
-        case common_1.TracingMode.XRAY:
-        case common_1.TracingMode.NONE:
-            return "";
-    }
-}
-function methodsTemplate(methods, tracingMode) {
-    const optionsStr = common_1.optionsTemplate(tracingMode);
+function methodsTemplate(methods) {
     let data = "";
     for (const method of methods) {
         data += "\n";
-        data += `export const ${method} = datadog(original.${method},${optionsStr});`;
+        data += `export const ${method} = datadog(original.${method});`;
     }
@@ -40,0 +25,0 @@ return data;

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

147446

increased by1.09%

Lines of code

1681

increased by0.36%

Worsened metrics

Number of package files

81

decreased by-4.71%

No dependency changes