serverless-plugin-datadog 5.35.0 → 5.37.0

package/dist/src/span-link.d.ts

@@ -0,0 +1,6 @@
+import { GeneralResource } from "./step-functions-helper";
+import * as Serverless from "serverless";
+export declare function mergeStepFunctionAndLambdaTraces(resources: {
+    [key: string]: GeneralResource;
+}, serverless: Serverless): void;
+//# sourceMappingURL=span-link.d.ts.map

package/dist/src/span-link.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"span-link.d.ts","sourceRoot":"","sources":["../../src/span-link.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA0B,MAAM,yBAAyB,CAAC;AAClF,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AAEzC,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,EAC7C,UAAU,EAAE,UAAU,QAWvB"}

package/dist/src/span-link.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeStepFunctionAndLambdaTraces = void 0;
+const step_functions_helper_1 = require("./step-functions-helper");
+function mergeStepFunctionAndLambdaTraces(resources, serverless) {
+    var _a;
+    for (const resourceName in resources) {
+        if (resources.hasOwnProperty(resourceName)) {
+            const resourceObj = resources[resourceName];
+            if (resourceObj.Type === "AWS::StepFunctions::StateMachine") {
+                const definitionString = (_a = resourceObj.Properties) === null || _a === void 0 ? void 0 : _a.DefinitionString;
+                (0, step_functions_helper_1.updateDefinitionString)(definitionString, serverless, resourceName);
+            }
+        }
+    }
+}
+exports.mergeStepFunctionAndLambdaTraces = mergeStepFunctionAndLambdaTraces;
+//# sourceMappingURL=span-link.js.map

package/dist/src/span-link.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"span-link.js","sourceRoot":"","sources":["../../src/span-link.ts"],"names":[],"mappings":";;;AAAA,mEAAkF;AAGlF,SAAgB,gCAAgC,CAC9C,SAA6C,EAC7C,UAAsB;;IAEtB,KAAK,MAAM,YAAY,IAAI,SAAS,EAAE;QACpC,IAAI,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;YAC1C,MAAM,WAAW,GAAoB,SAAS,CAAC,YAAY,CAAC,CAAC;YAC7D,IAAI,WAAW,CAAC,IAAI,KAAK,kCAAkC,EAAE;gBAC3D,MAAM,gBAAgB,GAAG,MAAA,WAAW,CAAC,UAAU,0CAAE,gBAAiB,CAAC;gBACnE,IAAA,8CAAsB,EAAC,gBAAgB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;aACpE;SACF;KACF;AACH,CAAC;AAbD,4EAaC"}

package/dist/src/step-functions-helper.d.ts

@@ -0,0 +1,29 @@
+import Serverless from "serverless";
+export declare function isSafeToModifyStepFunctionsDefinition(parameters: any): boolean;
+export interface GeneralResource {
+    Type: string;
+    Properties?: {
+        DefinitionString?: {
+            "Fn::Sub": any[];
+        };
+    };
+}
+export interface StateMachineDefinition {
+    States: {
+        [key: string]: StateMachineStep;
+    };
+}
+export interface StateMachineStep {
+    Resource: string;
+    Parameters?: {
+        FunctionName?: string;
+        "Payload.$"?: string;
+    };
+    Next?: string;
+    End?: boolean;
+}
+export declare function isDefaultLambdaApiStep(resource: string | null): boolean;
+export declare function updateDefinitionString(definitionString: {
+    "Fn::Sub": (string | object)[];
+}, serverless: Serverless, stateMachineName: string): void;
+//# sourceMappingURL=step-functions-helper.d.ts.map

package/dist/src/step-functions-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-functions-helper.d.ts","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,wBAAgB,qCAAqC,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAc9E;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE;QACX,gBAAgB,CAAC,EAAE;YACjB,SAAS,EAAE,GAAG,EAAE,CAAC;SAClB,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAC;CAC7C;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE;QACX,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAUvE;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE;IAAE,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EACpD,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,MAAM,GACvB,IAAI,CAmCN"}

package/dist/src/step-functions-helper.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateDefinitionString = exports.isDefaultLambdaApiStep = exports.isSafeToModifyStepFunctionsDefinition = void 0;
+function isSafeToModifyStepFunctionsDefinition(parameters) {
+    if (typeof parameters !== "object") {
+        return false;
+    }
+    if (!parameters.hasOwnProperty("Payload.$")) {
+        return true;
+    }
+    else {
+        if (parameters["Payload.$"] === "$") {
+            // $ % is the default original unchanged payload
+            return true;
+        }
+    }
+    return false;
+}
+exports.isSafeToModifyStepFunctionsDefinition = isSafeToModifyStepFunctionsDefinition;
+function isDefaultLambdaApiStep(resource) {
+    // default means not legacy lambda api
+    if (resource == null) {
+        return false;
+    }
+    if (resource === "arn:aws:states:::lambda:invoke") {
+        // Legacy Lambda API resource.startsWith("arn:aws:lambda"), but it cannot inject context obj.
+        return true;
+    }
+    return false;
+}
+exports.isDefaultLambdaApiStep = isDefaultLambdaApiStep;
+function updateDefinitionString(definitionString, serverless, stateMachineName) {
+    if (!(typeof definitionString === "object" && "Fn::Sub" in definitionString && definitionString["Fn::Sub"].length > 0)) {
+        return;
+    }
+    const unparsedDefinition = definitionString["Fn::Sub"] ? definitionString["Fn::Sub"][0] : ""; // index 0 should always be a string of step functions definition
+    if (unparsedDefinition === "") {
+        return;
+    }
+    const definitionObj = JSON.parse(unparsedDefinition);
+    const states = definitionObj.States;
+    for (const stepName in states) {
+        if (states.hasOwnProperty(stepName)) {
+            const step = states[stepName];
+            if (!isDefaultLambdaApiStep(step.Resource)) {
+                // only default lambda api allows context injection
+                continue;
+            }
+            if (typeof step.Parameters === "object") {
+                if (isSafeToModifyStepFunctionsDefinition(step.Parameters)) {
+                    step.Parameters["Payload.$"] = "States.JsonMerge($$, $, false)";
+                    serverless.cli.log(`JsonMerge Step Functions context object with payload in step: ${stepName} of state machine: ${stateMachineName}.`);
+                }
+                else {
+                    serverless.cli.log(`[Warn] Parameters.Payload has been set. Merging traces failed for step: ${stepName} of state machine: ${stateMachineName}`);
+                }
+            }
+        }
+    }
+    definitionString["Fn::Sub"][0] = JSON.stringify(definitionObj); // writing back to the original JSON created by Serverless framework
+}
+exports.updateDefinitionString = updateDefinitionString;
+//# sourceMappingURL=step-functions-helper.js.map

package/dist/src/step-functions-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-functions-helper.js","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qCAAqC,CAAC,UAAe;IACnE,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,OAAO,KAAK,CAAC;KACd;IACD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;QAC3C,OAAO,IAAI,CAAC;KACb;SAAM;QACL,IAAI,UAAU,CAAC,WAAW,CAAC,KAAK,GAAG,EAAE;YACnC,gDAAgD;YAChD,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAdD,sFAcC;AAyBD,SAAgB,sBAAsB,CAAC,QAAuB;IAC5D,sCAAsC;IACtC,IAAI,QAAQ,IAAI,IAAI,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IACD,IAAI,QAAQ,KAAK,gCAAgC,EAAE;QACjD,6FAA6F;QAC7F,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,wDAUC;AAED,SAAgB,sBAAsB,CACpC,gBAAoD,EACpD,UAAsB,EACtB,gBAAwB;IAExB,IACE,CAAC,CAAC,OAAO,gBAAgB,KAAK,QAAQ,IAAI,SAAS,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAClH;QACA,OAAO;KACR;IACD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,iEAAiE;IAC/J,IAAI,kBAAkB,KAAK,EAAE,EAAE;QAC7B,OAAO;KACR;IACD,MAAM,aAAa,GAA2B,IAAI,CAAC,KAAK,CAAC,kBAA4B,CAAC,CAAC;IAEvF,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;IACpC,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE;QAC7B,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;YACnC,MAAM,IAAI,GAAqB,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAC1C,mDAAmD;gBACnD,SAAS;aACV;YACD,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE;gBACvC,IAAI,qCAAqC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;oBAC1D,IAAI,CAAC,UAAW,CAAC,WAAW,CAAC,GAAG,gCAAgC,CAAC;oBACjE,UAAU,CAAC,GAAG,CAAC,GAAG,CAChB,iEAAiE,QAAQ,sBAAsB,gBAAgB,GAAG,CACnH,CAAC;iBACH;qBAAM;oBACL,UAAU,CAAC,GAAG,CAAC,GAAG,CAChB,2EAA2E,QAAQ,sBAAsB,gBAAgB,EAAE,CAC5H,CAAC;iBACH;aACF;SACF;KACF;IACD,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,oEAAoE;AACtI,CAAC;AAvCD,wDAuCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-datadog",
-  "version": "5.35.0",
+  "version": "5.37.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",