serverless-plugin-datadog 5.47.0 → 5.48.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "serverless-plugin-datadog",
-    "version": "5.47.0",
+    "version": "5.48.0",
     "description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
     "main": "dist/src/index.js",
     "repository": "https://github.com/DataDog/serverless-plugin-datadog",
@@ -25,6 +25,7 @@
         "jest-environment-node": "^26.6.2",
         "mock-fs": "4.13.0",
         "prettier": "^2.2.1",
+        "serverless-step-functions": "^3.17.0",
         "ts-jest": "^26.4.4",
         "tslint": "^6.1.3",
         "typescript": "^4.1.3"

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA6ChD,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAsChD,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

@@ -120,7 +120,7 @@ module.exports = class ServerlessPlugin {
             if (config.addLayers) {
                 this.serverless.cli.log("Adding Lambda Library Layers to functions");
                 this.debugLogHandlers(handlers);
-                (0, layer_1.applyLambdaLibraryLayers)(this.serverless.service, handlers, allLayers, accountId);
+                (0, layer_1.applyLambdaLibraryLayers)(this.serverless.service, handlers, allLayers, accountId, config.addExtension);
                 if ((0, env_1.hasWebpackPlugin)(this.serverless.service)) {
                     (0, env_1.forceExcludeDepsFromWebpack)(this.serverless.service);
                 }
@@ -132,17 +132,6 @@ module.exports = class ServerlessPlugin {
                 this.serverless.cli.log("Adding Datadog Lambda Extension Layer to functions");
                 this.debugLogHandlers(handlers);
                 (0, layer_1.applyExtensionLayer)(this.serverless.service, handlers, allLayers, accountId);
-                handlers.forEach((functionInfo) => {
-                    if (functionInfo.type === layer_1.RuntimeType.DOTNET || functionInfo.type === layer_1.RuntimeType.JAVA) {
-                        const runtimeNameToReadable = {
-                            [layer_1.RuntimeType.DOTNET]: ".NET",
-                            [layer_1.RuntimeType.JAVA]: "Java",
-                        };
-                        this.serverless.cli.log(`Adding ${runtimeNameToReadable[functionInfo.type]} Tracing Layer to functions`);
-                        this.debugLogHandlers(handlers);
-                        (0, layer_1.applyTracingLayer)(this.serverless.service, functionInfo, allLayers, functionInfo.type, accountId);
-                    }
-                });
             }
             else {
                 this.serverless.cli.log("Skipping adding Lambda Extension Layer");

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/src/layer.d.ts

@@ -29,13 +29,29 @@ export interface LayerJSON {
 export declare const runtimeLookup: {
     [key: string]: RuntimeType;
 };
-export declare const armRuntimeKeys: {
+export declare const ARM_RUNTIME_KEYS: {
     [key: string]: string;
 };
 export declare function findHandlers(service: Service, exclude: string[], defaultRuntime?: string): FunctionInfo[];
-export declare function applyLambdaLibraryLayers(service: Service, handlers: FunctionInfo[], layers: LayerJSON, accountId?: string): void;
+/**
+ * Normalize the runtime in the yml to match our layers.json keys
+ * For most runtimes the key in layers.json is the same as the string set in the
+ * serverless.yml, but for dotnet and java they are not
+ *
+ * @param runtimeSetting string set in serverless.yml ex: "dotnet6", "nodejs18.x"
+ */
+export declare function normalizeRuntimeKey(runtimeSetting: string): string;
+/**
+ * Add library layers for the given runtime and architecture
+ *
+ * @param service SLS framework service
+ * @param handlers Lambda functions to add layers to
+ * @param layers layers.json file read into an object
+ * @param accountId optional account ID that the layers live in - undefined
+ *        unless the customer sets a value for useLayersFromAccount in yaml
+ */
+export declare function applyLambdaLibraryLayers(service: Service, handlers: FunctionInfo[], layers: LayerJSON, accountId?: string, isUsingExtension?: boolean): void;
 export declare function applyExtensionLayer(service: Service, handlers: FunctionInfo[], layers: LayerJSON, accountId?: string): void;
-export declare function applyTracingLayer(service: Service, handler: FunctionInfo, layers: LayerJSON, runtimeKey: string, accountId?: string): void;
 export declare function pushLayerARN(layerARN: string, currentLayers: string[]): string[];
 export declare function isFunctionDefinitionHandler(funcDef: FunctionDefinition): funcDef is FunctionDefinitionHandler;
 //# sourceMappingURL=layer.d.ts.map

package/dist/src/layer.d.ts.map

@@ -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,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,EAAE,OAAO;IACT,WAAW,gBAAgB;CAC5B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,0BAA0B,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AASD,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;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;CAqBvD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CASnD,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,CACtC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,YAAY,EAAE,EACxB,MAAM,EAAE,SAAS,EACjB,SAAS,CAAC,EAAE,MAAM,QA0CnB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,QAmCpH;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,QAkBnB;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"}
+{"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,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,EAAE,OAAO;IACT,WAAW,gBAAgB;CAC5B;AAMD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,0BAA0B,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AASD,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;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;CAqBvD,CAAC;AAGF,eAAO,MAAM,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAgBrD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAgBzG;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,MAAM,UAQzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,YAAY,EAAE,EACxB,MAAM,EAAE,SAAS,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,UAAO,QAkExB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,QAmCpH;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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFunctionDefinitionHandler = exports.pushLayerARN = exports.applyTracingLayer = exports.applyExtensionLayer = exports.applyLambdaLibraryLayers = exports.findHandlers = exports.armRuntimeKeys = exports.runtimeLookup = exports.RuntimeType = void 0;
+exports.isFunctionDefinitionHandler = exports.pushLayerARN = exports.applyExtensionLayer = exports.applyLambdaLibraryLayers = exports.normalizeRuntimeKey = exports.findHandlers = exports.ARM_RUNTIME_KEYS = exports.runtimeLookup = exports.RuntimeType = void 0;
 var RuntimeType;
 (function (RuntimeType) {
     RuntimeType["NODE"] = "node";
@@ -12,6 +12,9 @@ var RuntimeType;
     RuntimeType["GO"] = "go";
     RuntimeType["UNSUPPORTED"] = "unsupported";
 })(RuntimeType = exports.RuntimeType || (exports.RuntimeType = {}));
+// .NET can only be used with the extension and Java requires
+// some code changes
+const RUNTIMES_TO_ADD_FOR_EXTENSION_ONLY = [RuntimeType.DOTNET, RuntimeType.JAVA];
 const X86_64_ARCHITECTURE = "x86_64";
 const ARM64_ARCHITECTURE = "arm64";
 const DEFAULT_ARCHITECTURE = X86_64_ARCHITECTURE;
@@ -38,7 +41,8 @@ exports.runtimeLookup = {
     "ruby3.2": RuntimeType.RUBY,
     "go1.x": RuntimeType.GO,
 };
-exports.armRuntimeKeys = {
+// Map from x86 runtime keys in layers.json to the corresponding ARM runtime keys
+exports.ARM_RUNTIME_KEYS = {
     "python3.8": "python3.8-arm",
     "python3.9": "python3.9-arm",
     "python3.10": "python3.10-arm",
@@ -46,7 +50,14 @@ exports.armRuntimeKeys = {
     "ruby2.7": "ruby2.7-arm",
     "ruby3.2": "ruby3.2-arm",
     extension: "extension-arm",
-    dotnet6: "dd-trace-dotnet-ARM",
+    dotnet: "dotnet-arm",
+    // The same Node layers work for both x86 and ARM
+    "nodejs12.x": "nodejs12.x",
+    "nodejs14.x": "nodejs14.x",
+    "nodejs16.x": "nodejs16.x",
+    "nodejs18.x": "nodejs18.x",
+    // The same Java layer works for both x86 and ARM
+    java: "java",
 };
 function findHandlers(service, exclude, defaultRuntime) {
     return Object.entries(service.functions)
@@ -64,7 +75,33 @@ function findHandlers(service, exclude, defaultRuntime) {
         .filter((result) => exclude === undefined || (exclude !== undefined && !exclude.includes(result.name)));
 }
 exports.findHandlers = findHandlers;
-function applyLambdaLibraryLayers(service, handlers, layers, accountId) {
+/**
+ * Normalize the runtime in the yml to match our layers.json keys
+ * For most runtimes the key in layers.json is the same as the string set in the
+ * serverless.yml, but for dotnet and java they are not
+ *
+ * @param runtimeSetting string set in serverless.yml ex: "dotnet6", "nodejs18.x"
+ */
+function normalizeRuntimeKey(runtimeSetting) {
+    if (runtimeSetting.startsWith("dotnet")) {
+        return "dotnet";
+    }
+    if (runtimeSetting.startsWith("java")) {
+        return "java";
+    }
+    return runtimeSetting;
+}
+exports.normalizeRuntimeKey = normalizeRuntimeKey;
+/**
+ * Add library layers for the given runtime and architecture
+ *
+ * @param service SLS framework service
+ * @param handlers Lambda functions to add layers to
+ * @param layers layers.json file read into an object
+ * @param accountId optional account ID that the layers live in - undefined
+ *        unless the customer sets a value for useLayersFromAccount in yaml
+ */
+function applyLambdaLibraryLayers(service, handlers, layers, accountId, isUsingExtension = true) {
     var _a, _b, _c;
     const { region } = service.provider;
     // It's possible a local account layer is being used in a region we have not published to so we use a default region's ARNs
@@ -81,20 +118,38 @@ function applyLambdaLibraryLayers(service, handlers, layers, accountId) {
         if (runtime === undefined) {
             continue;
         }
-        let runtimeKey = runtime;
+        if (!isUsingExtension && RUNTIMES_TO_ADD_FOR_EXTENSION_ONLY.includes(handler.type)) {
+            continue;
+        }
+        const x86RuntimeKey = normalizeRuntimeKey(runtime);
+        const armRuntimeKey = exports.ARM_RUNTIME_KEYS[x86RuntimeKey];
+        let x86LayerArn = regionRuntimes[x86RuntimeKey];
+        let armLayerArn = regionRuntimes[armRuntimeKey];
+        if (accountId && x86LayerArn) {
+            x86LayerArn = buildLocalLambdaLayerARN(x86LayerArn, accountId, region);
+        }
+        if (accountId && armLayerArn) {
+            armLayerArn = buildLocalLambdaLayerARN(armLayerArn, accountId, region);
+        }
         const architecture = (_c = (_b = (_a = handler.handler) === null || _a === void 0 ? void 0 : _a.architecture) !== null && _b !== void 0 ? _b : service.provider.architecture) !== null && _c !== void 0 ? _c : DEFAULT_ARCHITECTURE;
         const isArm64 = architecture === ARM64_ARCHITECTURE;
-        if (isArm64 && runtime in exports.armRuntimeKeys) {
-            runtimeKey = exports.armRuntimeKeys[runtime];
-            const prevLayerARN = accountId !== undefined
-                ? buildLocalLambdaLayerARN(regionRuntimes[runtime], accountId, region)
-                : regionRuntimes[runtime];
-            removePreviousLayer(service, handler, prevLayerARN);
-        }
-        let layerARN = regionRuntimes[runtimeKey];
+        // Use the ARM layer if customer's handler is using ARM
+        let layerARN = isArm64 ? armLayerArn : x86LayerArn;
+        // Fall back to the x86 layer if no ARM layer is available
+        if (isArm64 && layerARN === undefined) {
+            layerARN = x86LayerArn;
+        }
         if (accountId && layerARN) {
             layerARN = buildLocalLambdaLayerARN(layerARN, accountId, region);
         }
+        if (isArm64 && layerARN !== undefined && x86LayerArn !== undefined) {
+            // Remove the x86 layer if the customer is using ARM
+            removePreviousLayer(service, handler, x86LayerArn);
+        }
+        if (!isArm64 && layerARN !== undefined && armLayerArn !== undefined) {
+            // Remove the ARM layer if the customer is using x86
+            removePreviousLayer(service, handler, armLayerArn);
+        }
         if (layerARN) {
             addLayer(service, handler, layerARN);
         }
@@ -121,7 +176,7 @@ function applyExtensionLayer(service, handlers, layers, accountId) {
                 ? buildLocalLambdaLayerARN(regionRuntimes[extensionLayerKey], accountId, region)
                 : regionRuntimes[extensionLayerKey];
             removePreviousLayer(service, handler, prevExtensionARN);
-            extensionLayerKey = exports.armRuntimeKeys[extensionLayerKey];
+            extensionLayerKey = exports.ARM_RUNTIME_KEYS[extensionLayerKey];
         }
         let extensionARN = regionRuntimes[extensionLayerKey];
         if (accountId && extensionARN) {
@@ -133,23 +188,6 @@ function applyExtensionLayer(service, handlers, layers, accountId) {
     }
 }
 exports.applyExtensionLayer = applyExtensionLayer;
-function applyTracingLayer(service, handler, layers, runtimeKey, accountId) {
-    const { region } = service.provider;
-    // It's possible a local account layer is being used in a region we have not published to so we use a default region's ARNs
-    const shouldUseDefaultRegion = layers.regions[region] === undefined && accountId !== undefined;
-    const regionRuntimes = shouldUseDefaultRegion ? layers.regions[DEFAULT_REGION] : layers.regions[region];
-    if (regionRuntimes === undefined) {
-        return;
-    }
-    let traceLayerARN = regionRuntimes[runtimeKey];
-    if (accountId && traceLayerARN) {
-        traceLayerARN = buildLocalLambdaLayerARN(traceLayerARN, accountId, region);
-    }
-    if (traceLayerARN) {
-        addLayer(service, handler, traceLayerARN);
-    }
-}
-exports.applyTracingLayer = applyTracingLayer;
 function pushLayerARN(layerARN, currentLayers) {
     const layerSet = new Set(currentLayers);
     layerSet.add(layerARN);

package/dist/src/layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-datadog",
-  "version": "5.47.0",
+  "version": "5.48.0",
   "description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
   "main": "dist/src/index.js",
   "repository": "https://github.com/DataDog/serverless-plugin-datadog",
@@ -25,6 +25,7 @@
     "jest-environment-node": "^26.6.2",
     "mock-fs": "4.13.0",
     "prettier": "^2.2.1",
+    "serverless-step-functions": "^3.17.0",
     "ts-jest": "^26.4.4",
     "tslint": "^6.1.3",
     "typescript": "^4.1.3"