serverless-plugin-datadog 5.69.0 → 5.71.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -1 +1 @@
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,GACrB,IAAI,CAaN"}
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,GACrB,IAAI,CASN"}
@@ -4,17 +4,13 @@ exports.mergeStepFunctionAndLambdaTraces = void 0;
4
4
  const step_functions_helper_1 = require("./step-functions-helper");
5
5
  function mergeStepFunctionAndLambdaTraces(resources, serverless) {
6
6
  var _a;
7
- for (const resourceName in resources) {
8
- if (resources.hasOwnProperty(resourceName)) {
9
- const resourceObj = resources[resourceName];
10
- if (resourceObj.Type === "AWS::StepFunctions::StateMachine") {
11
- if (resourceObj.Properties) {
12
- const definitionString = (_a = resourceObj.Properties) === null || _a === void 0 ? void 0 : _a.DefinitionString;
13
- const newDefString = (0, step_functions_helper_1.updateDefinitionString)(definitionString, serverless, resourceName);
14
- resourceObj.Properties.DefinitionString = newDefString;
15
- }
16
- }
7
+ for (const [resourceName, resourceObj] of Object.entries(resources)) {
8
+ if (resourceObj.Type !== "AWS::StepFunctions::StateMachine" || !resourceObj.Properties) {
9
+ continue;
17
10
  }
11
+ const definitionString = (_a = resourceObj.Properties) === null || _a === void 0 ? void 0 : _a.DefinitionString;
12
+ const newDefString = (0, step_functions_helper_1.updateDefinitionString)(definitionString, serverless, resourceName);
13
+ resourceObj.Properties.DefinitionString = newDefString;
18
14
  }
19
15
  }
20
16
  exports.mergeStepFunctionAndLambdaTraces = mergeStepFunctionAndLambdaTraces;
@@ -1 +1 @@
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,IAAI,WAAW,CAAC,UAAU,EAAE;oBAC1B,MAAM,gBAAgB,GAAG,MAAA,WAAW,CAAC,UAAU,0CAAE,gBAAiB,CAAC;oBACnE,MAAM,YAAY,GAAG,IAAA,8CAAsB,EAAC,gBAAgB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;oBACxF,WAAW,CAAC,UAAU,CAAC,gBAAgB,GAAG,YAAY,CAAC;iBACxD;aACF;SACF;KACF;AACH,CAAC;AAhBD,4EAgBC"}
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,CAAC,YAAY,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACnE,IAAI,WAAW,CAAC,IAAI,KAAK,kCAAkC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;YACtF,SAAS;SACV;QACD,MAAM,gBAAgB,GAAG,MAAA,WAAW,CAAC,UAAU,0CAAE,gBAAiB,CAAC;QACnE,MAAM,YAAY,GAAG,IAAA,8CAAsB,EAAC,gBAAgB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACxF,WAAW,CAAC,UAAU,CAAC,gBAAgB,GAAG,YAAY,CAAC;KACxD;AACH,CAAC;AAZD,4EAYC"}
@@ -1,5 +1,4 @@
1
1
  import Serverless from "serverless";
2
- export declare function isSafeToModifyStepFunctionLambdaInvocation(parameters: any): boolean;
3
2
  export declare function isSafeToModifyStepFunctionInvoctation(parameters: any): boolean;
4
3
  export interface GeneralResource {
5
4
  Type: string;
@@ -14,11 +13,20 @@ export interface StateMachineDefinition {
14
13
  [key: string]: StateMachineStep;
15
14
  };
16
15
  }
16
+ export type PayloadObject = {
17
+ "Execution.$"?: any;
18
+ Execution?: any;
19
+ "State.$"?: any;
20
+ State?: any;
21
+ "StateMachine.$"?: any;
22
+ StateMachine?: any;
23
+ };
17
24
  export interface StateMachineStep {
18
25
  Resource?: string;
19
26
  Parameters?: {
20
27
  FunctionName?: string;
21
28
  "Payload.$"?: string;
29
+ Payload?: string | PayloadObject;
22
30
  Input?: {
23
31
  "CONTEXT.$"?: string;
24
32
  };
@@ -1 +1 @@
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,0CAA0C,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAcnF;AAUD,wBAAgB,qCAAqC,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAiB9E;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE;QACX,gBAAgB,CAAC,EACb,MAAM,GACN;YACE,SAAS,EAAE,GAAG,EAAE,CAAC;SAClB,CAAC;KACP,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,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE;QACX,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE;YACN,WAAW,CAAC,EAAE,MAAM,CAAC;SACtB,CAAC;KACH,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAU5E;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAK9E;AAkBD,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAC7D,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,MAAM,GACvB,MAAM,GAAG;IAAE,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,CAoD7C;AAED,wBAAgB,+CAA+C,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAO5F"}
1
+ {"version":3,"file":"step-functions-helper.d.ts","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AAUpC,wBAAgB,qCAAqC,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAiB9E;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE;QACX,gBAAgB,CAAC,EACb,MAAM,GACN;YACE,SAAS,EAAE,GAAG,EAAE,CAAC;SAClB,CAAC;KACP,CAAC;CACH;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAC;CAC7C;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE;QACX,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;QACjC,KAAK,CAAC,EAAE;YACN,WAAW,CAAC,EAAE,MAAM,CAAC;SACtB,CAAC;KACH,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAU5E;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAK9E;AAkBD,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAC7D,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,MAAM,GACvB,MAAM,GAAG;IAAE,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,CAiC7C;AAgID,wBAAgB,+CAA+C,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAO5F"}
@@ -1,22 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.inspectAndRecommendStepFunctionsInstrumentation = exports.updateDefinitionString = exports.isStepFunctionInvocation = exports.isDefaultLambdaApiStep = exports.isSafeToModifyStepFunctionInvoctation = exports.isSafeToModifyStepFunctionLambdaInvocation = void 0;
4
- function isSafeToModifyStepFunctionLambdaInvocation(parameters) {
5
- if (typeof parameters !== "object") {
6
- return false;
7
- }
8
- if (!parameters.hasOwnProperty("Payload.$")) {
9
- return true;
10
- }
11
- else {
12
- if (parameters["Payload.$"] === "$") {
13
- // $ % is the default original unchanged payload
14
- return true;
15
- }
16
- }
17
- return false;
18
- }
19
- exports.isSafeToModifyStepFunctionLambdaInvocation = isSafeToModifyStepFunctionLambdaInvocation;
3
+ exports.inspectAndRecommendStepFunctionsInstrumentation = exports.updateDefinitionString = exports.isStepFunctionInvocation = exports.isDefaultLambdaApiStep = exports.isSafeToModifyStepFunctionInvoctation = void 0;
20
4
  // Truth table
21
5
  // Input | Expected
22
6
  // -------------------------|---------
@@ -74,6 +58,7 @@ function parseDefinitionObject(definitionString) {
74
58
  // Updates the definitionString of a step function to include trace context as appropriate for a Lambda invocation or a nested step function invocation.
75
59
  // definitionString can either be an object or a naked string, so we need to return the same and explicitly modify the Resource in span-link.ts
76
60
  function updateDefinitionString(definitionString, serverless, stateMachineName) {
61
+ // Step 1: Parse definition object from definition string
77
62
  let definitionObj;
78
63
  if (typeof definitionString !== "string") {
79
64
  // definitionString is a {"Fn::Sub": (string | object)[]}
@@ -88,35 +73,18 @@ function updateDefinitionString(definitionString, serverless, stateMachineName)
88
73
  else {
89
74
  definitionObj = JSON.parse(definitionString);
90
75
  }
76
+ // Step 2: Mutate the definition object
91
77
  const states = definitionObj.States;
92
- for (const stepName in states) {
93
- if (states.hasOwnProperty(stepName)) {
94
- const step = states[stepName];
95
- if (!isDefaultLambdaApiStep(step === null || step === void 0 ? void 0 : step.Resource) && !isStepFunctionInvocation(step === null || step === void 0 ? void 0 : step.Resource)) {
96
- // only inject context into default Lambda API steps and Step Function invocation steps
97
- continue;
98
- }
99
- if (isDefaultLambdaApiStep(step === null || step === void 0 ? void 0 : step.Resource)) {
100
- if (typeof step.Parameters === "object") {
101
- if (isSafeToModifyStepFunctionLambdaInvocation(step.Parameters)) {
102
- step.Parameters["Payload.$"] = "States.JsonMerge($$, $, false)";
103
- serverless.cli.log(`JsonMerge Step Functions context object with payload in step: ${stepName} of state machine: ${stateMachineName}.`);
104
- }
105
- else {
106
- serverless.cli.log(`[Warn] Parameters.Payload has been set. Merging traces failed for step: ${stepName} of state machine: ${stateMachineName}`);
107
- }
108
- }
109
- }
110
- else if (isStepFunctionInvocation(step === null || step === void 0 ? void 0 : step.Resource)) {
111
- if (isSafeToModifyStepFunctionInvoctation(step === null || step === void 0 ? void 0 : step.Parameters)) {
112
- if (step.Parameters && !step.Parameters.Input) {
113
- step.Parameters.Input = {};
114
- }
115
- step.Parameters.Input["CONTEXT.$"] = "States.JsonMerge($$, $, false)";
116
- }
117
- }
78
+ for (const [stepName, step] of Object.entries(states)) {
79
+ // only inject context into default Lambda API steps and Step Function invocation steps
80
+ if (isDefaultLambdaApiStep(step === null || step === void 0 ? void 0 : step.Resource)) {
81
+ updateDefinitionForDefaultLambdaApiStep(stepName, step, serverless, stateMachineName);
82
+ }
83
+ else if (isStepFunctionInvocation(step === null || step === void 0 ? void 0 : step.Resource)) {
84
+ updateDefinitionForStepFunctionInvocationStep(step);
118
85
  }
119
86
  }
87
+ // Step 3: Convert definition object back into definition string
120
88
  if (typeof definitionString !== "string") {
121
89
  definitionString["Fn::Sub"][0] = JSON.stringify(definitionObj); // writing back to the original JSON created by Serverless framework
122
90
  }
@@ -126,6 +94,94 @@ function updateDefinitionString(definitionString, serverless, stateMachineName)
126
94
  return definitionString; // return the definitionString so it can be written to the Resource in span-link.ts
127
95
  }
128
96
  exports.updateDefinitionString = updateDefinitionString;
97
+ // Truth table
98
+ // Case | Input | Will update
99
+ // -----|----------------------------------------------------------|-------------
100
+ // 1 | No "Payload" or "Payload.$" | true
101
+ // 2.1 | "Payload" is object, already injected | false
102
+ // 2.2 | "Payload" object has Execution, State or StateMachine | false
103
+ // 2.3 | "Payload" object has no Execution, State or StateMachine | true
104
+ // 3 | "Payload" is not object | false
105
+ // 4.1 | "Payload.$": "$" (default payload) | true
106
+ // 4.2 | "Payload.$": "States.JsonMerge($$, $, false)" or | false
107
+ // | "Payload.$": "$$['Execution', 'State', 'StateMachine']" |
108
+ // 4.3 | Custom "Payload.$" | false
109
+ function updateDefinitionForDefaultLambdaApiStep(stepName, step, serverless, stateMachineName) {
110
+ if (typeof step.Parameters !== "object") {
111
+ serverless.cli.log(`[Warn] Parameters field is not a JSON object. Merging traces failed for step: ${stepName} of state machine: ${stateMachineName}. \
112
+ Your Step Functions trace will not be merged with downstream Lambda traces. To manually merge these traces, check out \
113
+ https://docs.datadoghq.com/serverless/step_functions/troubleshooting/`);
114
+ return;
115
+ }
116
+ // Case 2 & 3: Parameters has "Payload" field
117
+ if (step.Parameters.hasOwnProperty("Payload")) {
118
+ const payload = step.Parameters.Payload;
119
+ // Case 3: payload is not a JSON object
120
+ if (typeof payload !== "object") {
121
+ serverless.cli.log(`[Warn] Payload field is not a JSON object. Merging traces failed for step: ${stepName} of state machine: ${stateMachineName}. \
122
+ Your Step Functions trace will not be merged with downstream Lambda traces. To manually merge these traces, check out \
123
+ https://docs.datadoghq.com/serverless/step_functions/troubleshooting/`);
124
+ return;
125
+ }
126
+ // Case 2: payload is a JSON object
127
+ if (payload["Execution.$"] === "$$.Execution" &&
128
+ payload["State.$"] === "$$.State" &&
129
+ payload["StateMachine.$"] === "$$.StateMachine") {
130
+ // Case 2.1: already injected into "Payload"
131
+ serverless.cli.log(`Context injection is already set up. Skipping merging traces for step: ${stepName} of state machine: ${stateMachineName}.\n`);
132
+ return;
133
+ }
134
+ // Case 2.2: "Payload" object has Execution, State or StateMachine field but conject injection is not set up completely
135
+ if (payload.hasOwnProperty("Execution.$") ||
136
+ payload.hasOwnProperty("Execution") ||
137
+ payload.hasOwnProperty("State.$") ||
138
+ payload.hasOwnProperty("State") ||
139
+ payload.hasOwnProperty("StateMachine.$") ||
140
+ payload.hasOwnProperty("StateMachine")) {
141
+ serverless.cli
142
+ .log(`[Warn] Step ${stepName} of state machine: ${stateMachineName} may be using custom Execution, State or StateMachine field. \
143
+ Step Functions Context Object injection skipped. Your Step Functions trace will not be merged with downstream Lambda traces. To manually \
144
+ merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
145
+ return;
146
+ }
147
+ // Case 2.3: "Payload" object has no Execution, State or StateMachine field
148
+ payload["Execution.$"] = "$$.Execution";
149
+ payload["State.$"] = "$$.State";
150
+ payload["StateMachine.$"] = "$$.StateMachine";
151
+ return;
152
+ }
153
+ // Case 4: Parameters has "Payload.$" field
154
+ if (step.Parameters.hasOwnProperty("Payload.$")) {
155
+ // Case 4.1: default "Payload.$"
156
+ if (step.Parameters["Payload.$"] === "$") {
157
+ step.Parameters["Payload.$"] = "States.JsonMerge($$, $, false)";
158
+ serverless.cli.log(`JsonMerge Step Functions context object with payload in step: ${stepName} of state machine: ${stateMachineName}.`);
159
+ return;
160
+ }
161
+ // Case 4.2: context injection is already set up using "Payload.$"
162
+ if (step.Parameters["Payload.$"] === "States.JsonMerge($$, $, false)" ||
163
+ step.Parameters["Payload.$"] === "$$['Execution', 'State', 'StateMachine']") {
164
+ serverless.cli.log(`Step ${stepName} of state machine ${stateMachineName}: Context injection is already set up. Skipping context injection.\n`);
165
+ return;
166
+ }
167
+ // Case 4.3: custom "Payload.$"
168
+ serverless.cli.log(`[Warn] Step ${stepName} of state machine ${stateMachineName} has a custom Payload field. Step Functions Context Object injection \
169
+ skipped. Your Step Functions trace will not be merged with downstream Lambda traces. To manually merge these traces, \
170
+ check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
171
+ return;
172
+ }
173
+ // Case 1: No "Payload" or "Payload.$"
174
+ step.Parameters["Payload.$"] = "$$['Execution', 'State', 'StateMachine']";
175
+ serverless.cli.log(`Merging traces for step: ${stepName} of state machine: ${stateMachineName}.`);
176
+ }
177
+ function updateDefinitionForStepFunctionInvocationStep(step) {
178
+ if (isSafeToModifyStepFunctionInvoctation(step === null || step === void 0 ? void 0 : step.Parameters)) {
179
+ if (step.Parameters && !step.Parameters.Input) {
180
+ step.Parameters.Input = {};
181
+ }
182
+ step.Parameters.Input["CONTEXT.$"] = "States.JsonMerge($$, $, false)";
183
+ }
184
+ }
129
185
  function inspectAndRecommendStepFunctionsInstrumentation(serverless) {
130
186
  var _a;
131
187
  const stepFunctions = Object.values(((_a = serverless.service.stepFunctions) === null || _a === void 0 ? void 0 : _a.stateMachines) || {});
@@ -1 +1 @@
1
- {"version":3,"file":"step-functions-helper.js","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"step-functions-helper.js","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "serverless-plugin-datadog",
3
- "version": "5.69.0",
3
+ "version": "5.71.0",
4
4
  "description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
5
5
  "main": "dist/src/index.js",
6
6
  "repository": "https://github.com/DataDog/serverless-plugin-datadog",