serverless-plugin-datadog 5.108.0 → 5.110.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -1
- package/dist/package.json +6 -8
- package/dist/src/env.d.ts +2 -0
- package/dist/src/env.d.ts.map +1 -1
- package/dist/src/env.js +36 -10
- package/dist/src/env.js.map +1 -1
- package/dist/src/forwarder.js +11 -12
- package/dist/src/forwarder.js.map +1 -1
- package/dist/src/git.d.ts.map +1 -1
- package/dist/src/git.js +17 -7
- package/dist/src/git.js.map +1 -1
- package/dist/src/index.js +21 -11
- package/dist/src/index.js.map +1 -1
- package/dist/src/layer.js +9 -9
- package/dist/src/layer.js.map +1 -1
- package/dist/src/layers-gov.json +38 -38
- package/dist/src/layers.json +608 -608
- package/dist/src/monitor-api-requests.d.ts +0 -1
- package/dist/src/monitor-api-requests.d.ts.map +1 -1
- package/dist/src/monitor-api-requests.js +16 -20
- package/dist/src/monitor-api-requests.js.map +1 -1
- package/dist/src/monitors.d.ts +0 -1
- package/dist/src/monitors.d.ts.map +1 -1
- package/dist/src/monitors.js +4 -5
- package/dist/src/monitors.js.map +1 -1
- package/dist/src/output.d.ts +1 -0
- package/dist/src/output.d.ts.map +1 -1
- package/dist/src/output.js +9 -5
- package/dist/src/output.js.map +1 -1
- package/dist/src/span-link.js +1 -2
- package/dist/src/span-link.js.map +1 -1
- package/dist/src/step-functions-helper.js +5 -6
- package/dist/src/step-functions-helper.js.map +1 -1
- package/dist/src/tracing.js +3 -3
- package/dist/src/tracing.js.map +1 -1
- package/dist/src/wrapper.js +2 -2
- package/dist/src/wrapper.js.map +1 -1
- package/package.json +6 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor-api-requests.d.ts","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"monitor-api-requests.d.ts","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAA4B,MAAM,YAAY,CAAC;AAExF,qBAAa,0BAA2B,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAK5B;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE;YACP,UAAU,EAAE;gBAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;aAAE,CAAC;SACpC,CAAC;QACF,IAAI,EAAE,MAAM,CAAC;QACb,kBAAkB,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACxC,IAAI,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC;CACH;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,CAAC,CAWnB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,CAAC,CAYnB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,CAAC,CAWnB;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,cAAc,EAAE,CAAC,CA0B3B;AAED,wBAAsB,wBAAwB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAetF;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,qBAAqB,EAAE,MAAM,EAC7B,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,CAiBpC;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IACT,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CAClC,CAAC,CA6CD;AAED,wBAAgB,mCAAmC,CACjD,wBAAwB,EAAE,wBAAwB,GACjD,MAAM,GAAG,SAAS,CAOpB"}
|
|
@@ -8,12 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
16
|
-
|
|
12
|
+
exports.InvalidAuthenticationError = void 0;
|
|
13
|
+
exports.createMonitor = createMonitor;
|
|
14
|
+
exports.updateMonitor = updateMonitor;
|
|
15
|
+
exports.deleteMonitor = deleteMonitor;
|
|
16
|
+
exports.searchMonitors = searchMonitors;
|
|
17
|
+
exports.getCloudFormationStackId = getCloudFormationStackId;
|
|
18
|
+
exports.getExistingMonitors = getExistingMonitors;
|
|
19
|
+
exports.getRecommendedMonitors = getRecommendedMonitors;
|
|
20
|
+
exports.parseRecommendedMonitorServerlessId = parseRecommendedMonitorServerlessId;
|
|
17
21
|
const monitors_1 = require("./monitors");
|
|
18
22
|
class InvalidAuthenticationError extends Error {
|
|
19
23
|
constructor(message) {
|
|
@@ -25,7 +29,7 @@ class InvalidAuthenticationError extends Error {
|
|
|
25
29
|
exports.InvalidAuthenticationError = InvalidAuthenticationError;
|
|
26
30
|
function createMonitor(site, monitorParams, monitorsApiKey, monitorsAppKey) {
|
|
27
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
const response = yield (
|
|
32
|
+
const response = yield fetch(`https://api.${site}/api/v1/monitor`, {
|
|
29
33
|
method: "POST",
|
|
30
34
|
headers: {
|
|
31
35
|
"DD-API-KEY": monitorsApiKey,
|
|
@@ -37,10 +41,9 @@ function createMonitor(site, monitorParams, monitorsApiKey, monitorsAppKey) {
|
|
|
37
41
|
return response;
|
|
38
42
|
});
|
|
39
43
|
}
|
|
40
|
-
exports.createMonitor = createMonitor;
|
|
41
44
|
function updateMonitor(site, monitorId, monitorParams, monitorsApiKey, monitorsAppKey) {
|
|
42
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
const response = yield (
|
|
46
|
+
const response = yield fetch(`https://api.${site}/api/v1/monitor/${monitorId}`, {
|
|
44
47
|
method: "PUT",
|
|
45
48
|
headers: {
|
|
46
49
|
"DD-API-KEY": monitorsApiKey,
|
|
@@ -52,10 +55,9 @@ function updateMonitor(site, monitorId, monitorParams, monitorsApiKey, monitorsA
|
|
|
52
55
|
return response;
|
|
53
56
|
});
|
|
54
57
|
}
|
|
55
|
-
exports.updateMonitor = updateMonitor;
|
|
56
58
|
function deleteMonitor(site, monitorId, monitorsApiKey, monitorsAppKey) {
|
|
57
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
const response = yield (
|
|
60
|
+
const response = yield fetch(`https://api.${site}/api/v1/monitor/${monitorId}`, {
|
|
59
61
|
method: "DELETE",
|
|
60
62
|
headers: {
|
|
61
63
|
"DD-API-KEY": monitorsApiKey,
|
|
@@ -66,7 +68,6 @@ function deleteMonitor(site, monitorId, monitorsApiKey, monitorsAppKey) {
|
|
|
66
68
|
return response;
|
|
67
69
|
});
|
|
68
70
|
}
|
|
69
|
-
exports.deleteMonitor = deleteMonitor;
|
|
70
71
|
function searchMonitors(site, queryTag, monitorsApiKey, monitorsAppKey) {
|
|
71
72
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
73
|
let monitors = [];
|
|
@@ -74,7 +75,7 @@ function searchMonitors(site, queryTag, monitorsApiKey, monitorsAppKey) {
|
|
|
74
75
|
let pageCount = 1;
|
|
75
76
|
do {
|
|
76
77
|
const query = `tag:"${queryTag}"`;
|
|
77
|
-
const response = yield (
|
|
78
|
+
const response = yield fetch(`https://api.${site}/api/v1/monitor/search?query=${query}&page=${page}`, {
|
|
78
79
|
method: "GET",
|
|
79
80
|
headers: {
|
|
80
81
|
"DD-API-KEY": monitorsApiKey,
|
|
@@ -85,7 +86,7 @@ function searchMonitors(site, queryTag, monitorsApiKey, monitorsAppKey) {
|
|
|
85
86
|
if (response.status !== 200) {
|
|
86
87
|
throw new Error(`Can't fetch monitors. Status code: ${response.status}. Message: ${response.statusText}`);
|
|
87
88
|
}
|
|
88
|
-
const json = yield response.json();
|
|
89
|
+
const json = yield response.json(); // TODO: use proper type/parsing
|
|
89
90
|
monitors = monitors.concat(json.monitors);
|
|
90
91
|
pageCount = json.metadata.page_count;
|
|
91
92
|
page += 1;
|
|
@@ -93,7 +94,6 @@ function searchMonitors(site, queryTag, monitorsApiKey, monitorsAppKey) {
|
|
|
93
94
|
return monitors;
|
|
94
95
|
});
|
|
95
96
|
}
|
|
96
|
-
exports.searchMonitors = searchMonitors;
|
|
97
97
|
function getCloudFormationStackId(serverless) {
|
|
98
98
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
99
|
const stackName = serverless.getProvider("aws").naming.getStackName();
|
|
@@ -107,7 +107,6 @@ function getCloudFormationStackId(serverless) {
|
|
|
107
107
|
return cloudFormationStackId;
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
|
-
exports.getCloudFormationStackId = getCloudFormationStackId;
|
|
111
110
|
function getExistingMonitors(site, cloudFormationStackId, monitorsApiKey, monitorsAppKey) {
|
|
112
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
113
112
|
const existingMonitors = yield searchMonitors(site, `aws_cloudformation_stack-id:${cloudFormationStackId}`, monitorsApiKey, monitorsAppKey);
|
|
@@ -123,13 +122,12 @@ function getExistingMonitors(site, cloudFormationStackId, monitorsApiKey, monito
|
|
|
123
122
|
return serverlessMonitorIdByMonitorId;
|
|
124
123
|
});
|
|
125
124
|
}
|
|
126
|
-
exports.getExistingMonitors = getExistingMonitors;
|
|
127
125
|
function getRecommendedMonitors(site, monitorsApiKey, monitorsAppKey) {
|
|
128
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
127
|
const recommendedMonitors = {};
|
|
130
128
|
// Setting a count of 50 in the hope that all can be fetched at once. The default is 10 per page.
|
|
131
129
|
const endpoint = `https://api.${site}/api/v2/monitor/recommended?count=50&start=0&search=tag%3A%22product%3Aserverless%22%20AND%20tag%3A%22integration%3Aamazon-lambda%22`;
|
|
132
|
-
const response = yield (
|
|
130
|
+
const response = yield fetch(endpoint, {
|
|
133
131
|
method: "GET",
|
|
134
132
|
headers: {
|
|
135
133
|
"DD-API-KEY": monitorsApiKey,
|
|
@@ -140,7 +138,7 @@ function getRecommendedMonitors(site, monitorsApiKey, monitorsAppKey) {
|
|
|
140
138
|
if (response.status !== 200) {
|
|
141
139
|
throw new Error(`Can't fetch monitor params. Status code: ${response.status}. Message: ${response.statusText}`);
|
|
142
140
|
}
|
|
143
|
-
const json = yield response.json();
|
|
141
|
+
const json = yield response.json(); // TODO: use proper type/parsing
|
|
144
142
|
const recommendedMonitorsData = json.data;
|
|
145
143
|
recommendedMonitorsData.forEach((recommendedMonitorParam) => {
|
|
146
144
|
const recommendedMonitorId = parseRecommendedMonitorServerlessId(recommendedMonitorParam);
|
|
@@ -168,7 +166,6 @@ function getRecommendedMonitors(site, monitorsApiKey, monitorsAppKey) {
|
|
|
168
166
|
return recommendedMonitors;
|
|
169
167
|
});
|
|
170
168
|
}
|
|
171
|
-
exports.getRecommendedMonitors = getRecommendedMonitors;
|
|
172
169
|
function parseRecommendedMonitorServerlessId(recommendedMonitorParams) {
|
|
173
170
|
for (const tag of recommendedMonitorParams.attributes.tags) {
|
|
174
171
|
if (tag.startsWith("serverless_id:")) {
|
|
@@ -177,5 +174,4 @@ function parseRecommendedMonitorServerlessId(recommendedMonitorParams) {
|
|
|
177
174
|
}
|
|
178
175
|
return undefined;
|
|
179
176
|
}
|
|
180
|
-
exports.parseRecommendedMonitorServerlessId = parseRecommendedMonitorServerlessId;
|
|
181
177
|
//# sourceMappingURL=monitor-api-requests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor-api-requests.js","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monitor-api-requests.js","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":"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"}
|
package/dist/src/monitors.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AACD,MAAM,WAAW,OAAO;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACxC;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CAClC;AACD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,MAAM,EAC7B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,mBAAmB,EAAE,mBAAmB,GACvC;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAgDtB;AAqDD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,SAAS,CAAC,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAYlB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,qBAAqB,EAAE,MAAM,EAC7B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAKzF"}
|
package/dist/src/monitors.js
CHANGED
|
@@ -9,7 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.buildMonitorParams = buildMonitorParams;
|
|
13
|
+
exports.handleMonitorsApiResponse = handleMonitorsApiResponse;
|
|
14
|
+
exports.setMonitors = setMonitors;
|
|
15
|
+
exports.replaceCriticalThreshold = replaceCriticalThreshold;
|
|
13
16
|
const monitor_api_requests_1 = require("./monitor-api-requests");
|
|
14
17
|
/**
|
|
15
18
|
* Adds the appropriate tags and required parameters that will be passed as part of the request body for creating and updating monitors
|
|
@@ -61,7 +64,6 @@ function buildMonitorParams(monitor, cloudFormationStackId, service, env, recomm
|
|
|
61
64
|
}
|
|
62
65
|
return monitorParams;
|
|
63
66
|
}
|
|
64
|
-
exports.buildMonitorParams = buildMonitorParams;
|
|
65
67
|
/**
|
|
66
68
|
* Checks to see if the given monitor is a serverless recommended monitor
|
|
67
69
|
* @param serverlessMonitorId - Unique ID string defined for each monitor
|
|
@@ -129,7 +131,6 @@ function handleMonitorsApiResponse(response, serverlessMonitorId, subdomain, sit
|
|
|
129
131
|
}
|
|
130
132
|
});
|
|
131
133
|
}
|
|
132
|
-
exports.handleMonitorsApiResponse = handleMonitorsApiResponse;
|
|
133
134
|
/**
|
|
134
135
|
* Creates, updates, and deletes the appropriate monitor configurations as defined in the serverless.yml file
|
|
135
136
|
* @param subdomain - Subdomain to use for app URLs, e.g. "app"
|
|
@@ -184,7 +185,6 @@ function setMonitors(subdomain, site, monitors, monitorsApiKey, monitorsAppKey,
|
|
|
184
185
|
return logStatements;
|
|
185
186
|
});
|
|
186
187
|
}
|
|
187
|
-
exports.setMonitors = setMonitors;
|
|
188
188
|
/** Helper function that replaces the default threshold included in the query string with the new critical threshold configured by the customer
|
|
189
189
|
* @param query - the query string
|
|
190
190
|
* @param criticalThreshold - new critical threshold as defined by the customer
|
|
@@ -195,7 +195,6 @@ function replaceCriticalThreshold(query, criticalThreshold) {
|
|
|
195
195
|
const newQuery = query.replace(thresholdComparison, `$1 ${criticalThreshold}`);
|
|
196
196
|
return newQuery;
|
|
197
197
|
}
|
|
198
|
-
exports.replaceCriticalThreshold = replaceCriticalThreshold;
|
|
199
198
|
/**
|
|
200
199
|
* Helper function that interpolates template variables (if any) into the name
|
|
201
200
|
* of a recommended monitor, e.g. replaces template variable `$functionName`
|
package/dist/src/monitors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitors.js","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monitors.js","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":";;;;;;;;;;;AAqCA,gDAsDC;AA6DD,8DAiBC;AAgBD,kCAyDC;AAOD,4DAKC;AA9PD,iEAOgC;AAqBhC;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAChC,OAAgB,EAChB,qBAA6B,EAC7B,OAAe,EACf,GAAW,EACX,mBAAwC;;IAExC,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpD,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,MAAM,aAAa,qBAAQ,OAAO,CAAC,mBAAmB,CAAC,CAAE,CAAC;IAE1D,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QACxB,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC3B,aAAa,CAAC,OAAO,GAAG,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,aAAa,CAAC,IAAI,GAAG,cAAc,CAAC;IACtC,CAAC;IAED,aAAa,CAAC,IAAI,GAAG;QACnB,GAAG,aAAa,CAAC,IAAI;QACrB,yCAAyC;QACzC,yBAAyB,mBAAmB,EAAE;QAC9C,+BAA+B,qBAAqB,EAAE;QACtD,0BAA0B;QAC1B,OAAO,GAAG,EAAE;QACZ,WAAW,OAAO,EAAE;KACrB,CAAC;IAEF,IAAI,oBAAoB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,EAAE,CAAC;QACnE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;QACpE,IAAI,iBAAiB,GAAG,kBAAkB,CAAC,SAAS,CAAC;QAErD,IAAI,CAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAE,UAAU,0CAAE,QAAQ,MAAK,SAAS,EAAE,CAAC;YAC9D,iBAAiB,GAAG,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;QAChE,CAAC;QAED,aAAa,CAAC,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEzF,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAC3B,aAAa,CAAC,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC;QACrD,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,GAAG,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,mBAA2B,EAAE,mBAAwC;IACjG,OAAO,mBAAmB,CAAC,mBAAmB,CAAC,KAAK,SAAS,CAAC;AAChE,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,mBAA2B,EAAE,gBAA2C;IAChG,OAAO,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AACrE,CAAC;AAED;;;;;;;;GAQG;AACH,SAAe,qBAAqB,CAClC,IAAY,EACZ,cAAyB,EACzB,gBAA2C,EAC3C,cAAsB,EACtB,cAAsB;;QAEtB,MAAM,2BAA2B,GAAa,EAAE,CAAC;QACjD,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnG,KAAK,MAAM,eAAe,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAa,EAAC,IAAI,EAAE,gBAAgB,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;gBAC9G,MAAM,mBAAmB,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;gBACvF,IAAI,mBAAmB,EAAE,CAAC;oBACxB,2BAA2B,CAAC,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,2BAA2B,CAAC;IACrC,CAAC;CAAA;AAED;;;;;;;GAOG;AACH,SAAsB,yBAAyB,CAC7C,QAAkB,EAClB,mBAA4B,EAC5B,SAAkB,EAClB,IAAa;;QAEb,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACnC,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,oBAAoB,YAAY,yEAAyE,mBAAmB,2DAA2D,SAAS,IAAI,IAAI,6BAA6B,CACtO,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,SAAsB,WAAW,CAC/B,SAAiB,EACjB,IAAY,EACZ,QAAmB,EACnB,cAAsB,EACtB,cAAsB,EACtB,qBAA6B,EAC7B,OAAe,EACf,GAAW;;QAEX,MAAM,mBAAmB,GAAG,MAAM,IAAA,6CAAsB,EAAC,IAAI,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC/F,MAAM,8BAA8B,GAAG,MAAM,IAAA,0CAAmB,EAC9D,IAAI,EACJ,qBAAqB,EACrB,cAAc,EACd,cAAc,CACf,CAAC;QACF,MAAM,2BAA2B,GAAa,EAAE,CAAC;QACjD,MAAM,2BAA2B,GAAa,EAAE,CAAC;QAEjD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,eAAe,GAAG,8BAA8B,CAAC,mBAAmB,CAAC,CAAC;YAC5E,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,GAAG,EAAE,mBAAmB,CAAC,CAAC;YAC5G,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,EAAE,8BAA8B,CAAC,CAAC;YAClG,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAa,EAAC,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;gBAC3G,MAAM,mBAAmB,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC5G,IAAI,mBAAmB,EAAE,CAAC;oBACxB,2BAA2B,CAAC,IAAI,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAa,EAAC,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;gBAC1F,MAAM,mBAAmB,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC5G,IAAI,mBAAmB,EAAE,CAAC;oBACxB,2BAA2B,CAAC,IAAI,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,2BAA2B,GAAG,MAAM,qBAAqB,CAC7D,IAAI,EACJ,QAAQ,EACR,8BAA8B,EAC9B,cAAc,EACd,cAAc,CACf,CAAC;QACF,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,aAAa,CAAC,IAAI,CAAC,uBAAuB,2BAA2B,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,aAAa,CAAC,IAAI,CAAC,uBAAuB,2BAA2B,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,aAAa,CAAC,IAAI,CAAC,uBAAuB,2BAA2B,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAAA;AAED;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,KAAa,EAAE,iBAAyB;IAC/E,MAAM,mBAAmB,GAAG,aAAa,CAAC;IAC1C,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,iBAAiB,EAAE,CAAC,CAAC;IAE/E,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,0BAA0B,CAAC,kBAAqC;;IACvE,IAAI,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC/C,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;QACjE,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACzG,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
package/dist/src/output.d.ts
CHANGED
|
@@ -7,4 +7,5 @@ import { FunctionInfo } from "./layer";
|
|
|
7
7
|
export declare function addOutputLinks(serverless: Serverless, site: string, subdomain: string, handlers: FunctionInfo[]): Promise<void>;
|
|
8
8
|
export declare function printOutputs(serverless: Serverless, site: string, subdomain: string, service: string, env: string): Promise<void>;
|
|
9
9
|
export declare function logMessage(message: string): void;
|
|
10
|
+
export declare function logWarningMessage(message: string): void;
|
|
10
11
|
//# sourceMappingURL=output.d.ts.map
|
package/dist/src/output.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAQvC;;;GAGG;AACH,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,YAAY,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,YAAY,CAChC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAOD,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEhD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEvD"}
|
package/dist/src/output.js
CHANGED
|
@@ -9,8 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.addOutputLinks = addOutputLinks;
|
|
13
|
+
exports.printOutputs = printOutputs;
|
|
14
|
+
exports.logMessage = logMessage;
|
|
15
|
+
exports.logWarningMessage = logWarningMessage;
|
|
13
16
|
const yellowFont = "\x1b[33m";
|
|
17
|
+
const orangeFont = "\x1b[38;2;255;165;0m";
|
|
14
18
|
const underlineFont = "\x1b[4m";
|
|
15
19
|
const endFont = "\x1b[0m";
|
|
16
20
|
const outputPrefix = "DatadogMonitor";
|
|
@@ -19,8 +23,8 @@ const outputPrefix = "DatadogMonitor";
|
|
|
19
23
|
* and value (URL) to the function in Datadog
|
|
20
24
|
*/
|
|
21
25
|
function addOutputLinks(serverless, site, subdomain, handlers) {
|
|
22
|
-
var _a;
|
|
23
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
var _a;
|
|
24
28
|
const awsAccount = yield serverless.getProvider("aws").getAccountId();
|
|
25
29
|
const region = serverless.service.provider.region;
|
|
26
30
|
const outputs = (_a = serverless.service.provider.compiledCloudFormationTemplate) === null || _a === void 0 ? void 0 : _a.Outputs;
|
|
@@ -37,7 +41,6 @@ function addOutputLinks(serverless, site, subdomain, handlers) {
|
|
|
37
41
|
});
|
|
38
42
|
});
|
|
39
43
|
}
|
|
40
|
-
exports.addOutputLinks = addOutputLinks;
|
|
41
44
|
function printOutputs(serverless, site, subdomain, service, env) {
|
|
42
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
46
|
const stackName = serverless.getProvider("aws").naming.getStackName();
|
|
@@ -62,7 +65,6 @@ function printOutputs(serverless, site, subdomain, service, env) {
|
|
|
62
65
|
logMessage(`https://${subdomain}.${site}/monitors/manage?q=tag%3A%28%22env%3A${env}%22%20AND%20%22service%3A${service}%22%29`);
|
|
63
66
|
});
|
|
64
67
|
}
|
|
65
|
-
exports.printOutputs = printOutputs;
|
|
66
68
|
function logHeader(message, underline = false) {
|
|
67
69
|
const startFont = underline ? `${yellowFont}${underlineFont}` : `${yellowFont}`;
|
|
68
70
|
console.log(`${startFont}${message}${endFont}`);
|
|
@@ -70,5 +72,7 @@ function logHeader(message, underline = false) {
|
|
|
70
72
|
function logMessage(message) {
|
|
71
73
|
console.log(` ${message}`);
|
|
72
74
|
}
|
|
73
|
-
|
|
75
|
+
function logWarningMessage(message) {
|
|
76
|
+
console.log(` ${orangeFont}${message}${endFont}`);
|
|
77
|
+
}
|
|
74
78
|
//# sourceMappingURL=output.js.map
|
package/dist/src/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/output.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/output.ts"],"names":[],"mappings":"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"}
|
package/dist/src/span-link.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeStepFunctionAndLambdaTraces =
|
|
3
|
+
exports.mergeStepFunctionAndLambdaTraces = mergeStepFunctionAndLambdaTraces;
|
|
4
4
|
const step_functions_helper_1 = require("./step-functions-helper");
|
|
5
5
|
function mergeStepFunctionAndLambdaTraces(resources, serverless) {
|
|
6
6
|
var _a;
|
|
@@ -13,5 +13,4 @@ function mergeStepFunctionAndLambdaTraces(resources, serverless) {
|
|
|
13
13
|
resourceObj.Properties.DefinitionString = newDefString;
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
-
exports.mergeStepFunctionAndLambdaTraces = mergeStepFunctionAndLambdaTraces;
|
|
17
16
|
//# sourceMappingURL=span-link.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"span-link.js","sourceRoot":"","sources":["../../src/span-link.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"span-link.js","sourceRoot":"","sources":["../../src/span-link.ts"],"names":[],"mappings":";;AAGA,4EAYC;AAfD,mEAAkF;AAGlF,SAAgB,gCAAgC,CAC9C,SAA6C,EAC7C,UAAsB;;IAEtB,KAAK,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACpE,IAAI,WAAW,CAAC,IAAI,KAAK,kCAAkC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;YACvF,SAAS;QACX,CAAC;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;IACzD,CAAC;AACH,CAAC"}
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isLambdaApiStep = isLambdaApiStep;
|
|
4
|
+
exports.isStepFunctionInvocation = isStepFunctionInvocation;
|
|
5
|
+
exports.updateDefinitionString = updateDefinitionString;
|
|
6
|
+
exports.updateDefinitionForStepFunctionInvocationStep = updateDefinitionForStepFunctionInvocationStep;
|
|
7
|
+
exports.inspectAndRecommendStepFunctionsInstrumentation = inspectAndRecommendStepFunctionsInstrumentation;
|
|
4
8
|
function isLambdaApiStep(resource) {
|
|
5
9
|
// Allow for either the standard or legacy definitions of a lambda step
|
|
6
10
|
return (resource !== undefined &&
|
|
7
11
|
((resource === null || resource === void 0 ? void 0 : resource.startsWith("arn:aws:states:::lambda:invoke")) || (resource === null || resource === void 0 ? void 0 : resource.startsWith("arn:aws:lambda"))));
|
|
8
12
|
}
|
|
9
|
-
exports.isLambdaApiStep = isLambdaApiStep;
|
|
10
13
|
function isStepFunctionInvocation(resource) {
|
|
11
14
|
if (resource === undefined) {
|
|
12
15
|
return false;
|
|
13
16
|
}
|
|
14
17
|
return resource.startsWith("arn:aws:states:::states:startExecution");
|
|
15
18
|
}
|
|
16
|
-
exports.isStepFunctionInvocation = isStepFunctionInvocation;
|
|
17
19
|
function parseDefinitionObject(definitionString) {
|
|
18
20
|
if (!(typeof definitionString === "object" && "Fn::Sub" in definitionString && definitionString["Fn::Sub"].length > 0)) {
|
|
19
21
|
throw new Error("unexpected definitionString");
|
|
@@ -63,7 +65,6 @@ function updateDefinitionString(definitionString, serverless, stateMachineName)
|
|
|
63
65
|
}
|
|
64
66
|
return definitionString; // return the definitionString so it can be written to the Resource in span-link.ts
|
|
65
67
|
}
|
|
66
|
-
exports.updateDefinitionString = updateDefinitionString;
|
|
67
68
|
// Truth table
|
|
68
69
|
// Case | Input | Will update
|
|
69
70
|
// -----|----------------------------------------------------------|-------------
|
|
@@ -215,7 +216,6 @@ Functions Context Object injection skipped. Your Step Functions trace will not b
|
|
|
215
216
|
manually merge these traces, check out https://docs.datadoghq.com/serverless/step_functions/troubleshooting/\n`);
|
|
216
217
|
return false;
|
|
217
218
|
}
|
|
218
|
-
exports.updateDefinitionForStepFunctionInvocationStep = updateDefinitionForStepFunctionInvocationStep;
|
|
219
219
|
function inspectAndRecommendStepFunctionsInstrumentation(serverless) {
|
|
220
220
|
var _a;
|
|
221
221
|
const stepFunctions = Object.values(((_a = serverless.service.stepFunctions) === null || _a === void 0 ? void 0 : _a.stateMachines) || {});
|
|
@@ -223,5 +223,4 @@ function inspectAndRecommendStepFunctionsInstrumentation(serverless) {
|
|
|
223
223
|
serverless.cli.log(`Uninstrumented Step Functions detected in your serverless.yml file. If you would like to see Step Functions traces, please see details of 'enableStepFunctionsTracing' and 'mergeStepFunctionAndLambdaTraces' variables in the README (https://github.com/DataDog/serverless-plugin-datadog/)`);
|
|
224
224
|
}
|
|
225
225
|
}
|
|
226
|
-
exports.inspectAndRecommendStepFunctionsInstrumentation = inspectAndRecommendStepFunctionsInstrumentation;
|
|
227
226
|
//# sourceMappingURL=step-functions-helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-functions-helper.js","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"step-functions-helper.js","sourceRoot":"","sources":["../../src/step-functions-helper.ts"],"names":[],"mappings":"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"}
|
package/dist/src/tracing.js
CHANGED
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
* Copyright 2021 Datadog, Inc.
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.
|
|
10
|
+
exports.TracingMode = void 0;
|
|
11
|
+
exports.enableTracing = enableTracing;
|
|
11
12
|
const ddTraceEnabledEnvVar = "DD_TRACE_ENABLED";
|
|
12
13
|
const ddMergeXrayTracesEnvVar = "DD_MERGE_XRAY_TRACES";
|
|
13
14
|
var TracingMode;
|
|
@@ -16,7 +17,7 @@ var TracingMode;
|
|
|
16
17
|
TracingMode[TracingMode["DD_TRACE"] = 1] = "DD_TRACE";
|
|
17
18
|
TracingMode[TracingMode["HYBRID"] = 2] = "HYBRID";
|
|
18
19
|
TracingMode[TracingMode["NONE"] = 3] = "NONE";
|
|
19
|
-
})(TracingMode
|
|
20
|
+
})(TracingMode || (exports.TracingMode = TracingMode = {}));
|
|
20
21
|
function enableTracing(service, tracingMode, handlers) {
|
|
21
22
|
var _a;
|
|
22
23
|
const provider = service.provider;
|
|
@@ -38,5 +39,4 @@ function enableTracing(service, tracingMode, handlers) {
|
|
|
38
39
|
}
|
|
39
40
|
});
|
|
40
41
|
}
|
|
41
|
-
exports.enableTracing = enableTracing;
|
|
42
42
|
//# sourceMappingURL=tracing.js.map
|
package/dist/src/tracing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/tracing.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/tracing.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAgBH,sCAkBC;AA5BD,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAChD,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;AAEvD,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,6CAAI,CAAA;IACJ,qDAAQ,CAAA;IACR,iDAAM,CAAA;IACN,6CAAI,CAAA;AACN,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAED,SAAgB,aAAa,CAAC,OAAgB,EAAE,WAAwB,EAAE,QAAwB;;IAChG,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAoB,CAAC;IAC9C,IAAI,WAAW,KAAK,WAAW,CAAC,IAAI,IAAI,WAAW,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;QAC3E,QAAQ,CAAC,OAAO,GAAG;YACjB,UAAU,EAAE,CAAA,MAAA,QAAQ,CAAC,UAAU,0CAAE,SAAS;gBACxC,CAAC,CAAE,SAAiB,CAAC,iFAAiF;gBACtG,CAAC,CAAC,IAAI;YACR,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC;IACD,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;;QAC/B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,EAAE,EAAC;QAC3B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAkB,CAAC;QAC/C,2DAA2D;QAC3D,IAAI,WAAW,CAAC,oBAAoB,CAAC,KAAK,KAAK,IAAI,WAAW,CAAC,oBAAoB,CAAC,KAAK,OAAO,EAAE,CAAC;YACjG,WAAW,CAAC,uBAAuB,CAAC,GAAG,KAAK,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/src/wrapper.js
CHANGED
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
* Copyright 2021 Datadog, Inc.
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.
|
|
10
|
+
exports.jsHandler = exports.jsHandlerWithLayers = exports.pythonHandler = exports.datadogHandlerEnvVar = void 0;
|
|
11
|
+
exports.redirectHandlers = redirectHandlers;
|
|
11
12
|
const layer_1 = require("./layer");
|
|
12
13
|
exports.datadogHandlerEnvVar = "DD_LAMBDA_HANDLER";
|
|
13
14
|
exports.pythonHandler = "datadog_lambda.handler.handler";
|
|
@@ -40,7 +41,6 @@ function redirectHandlers(funcs, addLayers, customHandler) {
|
|
|
40
41
|
}
|
|
41
42
|
});
|
|
42
43
|
}
|
|
43
|
-
exports.redirectHandlers = redirectHandlers;
|
|
44
44
|
function getDDHandler(lambdaRuntime, addLayers, customHandler) {
|
|
45
45
|
if (lambdaRuntime === undefined) {
|
|
46
46
|
return;
|
package/dist/src/wrapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/wrapper.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/wrapper.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAcH,4CAuBC;AAlCD,mCAAiF;AAEpE,QAAA,oBAAoB,GAAG,mBAAmB,CAAC;AAC3C,QAAA,aAAa,GAAG,gCAAgC,CAAC;AACjD,QAAA,mBAAmB,GAAG,4DAA4D,CAAC;AACnF,QAAA,SAAS,GAAG,qDAAqD,CAAC;AAE/E;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,KAAqB,EAAE,SAAkB,EAAE,aAAsB;IAChG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAClE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,IAAA,mCAA2B,EAAC,OAAO,CAAC,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG;gBACrB,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,EAAE;aACZ,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;QACpC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CACnB,aAAsC,EACtC,SAAkB,EAClB,aAAsB;IAEtB,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IACD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,mBAAW,CAAC,IAAI;YACnB,OAAO,SAAS,CAAC,CAAC,CAAC,2BAAmB,CAAC,CAAC,CAAC,iBAAS,CAAC;QACrD,KAAK,mBAAW,CAAC,MAAM;YACrB,OAAO,qBAAa,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAA+B;;IAC3D,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC;IACrC,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,EAAE,CAAC;IAC3C,WAAW,CAAC,4BAAoB,CAAC,GAAG,eAAe,CAAC;IACpD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;AACjC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "serverless-plugin-datadog",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.110.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",
|
|
@@ -20,16 +20,15 @@
|
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@types/jest": "^27.4.0",
|
|
22
22
|
"@types/mock-fs": "4.13.0",
|
|
23
|
-
"@types/
|
|
24
|
-
"@types/serverless": "1.78.34",
|
|
23
|
+
"@types/serverless": "3.12.27",
|
|
25
24
|
"jest": "^29.7.0",
|
|
26
|
-
"jest-environment-node": "^
|
|
25
|
+
"jest-environment-node": "^30.2.0",
|
|
27
26
|
"mock-fs": "4.13.0",
|
|
28
|
-
"prettier": "^
|
|
27
|
+
"prettier": "^3.6.2",
|
|
29
28
|
"serverless-step-functions": "^3.17.0",
|
|
30
29
|
"ts-jest": "^29.1.1",
|
|
31
30
|
"tslint": "^6.1.3",
|
|
32
|
-
"typescript": "^
|
|
31
|
+
"typescript": "^5.9.3"
|
|
33
32
|
},
|
|
34
33
|
"jest": {
|
|
35
34
|
"verbose": true,
|
|
@@ -58,8 +57,7 @@
|
|
|
58
57
|
]
|
|
59
58
|
},
|
|
60
59
|
"dependencies": {
|
|
61
|
-
"@datadog/datadog-ci": "3.
|
|
62
|
-
"node-fetch": "^2.6.1",
|
|
60
|
+
"@datadog/datadog-ci": "3.21.4",
|
|
63
61
|
"simple-git": "^3.16.0"
|
|
64
62
|
},
|
|
65
63
|
"peerDependencies": {
|