serverless-plugin-datadog 5.67.0 → 5.69.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +0 -2
- package/dist/package.json +2 -2
- package/dist/src/env.d.ts.map +1 -1
- package/dist/src/forwarder.d.ts +10 -9
- package/dist/src/forwarder.d.ts.map +1 -1
- package/dist/src/forwarder.js.map +1 -1
- package/dist/src/layer.d.ts +2 -0
- package/dist/src/layer.d.ts.map +1 -1
- package/dist/src/layer.js +2 -0
- package/dist/src/layer.js.map +1 -1
- package/dist/src/layers-gov.json +30 -30
- package/dist/src/layers.json +435 -435
- package/dist/src/monitor-api-requests.d.ts +4 -0
- package/dist/src/monitor-api-requests.d.ts.map +1 -1
- package/dist/src/monitor-api-requests.js +2 -0
- package/dist/src/monitor-api-requests.js.map +1 -1
- package/dist/src/monitors.d.ts +12 -3
- package/dist/src/monitors.d.ts.map +1 -1
- package/dist/src/monitors.js +36 -7
- package/dist/src/monitors.js.map +1 -1
- package/dist/src/output.d.ts.map +1 -1
- package/dist/src/span-link.d.ts.map +1 -1
- package/dist/src/step-functions-helper.d.ts.map +1 -1
- package/dist/src/tracing.d.ts.map +1 -1
- package/dist/src/wrapper.d.ts.map +1 -1
- package/dist/src/wrapper.js.map +1 -1
- package/package.json +2 -2
- package/dist/src/compile.d.ts +0 -3
- package/dist/src/compile.d.ts.map +0 -1
- package/dist/src/compile.js +0 -10
- package/dist/src/compile.js.map +0 -1
- package/dist/src/precomile-python.d.ts +0 -2
- package/dist/src/precomile-python.d.ts.map +0 -1
- package/dist/src/precomile-python.js +0 -69
- package/dist/src/precomile-python.js.map +0 -1
- package/dist/src/precompile-python.d.ts +0 -2
- package/dist/src/precompile-python.d.ts.map +0 -1
- package/dist/src/precompile-python.js +0 -78
- package/dist/src/precompile-python.js.map +0 -1
@@ -10,6 +10,10 @@ interface QueriedMonitor {
|
|
10
10
|
name: string;
|
11
11
|
tags: string[];
|
12
12
|
}
|
13
|
+
export interface TemplateVariable {
|
14
|
+
name: string;
|
15
|
+
defaults: string[];
|
16
|
+
}
|
13
17
|
export declare function createMonitor(site: string, monitorParams: MonitorParams, monitorsApiKey: string, monitorsAppKey: string): Promise<Response>;
|
14
18
|
export declare function updateMonitor(site: string, monitorId: number, monitorParams: MonitorParams, monitorsApiKey: string, monitorsAppKey: string): Promise<Response>;
|
15
19
|
export declare function deleteMonitor(site: string, monitorId: number, monitorsApiKey: string, monitorsAppKey: string): Promise<Response>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"monitor-api-requests.d.ts","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC7C,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;
|
1
|
+
{"version":3,"file":"monitor-api-requests.d.ts","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC7C,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;AAiBD,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,CA2CD"}
|
@@ -127,6 +127,7 @@ exports.getExistingMonitors = getExistingMonitors;
|
|
127
127
|
function getRecommendedMonitors(site, monitorsApiKey, monitorsAppKey) {
|
128
128
|
return __awaiter(this, void 0, void 0, function* () {
|
129
129
|
const recommendedMonitors = {};
|
130
|
+
// Setting a count of 50 in the hope that all can be fetched at once. The default is 10 per page.
|
130
131
|
const endpoint = `https://api.${site}/api/v2/monitor/recommended?count=50&start=0&search=tag%3A%22product%3Aserverless%22`;
|
131
132
|
const response = yield (0, node_fetch_1.default)(endpoint, {
|
132
133
|
method: "GET",
|
@@ -156,6 +157,7 @@ function getRecommendedMonitors(site, monitorsApiKey, monitorsAppKey) {
|
|
156
157
|
}
|
157
158
|
return query;
|
158
159
|
},
|
160
|
+
templateVariables: recommendedMonitorParam.attributes.template_variables,
|
159
161
|
};
|
160
162
|
// recommended monitor params have an id that includes a serverless_ prefix that we have to remove to match the monitor ids we use in the plugin
|
161
163
|
const recommendedMonitorId = recommendedMonitorParam.id.replace("serverless_", "");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"monitor-api-requests.js","sourceRoot":"","sources":["../../src/monitor-api-requests.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAA6C;AAE7C,yCAAwF;AAExF,MAAa,0BAA2B,SAAQ,KAAK;IACnD,YAAY,OAAe;QACzB,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC;QAClB,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAND,gEAMC;
|
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,3 +1,4 @@
|
|
1
|
+
import { TemplateVariable } from "./monitor-api-requests";
|
1
2
|
import { Response } from "node-fetch";
|
2
3
|
export interface MonitorParams {
|
3
4
|
[key: string]: any;
|
@@ -11,6 +12,7 @@ export interface ServerlessMonitor {
|
|
11
12
|
query: (cloudFormationStackId: string, criticalThreshold: number) => string;
|
12
13
|
message: string;
|
13
14
|
type?: string;
|
15
|
+
templateVariables?: TemplateVariable[];
|
14
16
|
}
|
15
17
|
export interface RecommendedMonitors {
|
16
18
|
[key: string]: ServerlessMonitor;
|
@@ -21,6 +23,7 @@ export interface RecommendedMonitors {
|
|
21
23
|
* @param cloudFormationStackId - the Cloud Formation Stack ID
|
22
24
|
* @param service - the Service
|
23
25
|
* @param env - the Environment
|
26
|
+
* @param recommendedMonitors - recommended monitors
|
24
27
|
* @returns valid monitor parameters
|
25
28
|
*/
|
26
29
|
export declare function buildMonitorParams(monitor: Monitor, cloudFormationStackId: string, service: string, env: string, recommendedMonitors: RecommendedMonitors): {
|
@@ -30,24 +33,30 @@ export declare function buildMonitorParams(monitor: Monitor, cloudFormationStack
|
|
30
33
|
* Handles the Monitor API response and logs the appropriate error
|
31
34
|
* @param response Monitor API Response
|
32
35
|
* @param serverlessMonitorId Serverless Monitor ID
|
33
|
-
* @param subdomain
|
34
|
-
* @param site
|
36
|
+
* @param subdomain Subdomain to use for app URLs, e.g. "app"
|
37
|
+
* @param site Which Datadog site to send data to, e.g. datadoghq.com
|
38
|
+
* @returns true if the response is 200 OK. Throw an error for other HTTP status codes.
|
35
39
|
*/
|
36
40
|
export declare function handleMonitorsApiResponse(response: Response, serverlessMonitorId?: string, subdomain?: string, site?: string): boolean;
|
37
41
|
/**
|
38
42
|
* Creates, updates, and deletes the appropriate monitor configurations as defined in the serverless.yml file
|
43
|
+
* @param subdomain - Subdomain to use for app URLs, e.g. "app"
|
44
|
+
* @param site - Which Datadog site to send data to, e.g. datadoghq.com
|
39
45
|
* @param monitors - Monitors defined in the serverless.yml file
|
40
46
|
* @param monitorsApiKey - the API Key
|
41
47
|
* @param monitorsAppKey - the Application Key
|
42
48
|
* @param cloudFormationStackId - the Cloud Formation Stack ID
|
43
49
|
* @param service - the Service
|
44
50
|
* @param env - the Environment
|
45
|
-
* @returns monitors that have been successfully
|
51
|
+
* @returns Log statements showing the monitors that have been successfully
|
52
|
+
* created, updated, and deleted according to the configuration
|
53
|
+
* defined in the plugin
|
46
54
|
*/
|
47
55
|
export declare function setMonitors(subdomain: string, site: string, monitors: Monitor[], monitorsApiKey: string, monitorsAppKey: string, cloudFormationStackId: string, service: string, env: string): Promise<string[]>;
|
48
56
|
/** Helper function that replaces the default threshold included in the query string with the new critical threshold configured by the customer
|
49
57
|
* @param query - the query string
|
50
58
|
* @param criticalThreshold = new critical threshold as defined by the customer
|
59
|
+
* @returns the query string where the critical threshold is already replaced
|
51
60
|
*/
|
52
61
|
export declare function replaceCriticalThreshold(query: string, criticalThreshold: number): string;
|
53
62
|
//# sourceMappingURL=monitors.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,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,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,SAAS,CAAC,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAUT;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
@@ -17,6 +17,7 @@ const monitor_api_requests_1 = require("./monitor-api-requests");
|
|
17
17
|
* @param cloudFormationStackId - the Cloud Formation Stack ID
|
18
18
|
* @param service - the Service
|
19
19
|
* @param env - the Environment
|
20
|
+
* @param recommendedMonitors - recommended monitors
|
20
21
|
* @returns valid monitor parameters
|
21
22
|
*/
|
22
23
|
function buildMonitorParams(monitor, cloudFormationStackId, service, env, recommendedMonitors) {
|
@@ -45,16 +46,17 @@ function buildMonitorParams(monitor, cloudFormationStackId, service, env, recomm
|
|
45
46
|
`service:${service}`,
|
46
47
|
];
|
47
48
|
if (isRecommendedMonitor(serverlessMonitorId, recommendedMonitors)) {
|
48
|
-
|
49
|
+
const recommendedMonitor = recommendedMonitors[serverlessMonitorId];
|
50
|
+
let criticalThreshold = recommendedMonitor.threshold;
|
49
51
|
if (((_b = (_a = monitorParams.options) === null || _a === void 0 ? void 0 : _a.thresholds) === null || _b === void 0 ? void 0 : _b.critical) !== undefined) {
|
50
52
|
criticalThreshold = monitorParams.options.thresholds.critical;
|
51
53
|
}
|
52
|
-
monitorParams.query =
|
54
|
+
monitorParams.query = recommendedMonitor.query(cloudFormationStackId, criticalThreshold);
|
53
55
|
if (!monitorParams.message) {
|
54
|
-
monitorParams.message =
|
56
|
+
monitorParams.message = recommendedMonitor.message;
|
55
57
|
}
|
56
58
|
if (!monitorParams.name) {
|
57
|
-
monitorParams.name =
|
59
|
+
monitorParams.name = getInterpolatedMonitorName(recommendedMonitor);
|
58
60
|
}
|
59
61
|
}
|
60
62
|
return monitorParams;
|
@@ -63,6 +65,7 @@ exports.buildMonitorParams = buildMonitorParams;
|
|
63
65
|
/**
|
64
66
|
* Checks to see if the given monitor is a serverless recommended monitor
|
65
67
|
* @param serverlessMonitorId - Unique ID string defined for each monitor
|
68
|
+
* @param recommendedMonitors - recommended monitors
|
66
69
|
* @returns true if a given monitor is a serverless recommended monitor
|
67
70
|
*/
|
68
71
|
function isRecommendedMonitor(serverlessMonitorId, recommendedMonitors) {
|
@@ -79,6 +82,7 @@ function doesMonitorExist(serverlessMonitorId, existingMonitors) {
|
|
79
82
|
}
|
80
83
|
/**
|
81
84
|
* Deletes the monitors that have been removed from the plugin
|
85
|
+
* @param site Which Datadog site to send data to, e.g. datadoghq.com
|
82
86
|
* @param pluginMonitors Monitors that are currently defined in the plugin
|
83
87
|
* @param existingMonitors Monitors that have already been created
|
84
88
|
* @param monitorsApiKey API Key
|
@@ -106,8 +110,9 @@ function deleteRemovedMonitors(site, pluginMonitors, existingMonitors, monitorsA
|
|
106
110
|
* Handles the Monitor API response and logs the appropriate error
|
107
111
|
* @param response Monitor API Response
|
108
112
|
* @param serverlessMonitorId Serverless Monitor ID
|
109
|
-
* @param subdomain
|
110
|
-
* @param site
|
113
|
+
* @param subdomain Subdomain to use for app URLs, e.g. "app"
|
114
|
+
* @param site Which Datadog site to send data to, e.g. datadoghq.com
|
115
|
+
* @returns true if the response is 200 OK. Throw an error for other HTTP status codes.
|
111
116
|
*/
|
112
117
|
function handleMonitorsApiResponse(response, serverlessMonitorId, subdomain, site) {
|
113
118
|
if (response.status === 200) {
|
@@ -123,13 +128,17 @@ function handleMonitorsApiResponse(response, serverlessMonitorId, subdomain, sit
|
|
123
128
|
exports.handleMonitorsApiResponse = handleMonitorsApiResponse;
|
124
129
|
/**
|
125
130
|
* Creates, updates, and deletes the appropriate monitor configurations as defined in the serverless.yml file
|
131
|
+
* @param subdomain - Subdomain to use for app URLs, e.g. "app"
|
132
|
+
* @param site - Which Datadog site to send data to, e.g. datadoghq.com
|
126
133
|
* @param monitors - Monitors defined in the serverless.yml file
|
127
134
|
* @param monitorsApiKey - the API Key
|
128
135
|
* @param monitorsAppKey - the Application Key
|
129
136
|
* @param cloudFormationStackId - the Cloud Formation Stack ID
|
130
137
|
* @param service - the Service
|
131
138
|
* @param env - the Environment
|
132
|
-
* @returns monitors that have been successfully
|
139
|
+
* @returns Log statements showing the monitors that have been successfully
|
140
|
+
* created, updated, and deleted according to the configuration
|
141
|
+
* defined in the plugin
|
133
142
|
*/
|
134
143
|
function setMonitors(subdomain, site, monitors, monitorsApiKey, monitorsAppKey, cloudFormationStackId, service, env) {
|
135
144
|
return __awaiter(this, void 0, void 0, function* () {
|
@@ -175,6 +184,7 @@ exports.setMonitors = setMonitors;
|
|
175
184
|
/** Helper function that replaces the default threshold included in the query string with the new critical threshold configured by the customer
|
176
185
|
* @param query - the query string
|
177
186
|
* @param criticalThreshold = new critical threshold as defined by the customer
|
187
|
+
* @returns the query string where the critical threshold is already replaced
|
178
188
|
*/
|
179
189
|
function replaceCriticalThreshold(query, criticalThreshold) {
|
180
190
|
const thresholdComparison = /(>=|>)(.*)$/;
|
@@ -182,4 +192,23 @@ function replaceCriticalThreshold(query, criticalThreshold) {
|
|
182
192
|
return newQuery;
|
183
193
|
}
|
184
194
|
exports.replaceCriticalThreshold = replaceCriticalThreshold;
|
195
|
+
/**
|
196
|
+
* Helper function that interpolates template variables (if any) into the name
|
197
|
+
* of a recommended monitor, e.g. replaces template variable `$functionName`
|
198
|
+
* with its default value `{{functionname.name}}`. The interpolation result is
|
199
|
+
* returned. The original monitor params are not altered.
|
200
|
+
* Template variables with no default value will be ignored.
|
201
|
+
* @param recommendedMonitors - recommended monitors
|
202
|
+
* @returns Interpolation result, e.g. "High Error Rate on {{functionname.name}} in {{region.name}} for {{aws_account.name}}"
|
203
|
+
*/
|
204
|
+
function getInterpolatedMonitorName(recommendedMonitor) {
|
205
|
+
var _a;
|
206
|
+
let interpolatedName = recommendedMonitor.name;
|
207
|
+
(_a = recommendedMonitor.templateVariables) === null || _a === void 0 ? void 0 : _a.forEach((templateVariable) => {
|
208
|
+
if (templateVariable.defaults.length > 0) {
|
209
|
+
interpolatedName = interpolatedName.replace("$" + templateVariable.name, templateVariable.defaults[0]);
|
210
|
+
}
|
211
|
+
});
|
212
|
+
return interpolatedName;
|
213
|
+
}
|
185
214
|
//# sourceMappingURL=monitors.js.map
|
package/dist/src/monitors.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"monitors.js","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
1
|
+
{"version":3,"file":"monitors.js","sourceRoot":"","sources":["../../src/monitors.ts"],"names":[],"mappings":"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"}
|
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;AAOvC;;;GAGG;AACH,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,YAAY,EAAE,
|
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;AAOvC;;;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"}
|
@@ -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,
|
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 +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,
|
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 +1 @@
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/tracing.ts"],"names":[],"mappings":"AAQA,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAKvC,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/tracing.ts"],"names":[],"mappings":"AAQA,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAKvC,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAkBxG"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/wrapper.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAA4C,MAAM,SAAS,CAAC;AAEjF,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AACxD,eAAO,MAAM,aAAa,mCAAmC,CAAC;AAC9D,eAAO,MAAM,mBAAmB,+DAA+D,CAAC;AAChG,eAAO,MAAM,SAAS,wDAAwD,CAAC;AAE/E;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/wrapper.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAA4C,MAAM,SAAS,CAAC;AAEjF,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AACxD,eAAO,MAAM,aAAa,mCAAmC,CAAC;AAC9D,eAAO,MAAM,mBAAmB,+DAA+D,CAAC;AAChG,eAAO,MAAM,SAAS,wDAAwD,CAAC;AAE/E;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAuBxG"}
|
package/dist/src/wrapper.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/wrapper.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,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;YACzB,OAAO;SACR;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,IAAA,mCAA2B,EAAC,OAAO,CAAC,EAAE;YACzC,OAAO;SACR;QACD,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YACtC,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG;gBACrB,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,EAAE;aACZ,CAAC;SACH;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;SACnC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,4CAuBC;AAED,SAAS,YAAY,
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/wrapper.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,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;YACzB,OAAO;SACR;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,IAAA,mCAA2B,EAAC,OAAO,CAAC,EAAE;YACzC,OAAO;SACR;QACD,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YACtC,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG;gBACrB,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,EAAE;aACZ,CAAC;SACH;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;SACnC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,4CAuBC;AAED,SAAS,YAAY,CACnB,aAAsC,EACtC,SAAkB,EAClB,aAAsB;IAEtB,IAAI,aAAa,KAAK,SAAS,EAAE;QAC/B,OAAO;KACR;IACD,IAAI,aAAa,EAAE;QACjB,OAAO,aAAa,CAAC;KACtB;IACD,QAAQ,aAAa,EAAE;QACrB,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;KACxB;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.69.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",
|
@@ -62,6 +62,6 @@
|
|
62
62
|
"simple-git": "^3.16.0"
|
63
63
|
},
|
64
64
|
"peerDependencies": {
|
65
|
-
"serverless": "3.x || 2.x || 1.x"
|
65
|
+
"serverless": "4.x || 3.x || 2.x || 1.x"
|
66
66
|
}
|
67
67
|
}
|
package/dist/src/compile.d.ts
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AAGzC,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,QAIvB"}
|
package/dist/src/compile.js
DELETED
@@ -1,10 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.pythonCompileAll = void 0;
|
4
|
-
const child_process_1 = require("child_process");
|
5
|
-
function pythonCompileAll(serverless) {
|
6
|
-
let result = (0, child_process_1.spawnSync)('ls', ['-al', '.serverless']);
|
7
|
-
serverless.cli.log(result.stdout.toString());
|
8
|
-
}
|
9
|
-
exports.pythonCompileAll = pythonCompileAll;
|
10
|
-
//# sourceMappingURL=compile.js.map
|
package/dist/src/compile.js.map
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/compile.ts"],"names":[],"mappings":";;;AACA,iDAA0C;AAE1C,SAAgB,gBAAgB,CAC9B,UAAsB;IAEtB,IAAI,MAAM,GAAG,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;IACrD,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/C,CAAC;AALD,4CAKC"}
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"precomile-python.d.ts","sourceRoot":"","sources":["../../src/precomile-python.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,GAAG,QAW/C"}
|
@@ -1,69 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
-
if (k2 === undefined) k2 = k;
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
-
if (mod && mod.__esModule) return mod;
|
20
|
-
var result = {};
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
-
__setModuleDefault(result, mod);
|
23
|
-
return result;
|
24
|
-
};
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
26
|
-
exports.precompilePython = void 0;
|
27
|
-
const child_process_1 = require("child_process");
|
28
|
-
const fs = __importStar(require("fs"));
|
29
|
-
const path = __importStar(require("path"));
|
30
|
-
function precompilePython(serverless) {
|
31
|
-
serverless.cli.log('Precompiling Python files');
|
32
|
-
let tempDirName = 'datadog';
|
33
|
-
let slsDir = serverless.processedInput.options.package || '.serverless';
|
34
|
-
let tempDir = path.resolve(slsDir, tempDirName);
|
35
|
-
for (const file of lsDirFiles(slsDir, false)) {
|
36
|
-
if (file.endsWith('.zip')) {
|
37
|
-
preCompilePackage(tempDir, file);
|
38
|
-
}
|
39
|
-
}
|
40
|
-
}
|
41
|
-
exports.precompilePython = precompilePython;
|
42
|
-
function preCompilePackage(tempDir, zipFile) {
|
43
|
-
(0, child_process_1.spawnSync)('unzip', ['-d', tempDir, zipFile]);
|
44
|
-
(0, child_process_1.spawnSync)('python', ['-m', 'compileall', '-b', tempDir]);
|
45
|
-
replacePyFiles(tempDir);
|
46
|
-
(0, child_process_1.spawnSync)('rm', [zipFile]);
|
47
|
-
(0, child_process_1.execSync)(`cd ${tempDir} && zip -r ${zipFile} .`);
|
48
|
-
(0, child_process_1.spawnSync)('rm', ['-r', tempDir]);
|
49
|
-
}
|
50
|
-
function replacePyFiles(dir) {
|
51
|
-
for (const file of lsDirFiles(dir)) {
|
52
|
-
if (file.endsWith('.pyc')) {
|
53
|
-
let pyFile = file.replace('.pyc', '.py');
|
54
|
-
(0, child_process_1.spawnSync)('rm', [pyFile]);
|
55
|
-
}
|
56
|
-
}
|
57
|
-
}
|
58
|
-
function* lsDirFiles(dir, recursive = true) {
|
59
|
-
for (const dirent of fs.readdirSync(dir, { withFileTypes: true })) {
|
60
|
-
const res = path.resolve(dir, dirent.name);
|
61
|
-
if (recursive && dirent.isDirectory()) {
|
62
|
-
yield* lsDirFiles(res, recursive);
|
63
|
-
}
|
64
|
-
else {
|
65
|
-
yield res;
|
66
|
-
}
|
67
|
-
}
|
68
|
-
}
|
69
|
-
//# sourceMappingURL=precomile-python.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"precomile-python.js","sourceRoot":"","sources":["../../src/precomile-python.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAoD;AACpD,uCAAyB;AACzB,2CAA6B;AAE7B,SAAgB,gBAAgB,CAAC,UAAe;IAC9C,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAChD,IAAI,WAAW,GAAG,SAAS,CAAC;IAC5B,IAAI,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,CAAC;IACxE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAEhD,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QAC5C,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzB,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SAClC;KACF;AACH,CAAC;AAXD,4CAWC;AAED,SAAS,iBAAiB,CAAC,OAAe,EAAE,OAAe;IACzD,IAAA,yBAAS,EAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7C,IAAA,yBAAS,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACzD,cAAc,CAAC,OAAO,CAAC,CAAC;IACxB,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAA,wBAAQ,EAAC,MAAM,OAAO,cAAc,OAAO,IAAI,CAAC,CAAC;IACjD,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACzC,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3B;KACF;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAW,EAAE,SAAS,GAAG,IAAI;IAChD,KAAK,MAAM,MAAM,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;QACjE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,SAAS,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE;YACrC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SACnC;aAAM;YACL,MAAM,GAAG,CAAC;SACX;KACF;AACH,CAAC"}
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"precompile-python.d.ts","sourceRoot":"","sources":["../../src/precompile-python.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,GAAG,QAW/C"}
|
@@ -1,78 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
-
if (k2 === undefined) k2 = k;
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
-
if (mod && mod.__esModule) return mod;
|
20
|
-
var result = {};
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
-
__setModuleDefault(result, mod);
|
23
|
-
return result;
|
24
|
-
};
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
26
|
-
exports.precompilePython = void 0;
|
27
|
-
const child_process_1 = require("child_process");
|
28
|
-
const fs = __importStar(require("fs"));
|
29
|
-
const path = __importStar(require("path"));
|
30
|
-
function precompilePython(serverless) {
|
31
|
-
serverless.cli.log('Precompiling Python files');
|
32
|
-
let tempDirName = 'datadog';
|
33
|
-
let slsDir = serverless.processedInput.options.package || '.serverless';
|
34
|
-
let tempDir = path.resolve(slsDir, tempDirName);
|
35
|
-
for (const file of lsDirFiles(slsDir, false)) {
|
36
|
-
if (file.endsWith('.zip')) {
|
37
|
-
preCompilePackage(serverless.service.provider.runtime, tempDir, file);
|
38
|
-
}
|
39
|
-
}
|
40
|
-
}
|
41
|
-
exports.precompilePython = precompilePython;
|
42
|
-
function preCompilePackage(python, tempDir, zipFile) {
|
43
|
-
(0, child_process_1.spawnSync)('unzip', ['-d', tempDir, zipFile]);
|
44
|
-
precompile(python, tempDir);
|
45
|
-
replacePyFiles(tempDir);
|
46
|
-
(0, child_process_1.spawnSync)('rm', [zipFile]);
|
47
|
-
(0, child_process_1.execSync)(`cd ${tempDir} && zip -r ${zipFile} .`);
|
48
|
-
(0, child_process_1.spawnSync)('rm', ['-r', tempDir]);
|
49
|
-
}
|
50
|
-
function precompile(python, dir) {
|
51
|
-
// TODO: run precompile in docker container
|
52
|
-
//spawnSync('python', ['-m', 'compileall', '-b', dir]);
|
53
|
-
console.log("----------------------------------------");
|
54
|
-
console.log("python: ", python);
|
55
|
-
console.log("----------------------------------------");
|
56
|
-
let image = python.replace('python3', 'python:3');
|
57
|
-
(0, child_process_1.spawnSync)('docker', ['run', '-v', `${dir}:/mnt`, image, 'python', '-m', 'compileall', '-b', '/mnt']);
|
58
|
-
}
|
59
|
-
function replacePyFiles(dir) {
|
60
|
-
for (const file of lsDirFiles(dir)) {
|
61
|
-
if (file.endsWith('.pyc')) {
|
62
|
-
let pyFile = file.replace('.pyc', '.py');
|
63
|
-
(0, child_process_1.spawnSync)('rm', [pyFile]);
|
64
|
-
}
|
65
|
-
}
|
66
|
-
}
|
67
|
-
function* lsDirFiles(dir, recursive = true) {
|
68
|
-
for (const dirent of fs.readdirSync(dir, { withFileTypes: true })) {
|
69
|
-
const res = path.resolve(dir, dirent.name);
|
70
|
-
if (recursive && dirent.isDirectory()) {
|
71
|
-
yield* lsDirFiles(res, recursive);
|
72
|
-
}
|
73
|
-
else {
|
74
|
-
yield res;
|
75
|
-
}
|
76
|
-
}
|
77
|
-
}
|
78
|
-
//# sourceMappingURL=precompile-python.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"precompile-python.js","sourceRoot":"","sources":["../../src/precompile-python.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAoD;AACpD,uCAAyB;AACzB,2CAA6B;AAE7B,SAAgB,gBAAgB,CAAC,UAAe;IAC9C,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAChD,IAAI,WAAW,GAAG,SAAS,CAAC;IAC5B,IAAI,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,CAAC;IACxE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAEhD,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QAC5C,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzB,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SACvE;KACF;AACH,CAAC;AAXD,4CAWC;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,OAAe,EAAE,OAAe;IACzE,IAAA,yBAAS,EAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7C,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5B,cAAc,CAAC,OAAO,CAAC,CAAC;IACxB,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAA,wBAAQ,EAAC,MAAM,OAAO,cAAc,OAAO,IAAI,CAAC,CAAC;IACjD,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,UAAU,CAAC,MAAc,EAAE,GAAW;IAC7C,2CAA2C;IAC3C,uDAAuD;IACvD,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IACxD,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,yBAAS,EAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACvG,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACzC,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3B;KACF;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAW,EAAE,SAAS,GAAG,IAAI;IAChD,KAAK,MAAM,MAAM,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;QACjE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,SAAS,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE;YACrC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SACnC;aAAM;YACL,MAAM,GAAG,CAAC;SACX;KACF;AACH,CAAC"}
|