@datadog/datadog-ci 2.18.0 → 2.19.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/dist/cli.d.ts +3 -1
- package/dist/cli.js +9 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/cloud-run/cli.d.ts +1 -0
- package/dist/commands/cloud-run/cli.js +5 -0
- package/dist/commands/cloud-run/cli.js.map +1 -0
- package/dist/commands/cloud-run/constants.d.ts +1 -0
- package/dist/commands/cloud-run/constants.js +22 -0
- package/dist/commands/cloud-run/constants.js.map +1 -0
- package/dist/commands/cloud-run/flare.d.ts +91 -0
- package/dist/commands/cloud-run/flare.js +634 -0
- package/dist/commands/cloud-run/flare.js.map +1 -0
- package/dist/commands/cloud-run/interfaces.d.ts +27 -0
- package/dist/commands/cloud-run/interfaces.js +3 -0
- package/dist/commands/cloud-run/interfaces.js.map +1 -0
- package/dist/commands/cloud-run/renderer.d.ts +4 -0
- package/dist/commands/cloud-run/renderer.js +42 -0
- package/dist/commands/cloud-run/renderer.js.map +1 -0
- package/dist/commands/dsyms/renderer.js +6 -6
- package/dist/commands/dsyms/renderer.js.map +1 -1
- package/dist/commands/dsyms/upload.d.ts +5 -5
- package/dist/commands/dsyms/upload.js +66 -42
- package/dist/commands/dsyms/upload.js.map +1 -1
- package/dist/commands/dsyms/utils.d.ts +1 -1
- package/dist/commands/dsyms/utils.js +3 -3
- package/dist/commands/dsyms/utils.js.map +1 -1
- package/dist/commands/flutter-symbols/helpers.js +8 -4
- package/dist/commands/flutter-symbols/helpers.js.map +1 -1
- package/dist/commands/flutter-symbols/renderer.js +2 -2
- package/dist/commands/flutter-symbols/renderer.js.map +1 -1
- package/dist/commands/flutter-symbols/upload.d.ts +13 -13
- package/dist/commands/flutter-symbols/upload.js +66 -66
- package/dist/commands/flutter-symbols/upload.js.map +1 -1
- package/dist/commands/gate/api.js +4 -2
- package/dist/commands/gate/api.js.map +1 -1
- package/dist/commands/gate/evaluate.d.ts +18 -6
- package/dist/commands/gate/evaluate.js +116 -40
- package/dist/commands/gate/evaluate.js.map +1 -1
- package/dist/commands/gate/interfaces.d.ts +5 -0
- package/dist/commands/gate/renderer.js +16 -14
- package/dist/commands/gate/renderer.js.map +1 -1
- package/dist/commands/gate/utils.d.ts +1 -0
- package/dist/commands/gate/utils.js +8 -4
- package/dist/commands/gate/utils.js.map +1 -1
- package/dist/commands/git-metadata/git.d.ts +1 -1
- package/dist/commands/git-metadata/git.js +7 -3
- package/dist/commands/git-metadata/git.js.map +1 -1
- package/dist/commands/git-metadata/gitdb.d.ts +1 -1
- package/dist/commands/git-metadata/gitdb.js +7 -7
- package/dist/commands/git-metadata/gitdb.js.map +1 -1
- package/dist/commands/git-metadata/index.js +5 -1
- package/dist/commands/git-metadata/index.js.map +1 -1
- package/dist/commands/git-metadata/library.d.ts +1 -1
- package/dist/commands/git-metadata/library.js +13 -13
- package/dist/commands/git-metadata/library.js.map +1 -1
- package/dist/commands/git-metadata/upload.d.ts +5 -5
- package/dist/commands/git-metadata/upload.js +30 -32
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/junit/api.js +4 -4
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/id.js +1 -1
- package/dist/commands/junit/id.js.map +1 -1
- package/dist/commands/junit/renderer.d.ts +1 -1
- package/dist/commands/junit/renderer.js +3 -3
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +12 -11
- package/dist/commands/junit/upload.js +74 -63
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +1 -2
- package/dist/commands/junit/utils.js +5 -10
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +13 -11
- package/dist/commands/lambda/constants.js +41 -70
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/flare.d.ts +25 -74
- package/dist/commands/lambda/flare.js +182 -332
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +8 -14
- package/dist/commands/lambda/functions/commons.js +57 -69
- package/dist/commands/lambda/functions/commons.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +66 -65
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.js +38 -37
- package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
- package/dist/commands/lambda/functions/versionChecker.d.ts +2 -2
- package/dist/commands/lambda/instrument.d.ts +22 -20
- package/dist/commands/lambda/instrument.js +78 -69
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/loggroup.js +8 -8
- package/dist/commands/lambda/loggroup.js.map +1 -1
- package/dist/commands/lambda/prompt.d.ts +1 -4
- package/dist/commands/lambda/prompt.js +34 -71
- package/dist/commands/lambda/prompt.js.map +1 -1
- package/dist/commands/lambda/renderers/__mocks__/instrument-uninstrument-renderer.d.ts +2 -0
- package/dist/commands/lambda/renderers/__mocks__/instrument-uninstrument-renderer.js +11 -0
- package/dist/commands/lambda/renderers/__mocks__/instrument-uninstrument-renderer.js.map +1 -0
- package/dist/commands/lambda/renderers/common-renderer.d.ts +0 -26
- package/dist/commands/lambda/renderers/common-renderer.js +4 -32
- package/dist/commands/lambda/renderers/common-renderer.js.map +1 -1
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.d.ts +2 -2
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.js +57 -49
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.js.map +1 -1
- package/dist/commands/lambda/tags.js +7 -7
- package/dist/commands/lambda/tags.js.map +1 -1
- package/dist/commands/lambda/uninstrument.d.ts +25 -7
- package/dist/commands/lambda/uninstrument.js +59 -49
- package/dist/commands/lambda/uninstrument.js.map +1 -1
- package/dist/commands/metric/metric.d.ts +4 -3
- package/dist/commands/metric/metric.js +10 -9
- package/dist/commands/metric/metric.js.map +1 -1
- package/dist/commands/react-native/codepush.d.ts +11 -10
- package/dist/commands/react-native/codepush.js +17 -19
- package/dist/commands/react-native/codepush.js.map +1 -1
- package/dist/commands/react-native/interfaces.d.ts +1 -1
- package/dist/commands/react-native/renderer.js +6 -6
- package/dist/commands/react-native/renderer.js.map +1 -1
- package/dist/commands/react-native/upload.d.ts +12 -12
- package/dist/commands/react-native/upload.js +67 -45
- package/dist/commands/react-native/upload.js.map +1 -1
- package/dist/commands/react-native/utils.js +2 -1
- package/dist/commands/react-native/utils.js.map +1 -1
- package/dist/commands/react-native/validation.js +1 -1
- package/dist/commands/react-native/validation.js.map +1 -1
- package/dist/commands/react-native/xcode.d.ts +6 -6
- package/dist/commands/react-native/xcode.js +25 -29
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/sarif/api.js +6 -22
- package/dist/commands/sarif/api.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -1
- package/dist/commands/sarif/renderer.js +1 -1
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.d.ts +6 -6
- package/dist/commands/sarif/upload.js +46 -37
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/api.d.ts +7 -0
- package/dist/commands/sbom/api.js +49 -0
- package/dist/commands/sbom/api.js.map +1 -0
- package/dist/commands/sbom/cli.d.ts +1 -0
- package/dist/commands/sbom/cli.js +5 -0
- package/dist/commands/sbom/cli.js.map +1 -0
- package/dist/commands/sbom/constants.d.ts +2 -0
- package/dist/commands/sbom/constants.js +6 -0
- package/dist/commands/sbom/constants.js.map +1 -0
- package/dist/commands/sbom/json-schema/cyclonedx/bom-1.4.schema.json +1687 -0
- package/dist/commands/sbom/json-schema/jsf/jsf-0.82.schema.json +244 -0
- package/dist/commands/sbom/json-schema/spdx/spdx.schema.json +507 -0
- package/dist/commands/sbom/protobuf/bom-1.4.d.ts +11788 -0
- package/dist/commands/sbom/protobuf/bom-1.4.js +5161 -0
- package/dist/commands/sbom/protobuf/bom-1.4.js.map +1 -0
- package/dist/commands/sbom/protobuf/custom_message.d.ts +11 -0
- package/dist/commands/sbom/protobuf/custom_message.js +3 -0
- package/dist/commands/sbom/protobuf/custom_message.js.map +1 -0
- package/dist/commands/sbom/protobuf/google/protobuf/duration.d.ts +110 -0
- package/dist/commands/sbom/protobuf/google/protobuf/duration.js +126 -0
- package/dist/commands/sbom/protobuf/google/protobuf/duration.js.map +1 -0
- package/dist/commands/sbom/protobuf/google/protobuf/timestamp.d.ts +139 -0
- package/dist/commands/sbom/protobuf/google/protobuf/timestamp.js +126 -0
- package/dist/commands/sbom/protobuf/google/protobuf/timestamp.js.map +1 -0
- package/dist/commands/sbom/protobuf/sbom_intake.d.ts +53 -0
- package/dist/commands/sbom/protobuf/sbom_intake.js +383 -0
- package/dist/commands/sbom/protobuf/sbom_intake.js.map +1 -0
- package/dist/commands/sbom/types.d.ts +4 -0
- package/dist/commands/sbom/types.js +3 -0
- package/dist/commands/sbom/types.js.map +1 -0
- package/dist/commands/sbom/upload.d.ts +16 -0
- package/dist/commands/sbom/upload.js +134 -0
- package/dist/commands/sbom/upload.js.map +1 -0
- package/dist/commands/sbom/validation.d.ts +12 -0
- package/dist/commands/sbom/validation.js +51 -0
- package/dist/commands/sbom/validation.js.map +1 -0
- package/dist/commands/sourcemaps/renderer.js +6 -6
- package/dist/commands/sourcemaps/renderer.js.map +1 -1
- package/dist/commands/sourcemaps/upload.d.ts +10 -10
- package/dist/commands/sourcemaps/upload.js +61 -38
- package/dist/commands/sourcemaps/upload.js.map +1 -1
- package/dist/commands/sourcemaps/validation.js +4 -4
- package/dist/commands/sourcemaps/validation.js.map +1 -1
- package/dist/commands/stepfunctions/awsCommands.js +10 -10
- package/dist/commands/stepfunctions/awsCommands.js.map +1 -1
- package/dist/commands/stepfunctions/helpers.d.ts +4 -4
- package/dist/commands/stepfunctions/helpers.js +4 -4
- package/dist/commands/stepfunctions/helpers.js.map +1 -1
- package/dist/commands/stepfunctions/instrument.d.ts +5 -4
- package/dist/commands/stepfunctions/instrument.js +30 -31
- package/dist/commands/stepfunctions/instrument.js.map +1 -1
- package/dist/commands/stepfunctions/uninstrument.d.ts +6 -1
- package/dist/commands/stepfunctions/uninstrument.js +23 -23
- package/dist/commands/stepfunctions/uninstrument.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +1 -1
- package/dist/commands/synthetics/api.js +11 -11
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +3 -3
- package/dist/commands/synthetics/index.js +5 -1
- package/dist/commands/synthetics/index.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +8 -7
- package/dist/commands/synthetics/interfaces.js +2 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +1 -1
- package/dist/commands/synthetics/mobile.js +26 -20
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.d.ts +2 -2
- package/dist/commands/synthetics/reporters/default.js +17 -19
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +2 -2
- package/dist/commands/synthetics/reporters/junit.js +11 -11
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +21 -19
- package/dist/commands/synthetics/run-tests-command.js +108 -42
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.d.ts +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +16 -16
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/tunnel/crypto.js +3 -3
- package/dist/commands/synthetics/tunnel/crypto.js.map +1 -1
- package/dist/commands/synthetics/tunnel/tunnel.js +11 -11
- package/dist/commands/synthetics/tunnel/tunnel.js.map +1 -1
- package/dist/commands/synthetics/tunnel/websocket.d.ts +1 -0
- package/dist/commands/synthetics/tunnel/websocket.js +7 -3
- package/dist/commands/synthetics/tunnel/websocket.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.d.ts +10 -8
- package/dist/commands/synthetics/upload-application-command.js +36 -13
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils.d.ts +12 -12
- package/dist/commands/synthetics/utils.js +52 -47
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/dist/commands/tag/tag.d.ts +4 -3
- package/dist/commands/tag/tag.js +10 -9
- package/dist/commands/tag/tag.js.map +1 -1
- package/dist/commands/trace/api.js +4 -4
- package/dist/commands/trace/api.js.map +1 -1
- package/dist/commands/trace/interfaces.d.ts +1 -1
- package/dist/commands/trace/trace.d.ts +5 -4
- package/dist/commands/trace/trace.js +11 -10
- package/dist/commands/trace/trace.js.map +1 -1
- package/dist/commands/version/cli.js +6 -5
- package/dist/commands/version/cli.js.map +1 -1
- package/dist/constants.d.ts +17 -0
- package/dist/constants.js +65 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/api.d.ts +5 -0
- package/dist/helpers/api.js +16 -0
- package/dist/helpers/api.js.map +1 -0
- package/dist/helpers/base-intake-url.d.ts +1 -1
- package/dist/helpers/ci.d.ts +13 -13
- package/dist/helpers/ci.js +17 -17
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/config.d.ts +5 -0
- package/dist/helpers/config.js +3 -0
- package/dist/helpers/config.js.map +1 -0
- package/dist/helpers/flare.d.ts +41 -0
- package/dist/helpers/flare.js +191 -0
- package/dist/helpers/flare.js.map +1 -0
- package/dist/helpers/fs.d.ts +31 -0
- package/dist/helpers/fs.js +117 -0
- package/dist/helpers/fs.js.map +1 -0
- package/dist/helpers/git/format-git-sourcemaps-data.js +7 -3
- package/dist/helpers/git/format-git-sourcemaps-data.js.map +1 -1
- package/dist/helpers/git/format-git-span-data.js +6 -6
- package/dist/helpers/git/format-git-span-data.js.map +1 -1
- package/dist/helpers/git/get-git-data.js +3 -3
- package/dist/helpers/git/get-git-data.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +9 -3
- package/dist/helpers/logger.js +1 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/plist.d.ts +1 -1
- package/dist/helpers/plist.js +1 -1
- package/dist/helpers/plist.js.map +1 -1
- package/dist/helpers/prompt.d.ts +7 -0
- package/dist/helpers/prompt.js +57 -0
- package/dist/helpers/prompt.js.map +1 -0
- package/dist/helpers/renderer.d.ts +60 -0
- package/dist/helpers/renderer.js +98 -0
- package/dist/helpers/renderer.js.map +1 -0
- package/dist/helpers/retry.d.ts +1 -1
- package/dist/helpers/retry.js +3 -3
- package/dist/helpers/retry.js.map +1 -1
- package/dist/helpers/tags.d.ts +8 -0
- package/dist/helpers/tags.js +27 -1
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/upload.js +3 -3
- package/dist/helpers/upload.js.map +1 -1
- package/dist/helpers/user-provided-git.js +6 -6
- package/dist/helpers/user-provided-git.js.map +1 -1
- package/dist/helpers/utils.d.ts +12 -5
- package/dist/helpers/utils.js +57 -25
- package/dist/helpers/utils.js.map +1 -1
- package/dist/helpers/validation.d.ts +3 -1
- package/dist/helpers/validation.js +27 -1
- package/dist/helpers/validation.js.map +1 -1
- package/dist/helpers/version.d.ts +4 -0
- package/dist/helpers/version.js +9 -0
- package/dist/helpers/version.js.map +1 -0
- package/dist/index.d.ts +4 -4
- package/dist/index.js +11 -8
- package/dist/index.js.map +1 -1
- package/package.json +28 -13
- package/dist/commands/lambda/renderers/flare-renderer.d.ts +0 -9
- package/dist/commands/lambda/renderers/flare-renderer.js +0 -22
- package/dist/commands/lambda/renderers/flare-renderer.js.map +0 -1
- package/dist/helpers/file.d.ts +0 -1
- package/dist/helpers/file.js +0 -9
- package/dist/helpers/file.js.map +0 -1
|
@@ -10,17 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.calculateUpdateRequest = exports.getInstrumentedFunctionConfigsFromRegEx = exports.getInstrumentedFunctionConfig = exports.getInstrumentedFunctionConfigs = void 0;
|
|
13
|
+
const constants_1 = require("../../../constants");
|
|
13
14
|
const validation_1 = require("../../../helpers/validation");
|
|
14
|
-
const
|
|
15
|
+
const constants_2 = require("../constants");
|
|
15
16
|
const loggroup_1 = require("../loggroup");
|
|
16
17
|
const tags_1 = require("../tags");
|
|
17
18
|
const commons_1 = require("./commons");
|
|
18
19
|
const versionChecker_1 = require("./versionChecker");
|
|
19
20
|
const getInstrumentedFunctionConfigs = (lambdaClient, cloudWatchLogsClient, region, functionARNs, settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
-
const lambdaFunctionConfigs = yield commons_1.getLambdaFunctionConfigs(lambdaClient, functionARNs);
|
|
21
|
+
const lambdaFunctionConfigs = yield (0, commons_1.getLambdaFunctionConfigs)(lambdaClient, functionARNs);
|
|
21
22
|
const configs = [];
|
|
22
23
|
for (const config of lambdaFunctionConfigs) {
|
|
23
|
-
const functionConfig = yield exports.getInstrumentedFunctionConfig(lambdaClient, cloudWatchLogsClient, config, region, settings);
|
|
24
|
+
const functionConfig = yield (0, exports.getInstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, region, settings);
|
|
24
25
|
configs.push(functionConfig);
|
|
25
26
|
}
|
|
26
27
|
return configs;
|
|
@@ -29,16 +30,16 @@ exports.getInstrumentedFunctionConfigs = getInstrumentedFunctionConfigs;
|
|
|
29
30
|
const getInstrumentedFunctionConfig = (lambdaClient, cloudWatchLogsClient, config, region, settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
31
|
const functionARN = config.FunctionArn;
|
|
31
32
|
const runtime = config.Runtime;
|
|
32
|
-
if (!commons_1.isSupportedRuntime(runtime)) {
|
|
33
|
+
if (!(0, commons_1.isSupportedRuntime)(runtime)) {
|
|
33
34
|
throw Error(`Can't instrument ${functionARN}, runtime ${runtime} not supported`);
|
|
34
35
|
}
|
|
35
|
-
const updateRequest = yield exports.calculateUpdateRequest(config, settings, region, runtime);
|
|
36
|
+
const updateRequest = yield (0, exports.calculateUpdateRequest)(config, settings, region, runtime);
|
|
36
37
|
let logGroupConfiguration;
|
|
37
38
|
if (settings.forwarderARN !== undefined) {
|
|
38
39
|
const logGroupName = `/aws/lambda/${config.FunctionName}`;
|
|
39
|
-
logGroupConfiguration = yield loggroup_1.calculateLogGroupUpdateRequest(cloudWatchLogsClient, logGroupName, settings.forwarderARN);
|
|
40
|
+
logGroupConfiguration = yield (0, loggroup_1.calculateLogGroupUpdateRequest)(cloudWatchLogsClient, logGroupName, settings.forwarderARN);
|
|
40
41
|
}
|
|
41
|
-
const tagConfiguration = yield tags_1.calculateTagUpdateRequest(lambdaClient, functionARN);
|
|
42
|
+
const tagConfiguration = yield (0, tags_1.calculateTagUpdateRequest)(lambdaClient, functionARN);
|
|
42
43
|
return {
|
|
43
44
|
functionARN,
|
|
44
45
|
lambdaConfig: config,
|
|
@@ -49,23 +50,23 @@ const getInstrumentedFunctionConfig = (lambdaClient, cloudWatchLogsClient, confi
|
|
|
49
50
|
});
|
|
50
51
|
exports.getInstrumentedFunctionConfig = getInstrumentedFunctionConfig;
|
|
51
52
|
const getInstrumentedFunctionConfigsFromRegEx = (lambdaClient, cloudWatchLogsClient, region, pattern, settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
-
const matchedFunctions = yield commons_1.getLambdaFunctionConfigsFromRegex(lambdaClient, pattern);
|
|
53
|
+
const matchedFunctions = yield (0, commons_1.getLambdaFunctionConfigsFromRegex)(lambdaClient, pattern);
|
|
53
54
|
const functionsToUpdate = [];
|
|
54
55
|
for (const config of matchedFunctions) {
|
|
55
|
-
const functionConfig = yield exports.getInstrumentedFunctionConfig(lambdaClient, cloudWatchLogsClient, config, region, settings);
|
|
56
|
+
const functionConfig = yield (0, exports.getInstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, region, settings);
|
|
56
57
|
functionsToUpdate.push(functionConfig);
|
|
57
58
|
}
|
|
58
59
|
return functionsToUpdate;
|
|
59
60
|
});
|
|
60
61
|
exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
|
|
61
62
|
const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
|
-
var _a, _b, _c, _d, _e;
|
|
63
|
+
var _a, _b, _c, _d, _e, _f;
|
|
63
64
|
const oldEnvVars = Object.assign({}, (_a = config.Environment) === null || _a === void 0 ? void 0 : _a.Variables);
|
|
64
65
|
const changedEnvVars = {};
|
|
65
66
|
const functionARN = config.FunctionArn;
|
|
66
|
-
const apiKey = process.env[constants_1.CI_API_KEY_ENV_VAR];
|
|
67
|
-
const apiKeySecretArn = process.env[
|
|
68
|
-
const apiKmsKey = process.env[
|
|
67
|
+
const apiKey = (_b = process.env[constants_1.CI_API_KEY_ENV_VAR]) !== null && _b !== void 0 ? _b : process.env[constants_1.API_KEY_ENV_VAR];
|
|
68
|
+
const apiKeySecretArn = process.env[constants_2.CI_API_KEY_SECRET_ARN_ENV_VAR];
|
|
69
|
+
const apiKmsKey = process.env[constants_2.CI_KMS_API_KEY_ENV_VAR];
|
|
69
70
|
const site = process.env[constants_1.CI_SITE_ENV_VAR];
|
|
70
71
|
if (functionARN === undefined) {
|
|
71
72
|
return undefined;
|
|
@@ -74,55 +75,55 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
74
75
|
FunctionName: functionARN,
|
|
75
76
|
};
|
|
76
77
|
let needsUpdate = false;
|
|
77
|
-
const runtimeType =
|
|
78
|
-
if (runtimeType ===
|
|
78
|
+
const runtimeType = constants_2.RUNTIME_LOOKUP[runtime];
|
|
79
|
+
if (runtimeType === constants_2.RuntimeType.CUSTOM) {
|
|
79
80
|
if (settings.layerVersion !== undefined) {
|
|
80
81
|
throw new Error(`Only the --extension-version argument should be set for the ${runtime} runtime. Please remove the --layer-version argument from the instrument command.`);
|
|
81
82
|
}
|
|
82
83
|
}
|
|
83
84
|
// Update Python Handler
|
|
84
|
-
if (runtimeType ===
|
|
85
|
-
const expectedHandler =
|
|
85
|
+
if (runtimeType === constants_2.RuntimeType.PYTHON && (settings.layerVersion !== undefined || settings.interactive)) {
|
|
86
|
+
const expectedHandler = constants_2.PYTHON_HANDLER_LOCATION;
|
|
86
87
|
if (config.Handler !== expectedHandler) {
|
|
87
88
|
needsUpdate = true;
|
|
88
|
-
updateRequest.Handler =
|
|
89
|
+
updateRequest.Handler = constants_2.PYTHON_HANDLER_LOCATION;
|
|
89
90
|
}
|
|
90
91
|
}
|
|
91
92
|
// Update Node Handler
|
|
92
|
-
if (runtimeType ===
|
|
93
|
-
const expectedHandler =
|
|
93
|
+
if (runtimeType === constants_2.RuntimeType.NODE && (settings.layerVersion !== undefined || settings.interactive)) {
|
|
94
|
+
const expectedHandler = constants_2.NODE_HANDLER_LOCATION;
|
|
94
95
|
if (config.Handler !== expectedHandler) {
|
|
95
96
|
needsUpdate = true;
|
|
96
|
-
updateRequest.Handler =
|
|
97
|
+
updateRequest.Handler = constants_2.NODE_HANDLER_LOCATION;
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
// Update Env Vars
|
|
100
|
-
if (runtimeType ===
|
|
101
|
-
if (oldEnvVars[
|
|
101
|
+
if (runtimeType === constants_2.RuntimeType.PYTHON || runtimeType === constants_2.RuntimeType.NODE) {
|
|
102
|
+
if (oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR] === undefined) {
|
|
102
103
|
needsUpdate = true;
|
|
103
|
-
changedEnvVars[
|
|
104
|
+
changedEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR] = (_c = config.Handler) !== null && _c !== void 0 ? _c : '';
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
// KMS > Secrets Manager > API Key
|
|
107
|
-
if (apiKmsKey !== undefined && oldEnvVars[
|
|
108
|
+
if (apiKmsKey !== undefined && oldEnvVars[constants_2.KMS_API_KEY_ENV_VAR] !== apiKmsKey) {
|
|
108
109
|
needsUpdate = true;
|
|
109
|
-
changedEnvVars[
|
|
110
|
+
changedEnvVars[constants_2.KMS_API_KEY_ENV_VAR] = apiKmsKey;
|
|
110
111
|
}
|
|
111
|
-
else if (apiKeySecretArn !== undefined && oldEnvVars[
|
|
112
|
-
const isNode = runtimeType ===
|
|
112
|
+
else if (apiKeySecretArn !== undefined && oldEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] !== apiKeySecretArn) {
|
|
113
|
+
const isNode = runtimeType === constants_2.RuntimeType.NODE;
|
|
113
114
|
const isSendingSynchronousMetrics = settings.extensionVersion === undefined && !settings.flushMetricsToLogs;
|
|
114
115
|
if (isSendingSynchronousMetrics && isNode) {
|
|
115
116
|
throw new Error('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
|
|
116
117
|
}
|
|
117
118
|
needsUpdate = true;
|
|
118
|
-
changedEnvVars[
|
|
119
|
+
changedEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] = apiKeySecretArn;
|
|
119
120
|
}
|
|
120
121
|
else if (apiKey !== undefined && oldEnvVars[constants_1.API_KEY_ENV_VAR] !== apiKey) {
|
|
121
122
|
needsUpdate = true;
|
|
122
123
|
changedEnvVars[constants_1.API_KEY_ENV_VAR] = apiKey;
|
|
123
124
|
}
|
|
124
125
|
if (site !== undefined && oldEnvVars[constants_1.SITE_ENV_VAR] !== site) {
|
|
125
|
-
if (validation_1.isValidDatadogSite(site)) {
|
|
126
|
+
if ((0, validation_1.isValidDatadogSite)(site)) {
|
|
126
127
|
needsUpdate = true;
|
|
127
128
|
changedEnvVars[constants_1.SITE_ENV_VAR] = site;
|
|
128
129
|
}
|
|
@@ -135,17 +136,17 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
135
136
|
changedEnvVars[constants_1.SITE_ENV_VAR] = 'datadoghq.com';
|
|
136
137
|
}
|
|
137
138
|
const environmentVarsTupleArray = [
|
|
138
|
-
['apmFlushDeadline',
|
|
139
|
-
['captureLambdaPayload',
|
|
139
|
+
['apmFlushDeadline', constants_2.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR],
|
|
140
|
+
['captureLambdaPayload', constants_2.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR],
|
|
140
141
|
['environment', constants_1.ENVIRONMENT_ENV_VAR],
|
|
141
|
-
['extraTags',
|
|
142
|
-
['mergeXrayTraces',
|
|
142
|
+
['extraTags', constants_2.EXTRA_TAGS_ENV_VAR],
|
|
143
|
+
['mergeXrayTraces', constants_2.MERGE_XRAY_TRACES_ENV_VAR],
|
|
143
144
|
['service', constants_1.SERVICE_ENV_VAR],
|
|
144
|
-
['tracingEnabled',
|
|
145
|
+
['tracingEnabled', constants_2.TRACE_ENABLED_ENV_VAR],
|
|
145
146
|
['version', constants_1.VERSION_ENV_VAR],
|
|
146
147
|
];
|
|
147
148
|
for (const [key, environmentVar] of environmentVarsTupleArray) {
|
|
148
|
-
if (settings[key] !== undefined && oldEnvVars[environmentVar] !== ((
|
|
149
|
+
if (settings[key] !== undefined && oldEnvVars[environmentVar] !== ((_d = settings[key]) === null || _d === void 0 ? void 0 : _d.toString())) {
|
|
149
150
|
needsUpdate = true;
|
|
150
151
|
changedEnvVars[environmentVar] = settings[key].toString();
|
|
151
152
|
}
|
|
@@ -154,73 +155,73 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
154
155
|
const isUsingExtension = settings.extensionVersion !== undefined;
|
|
155
156
|
if (!isUsingExtension &&
|
|
156
157
|
settings.flushMetricsToLogs !== undefined &&
|
|
157
|
-
oldEnvVars[
|
|
158
|
+
oldEnvVars[constants_2.FLUSH_TO_LOG_ENV_VAR] !== ((_e = settings.flushMetricsToLogs) === null || _e === void 0 ? void 0 : _e.toString())) {
|
|
158
159
|
needsUpdate = true;
|
|
159
|
-
changedEnvVars[
|
|
160
|
+
changedEnvVars[constants_2.FLUSH_TO_LOG_ENV_VAR] = settings.flushMetricsToLogs.toString();
|
|
160
161
|
}
|
|
161
162
|
const newEnvVars = Object.assign(Object.assign({}, oldEnvVars), changedEnvVars);
|
|
162
|
-
if (newEnvVars[
|
|
163
|
+
if (newEnvVars[constants_2.LOG_LEVEL_ENV_VAR] !== settings.logLevel) {
|
|
163
164
|
needsUpdate = true;
|
|
164
165
|
if (settings.logLevel) {
|
|
165
|
-
newEnvVars[
|
|
166
|
+
newEnvVars[constants_2.LOG_LEVEL_ENV_VAR] = settings.logLevel;
|
|
166
167
|
}
|
|
167
168
|
else {
|
|
168
|
-
delete newEnvVars[
|
|
169
|
+
delete newEnvVars[constants_2.LOG_LEVEL_ENV_VAR];
|
|
169
170
|
}
|
|
170
171
|
}
|
|
171
|
-
let layerARNs = commons_1.getLayers(config);
|
|
172
|
+
let layerARNs = (0, commons_1.getLayers)(config);
|
|
172
173
|
const originalLayerARNs = layerARNs;
|
|
173
174
|
let needsLayerUpdate = false;
|
|
174
175
|
let layerOrTraceVersion;
|
|
175
|
-
if (commons_1.isLayerRuntime(runtime)) {
|
|
176
|
-
const lambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
|
|
177
|
-
const lambdaLibraryLayerName =
|
|
176
|
+
if ((0, commons_1.isLayerRuntime)(runtime)) {
|
|
177
|
+
const lambdaLibraryLayerArn = (0, commons_1.getLayerArn)(config, config.Runtime, region, settings);
|
|
178
|
+
const lambdaLibraryLayerName = constants_2.LAYER_LOOKUP[runtime];
|
|
178
179
|
let fullLambdaLibraryLayerARN;
|
|
179
180
|
if (settings.layerVersion !== undefined || settings.interactive) {
|
|
180
181
|
layerOrTraceVersion = settings.layerVersion;
|
|
181
182
|
if (settings.interactive && !settings.layerVersion) {
|
|
182
|
-
layerOrTraceVersion = yield commons_1.findLatestLayerVersion(config.Runtime, region);
|
|
183
|
+
layerOrTraceVersion = yield (0, commons_1.findLatestLayerVersion)(config.Runtime, region);
|
|
183
184
|
}
|
|
184
185
|
fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${layerOrTraceVersion}`;
|
|
185
186
|
}
|
|
186
|
-
layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerARN, lambdaLibraryLayerName, layerARNs);
|
|
187
|
+
layerARNs = (0, commons_1.addLayerArn)(fullLambdaLibraryLayerARN, lambdaLibraryLayerName, layerARNs);
|
|
187
188
|
}
|
|
188
|
-
const lambdaExtensionLayerArn = commons_1.getLayerArn(config,
|
|
189
|
+
const lambdaExtensionLayerArn = (0, commons_1.getLayerArn)(config, constants_2.EXTENSION_LAYER_KEY, region, settings);
|
|
189
190
|
let fullExtensionLayerARN;
|
|
190
191
|
let extensionVersion;
|
|
191
192
|
if (settings.extensionVersion !== undefined || settings.interactive) {
|
|
192
193
|
extensionVersion = settings.extensionVersion;
|
|
193
194
|
if (settings.interactive && !settings.extensionVersion) {
|
|
194
|
-
extensionVersion = yield commons_1.findLatestLayerVersion(
|
|
195
|
+
extensionVersion = yield (0, commons_1.findLatestLayerVersion)(constants_2.EXTENSION_LAYER_KEY, region);
|
|
195
196
|
}
|
|
196
197
|
fullExtensionLayerARN = `${lambdaExtensionLayerArn}:${extensionVersion}`;
|
|
197
198
|
}
|
|
198
|
-
layerARNs = commons_1.addLayerArn(fullExtensionLayerARN,
|
|
199
|
+
layerARNs = (0, commons_1.addLayerArn)(fullExtensionLayerARN, constants_2.DD_LAMBDA_EXTENSION_LAYER_NAME, layerARNs);
|
|
199
200
|
// Special handling for .NET and Java to support universal instrumentation
|
|
200
|
-
if (runtimeType ===
|
|
201
|
-
if (layerOrTraceVersion && versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation(runtimeType, extensionVersion)) {
|
|
201
|
+
if (runtimeType === constants_2.RuntimeType.DOTNET || runtimeType === constants_2.RuntimeType.JAVA) {
|
|
202
|
+
if (layerOrTraceVersion && (0, versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation)(runtimeType, extensionVersion)) {
|
|
202
203
|
// If the user configures the trace version and the extension support univeral instrumenation
|
|
203
204
|
// Then check whether the trace and extension are compatible with each other
|
|
204
|
-
if (versionChecker_1.isTracerCompatibleWithExtension(runtimeType, layerOrTraceVersion)) {
|
|
205
|
+
if ((0, versionChecker_1.isTracerCompatibleWithExtension)(runtimeType, layerOrTraceVersion)) {
|
|
205
206
|
needsUpdate = true;
|
|
206
|
-
newEnvVars[
|
|
207
|
+
newEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] = constants_2.AWS_LAMBDA_EXEC_WRAPPER;
|
|
207
208
|
}
|
|
208
209
|
else {
|
|
209
210
|
throw new Error(`For the ${runtime} runtime, the dd-trace version ${layerOrTraceVersion} is not compatible with the dd-extension version ${extensionVersion}`);
|
|
210
211
|
}
|
|
211
212
|
}
|
|
212
|
-
else if (runtimeType ===
|
|
213
|
+
else if (runtimeType === constants_2.RuntimeType.DOTNET) {
|
|
213
214
|
// If it is an old extension version or the trace version is null, leave it is as the old workflow
|
|
214
|
-
if (!versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation(runtimeType, extensionVersion) &&
|
|
215
|
-
((
|
|
215
|
+
if (!(0, versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation)(runtimeType, extensionVersion) &&
|
|
216
|
+
((_f = config.Architectures) === null || _f === void 0 ? void 0 : _f.includes(constants_2.ARM64_ARCHITECTURE))) {
|
|
216
217
|
throw new Error('Instrumenting arm64 architecture is not supported for the given dd-extension version. Please choose the latest dd-extension version or use x86_64 architecture.');
|
|
217
218
|
}
|
|
218
219
|
else {
|
|
219
220
|
needsUpdate = true;
|
|
220
|
-
newEnvVars[
|
|
221
|
-
newEnvVars[
|
|
222
|
-
newEnvVars[
|
|
223
|
-
newEnvVars[
|
|
221
|
+
newEnvVars[constants_2.ENABLE_PROFILING_ENV_VAR] = constants_2.CORECLR_ENABLE_PROFILING;
|
|
222
|
+
newEnvVars[constants_2.PROFILER_ENV_VAR] = constants_2.CORECLR_PROFILER;
|
|
223
|
+
newEnvVars[constants_2.PROFILER_PATH_ENV_VAR] = constants_2.CORECLR_PROFILER_PATH;
|
|
224
|
+
newEnvVars[constants_2.DOTNET_TRACER_HOME_ENV_VAR] = constants_2.DD_DOTNET_TRACER_HOME;
|
|
224
225
|
}
|
|
225
226
|
}
|
|
226
227
|
}
|
|
@@ -235,11 +236,11 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
235
236
|
updateRequest.Layers = layerARNs;
|
|
236
237
|
}
|
|
237
238
|
layerARNs.forEach((layerARN) => {
|
|
238
|
-
if (layerARN.includes(
|
|
239
|
+
if (layerARN.includes(constants_2.DD_LAMBDA_EXTENSION_LAYER_NAME) &&
|
|
239
240
|
newEnvVars[constants_1.API_KEY_ENV_VAR] === undefined &&
|
|
240
|
-
newEnvVars[
|
|
241
|
-
newEnvVars[
|
|
242
|
-
throw new Error(`When 'extensionLayer' is set, ${constants_1.CI_API_KEY_ENV_VAR}, ${
|
|
241
|
+
newEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] === undefined &&
|
|
242
|
+
newEnvVars[constants_2.KMS_API_KEY_ENV_VAR] === undefined) {
|
|
243
|
+
throw new Error(`When 'extensionLayer' is set, ${constants_1.CI_API_KEY_ENV_VAR}, ${constants_2.CI_KMS_API_KEY_ENV_VAR}, or ${constants_2.CI_API_KEY_SECRET_ARN_ENV_VAR} must also be set`);
|
|
243
244
|
}
|
|
244
245
|
});
|
|
245
246
|
return needsUpdate ? updateRequest : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,4DAA8D;AAE9D,
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,15 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.calculateUpdateRequest = exports.getUninstrumentedFunctionConfigsFromRegEx = exports.getUninstrumentedFunctionConfig = exports.getUninstrumentedFunctionConfigs = void 0;
|
|
13
|
-
const constants_1 = require("
|
|
13
|
+
const constants_1 = require("../../../constants");
|
|
14
|
+
const constants_2 = require("../constants");
|
|
14
15
|
const loggroup_1 = require("../loggroup");
|
|
15
16
|
const tags_1 = require("../tags");
|
|
16
17
|
const commons_1 = require("./commons");
|
|
17
18
|
const getUninstrumentedFunctionConfigs = (lambdaClient, cloudWatchLogsClient, functionARNs, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
|
-
const lambdaFunctionConfigs = yield commons_1.getLambdaFunctionConfigs(lambdaClient, functionARNs);
|
|
19
|
+
const lambdaFunctionConfigs = yield (0, commons_1.getLambdaFunctionConfigs)(lambdaClient, functionARNs);
|
|
19
20
|
const configs = [];
|
|
20
21
|
for (const config of lambdaFunctionConfigs) {
|
|
21
|
-
const functionConfig = yield exports.getUninstrumentedFunctionConfig(lambdaClient, cloudWatchLogsClient, config, forwarderARN);
|
|
22
|
+
const functionConfig = yield (0, exports.getUninstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, forwarderARN);
|
|
22
23
|
configs.push(functionConfig);
|
|
23
24
|
}
|
|
24
25
|
return configs;
|
|
@@ -27,16 +28,16 @@ exports.getUninstrumentedFunctionConfigs = getUninstrumentedFunctionConfigs;
|
|
|
27
28
|
const getUninstrumentedFunctionConfig = (lambdaClient, cloudWatchLogsClient, config, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
29
|
const functionARN = config.FunctionArn;
|
|
29
30
|
const runtime = config.Runtime;
|
|
30
|
-
if (!commons_1.isSupportedRuntime(runtime)) {
|
|
31
|
+
if (!(0, commons_1.isSupportedRuntime)(runtime)) {
|
|
31
32
|
throw Error(`Can't un-instrument ${functionARN}, runtime ${runtime} not supported`);
|
|
32
33
|
}
|
|
33
|
-
const updateRequest = exports.calculateUpdateRequest(config, runtime);
|
|
34
|
+
const updateRequest = (0, exports.calculateUpdateRequest)(config, runtime);
|
|
34
35
|
let logGroupConfiguration;
|
|
35
36
|
if (forwarderARN) {
|
|
36
37
|
const logGroupName = `/aws/lambda/${config.FunctionName}`;
|
|
37
|
-
logGroupConfiguration = yield loggroup_1.calculateLogGroupRemoveRequest(cloudWatchLogsClient, logGroupName, forwarderARN);
|
|
38
|
+
logGroupConfiguration = yield (0, loggroup_1.calculateLogGroupRemoveRequest)(cloudWatchLogsClient, logGroupName, forwarderARN);
|
|
38
39
|
}
|
|
39
|
-
const tagConfiguration = yield tags_1.calculateTagRemoveRequest(lambdaClient, functionARN);
|
|
40
|
+
const tagConfiguration = yield (0, tags_1.calculateTagRemoveRequest)(lambdaClient, functionARN);
|
|
40
41
|
return {
|
|
41
42
|
functionARN,
|
|
42
43
|
lambdaConfig: config,
|
|
@@ -47,10 +48,10 @@ const getUninstrumentedFunctionConfig = (lambdaClient, cloudWatchLogsClient, con
|
|
|
47
48
|
});
|
|
48
49
|
exports.getUninstrumentedFunctionConfig = getUninstrumentedFunctionConfig;
|
|
49
50
|
const getUninstrumentedFunctionConfigsFromRegEx = (lambdaClient, cloudWatchLogsClient, pattern, forwarderArn) => __awaiter(void 0, void 0, void 0, function* () {
|
|
50
|
-
const matchedFunctions = yield commons_1.getLambdaFunctionConfigsFromRegex(lambdaClient, pattern);
|
|
51
|
+
const matchedFunctions = yield (0, commons_1.getLambdaFunctionConfigsFromRegex)(lambdaClient, pattern);
|
|
51
52
|
const functionsToUpdate = [];
|
|
52
53
|
for (const config of matchedFunctions) {
|
|
53
|
-
const functionConfig = yield exports.getUninstrumentedFunctionConfig(lambdaClient, cloudWatchLogsClient, config, forwarderArn);
|
|
54
|
+
const functionConfig = yield (0, exports.getUninstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, forwarderArn);
|
|
54
55
|
functionsToUpdate.push(functionConfig);
|
|
55
56
|
}
|
|
56
57
|
return functionsToUpdate;
|
|
@@ -67,30 +68,30 @@ const calculateUpdateRequest = (config, runtime) => {
|
|
|
67
68
|
FunctionName: functionARN,
|
|
68
69
|
};
|
|
69
70
|
let needsUpdate = false;
|
|
70
|
-
const runtimeType =
|
|
71
|
+
const runtimeType = constants_2.RUNTIME_LOOKUP[runtime];
|
|
71
72
|
// Remove Handler for Python
|
|
72
|
-
if (runtimeType ===
|
|
73
|
-
const expectedHandler =
|
|
73
|
+
if (runtimeType === constants_2.RuntimeType.PYTHON) {
|
|
74
|
+
const expectedHandler = constants_2.PYTHON_HANDLER_LOCATION;
|
|
74
75
|
if (config.Handler === expectedHandler) {
|
|
75
76
|
needsUpdate = true;
|
|
76
|
-
updateRequest.Handler = oldEnvVars[
|
|
77
|
-
delete oldEnvVars[
|
|
77
|
+
updateRequest.Handler = oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
|
|
78
|
+
delete oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
81
|
// Remove Handler for Node
|
|
81
|
-
if (runtimeType ===
|
|
82
|
-
const expectedHandler =
|
|
82
|
+
if (runtimeType === constants_2.RuntimeType.NODE) {
|
|
83
|
+
const expectedHandler = constants_2.NODE_HANDLER_LOCATION;
|
|
83
84
|
if (config.Handler === expectedHandler) {
|
|
84
85
|
needsUpdate = true;
|
|
85
|
-
updateRequest.Handler = oldEnvVars[
|
|
86
|
-
delete oldEnvVars[
|
|
86
|
+
updateRequest.Handler = oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
|
|
87
|
+
delete oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
// Remove AWS_LAMBDA_EXEC_WRAPPER for .NET and Java
|
|
90
|
-
if (runtimeType ===
|
|
91
|
-
if (oldEnvVars[
|
|
91
|
+
if (runtimeType === constants_2.RuntimeType.DOTNET || runtimeType === constants_2.RuntimeType.JAVA) {
|
|
92
|
+
if (oldEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] === constants_2.AWS_LAMBDA_EXEC_WRAPPER) {
|
|
92
93
|
needsUpdate = true;
|
|
93
|
-
delete oldEnvVars[
|
|
94
|
+
delete oldEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR];
|
|
94
95
|
}
|
|
95
96
|
}
|
|
96
97
|
/**
|
|
@@ -99,23 +100,23 @@ const calculateUpdateRequest = (config, runtime) => {
|
|
|
99
100
|
*/
|
|
100
101
|
const environmentVarsArray = [
|
|
101
102
|
constants_1.API_KEY_ENV_VAR,
|
|
102
|
-
|
|
103
|
-
|
|
103
|
+
constants_2.API_KEY_SECRET_ARN_ENV_VAR,
|
|
104
|
+
constants_2.KMS_API_KEY_ENV_VAR,
|
|
104
105
|
constants_1.SITE_ENV_VAR,
|
|
105
|
-
|
|
106
|
-
|
|
106
|
+
constants_2.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR,
|
|
107
|
+
constants_2.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR,
|
|
107
108
|
constants_1.ENVIRONMENT_ENV_VAR,
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
109
|
+
constants_2.EXTRA_TAGS_ENV_VAR,
|
|
110
|
+
constants_2.FLUSH_TO_LOG_ENV_VAR,
|
|
111
|
+
constants_2.MERGE_XRAY_TRACES_ENV_VAR,
|
|
112
|
+
constants_2.LOG_LEVEL_ENV_VAR,
|
|
112
113
|
constants_1.SERVICE_ENV_VAR,
|
|
113
|
-
|
|
114
|
+
constants_2.TRACE_ENABLED_ENV_VAR,
|
|
114
115
|
constants_1.VERSION_ENV_VAR,
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
116
|
+
constants_2.ENABLE_PROFILING_ENV_VAR,
|
|
117
|
+
constants_2.PROFILER_ENV_VAR,
|
|
118
|
+
constants_2.PROFILER_PATH_ENV_VAR,
|
|
119
|
+
constants_2.DOTNET_TRACER_HOME_ENV_VAR,
|
|
119
120
|
];
|
|
120
121
|
// Remove Environment Variables
|
|
121
122
|
for (const environmentVar of environmentVarsArray) {
|
|
@@ -129,10 +130,10 @@ const calculateUpdateRequest = (config, runtime) => {
|
|
|
129
130
|
};
|
|
130
131
|
// Remove Layers
|
|
131
132
|
let needsLayerRemoval = false;
|
|
132
|
-
const lambdaLibraryLayerName =
|
|
133
|
-
const originalLayerARNs = commons_1.getLayers(config);
|
|
133
|
+
const lambdaLibraryLayerName = constants_2.LAYER_LOOKUP[runtime];
|
|
134
|
+
const originalLayerARNs = (0, commons_1.getLayers)(config);
|
|
134
135
|
const layerARNs = ((_b = config.Layers) !== null && _b !== void 0 ? _b : [])
|
|
135
|
-
.filter((layer) => { var _a, _b; return !((_a = layer.Arn) === null || _a === void 0 ? void 0 : _a.includes(lambdaLibraryLayerName)) && !((_b = layer.Arn) === null || _b === void 0 ? void 0 : _b.includes(
|
|
136
|
+
.filter((layer) => { var _a, _b; return !((_a = layer.Arn) === null || _a === void 0 ? void 0 : _a.includes(lambdaLibraryLayerName)) && !((_b = layer.Arn) === null || _b === void 0 ? void 0 : _b.includes(constants_2.DD_LAMBDA_EXTENSION_LAYER_NAME)); })
|
|
136
137
|
.map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; });
|
|
137
138
|
if (originalLayerARNs.sort().join(',') !== layerARNs.sort().join(',')) {
|
|
138
139
|
needsLayerRemoval = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/uninstrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { RuntimeType } from '../constants';
|
|
2
|
-
export declare const isExtensionCompatibleWithUniversalInstrumentation: (runtimeType: RuntimeType, extensionVersion?: number
|
|
3
|
-
export declare const isTracerCompatibleWithExtension: (runtimeType: RuntimeType, traceVersion?: number
|
|
2
|
+
export declare const isExtensionCompatibleWithUniversalInstrumentation: (runtimeType: RuntimeType, extensionVersion?: number) => boolean;
|
|
3
|
+
export declare const isTracerCompatibleWithExtension: (runtimeType: RuntimeType, traceVersion?: number) => boolean;
|
|
@@ -1,31 +1,33 @@
|
|
|
1
1
|
import { Command } from 'clipanion';
|
|
2
2
|
export declare class InstrumentCommand extends Command {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
private
|
|
6
|
-
private
|
|
3
|
+
static paths: string[][];
|
|
4
|
+
static usage: import("clipanion").Usage;
|
|
5
|
+
private apmFlushDeadline;
|
|
6
|
+
private captureLambdaPayload;
|
|
7
|
+
private configPath;
|
|
7
8
|
private dryRun;
|
|
8
|
-
private environment
|
|
9
|
-
private extensionVersion
|
|
10
|
-
private extraTags
|
|
11
|
-
private flushMetricsToLogs
|
|
12
|
-
private forwarder
|
|
9
|
+
private environment;
|
|
10
|
+
private extensionVersion;
|
|
11
|
+
private extraTags;
|
|
12
|
+
private flushMetricsToLogs;
|
|
13
|
+
private forwarder;
|
|
13
14
|
private functions;
|
|
14
15
|
private interactive;
|
|
15
|
-
private layerAWSAccount
|
|
16
|
-
private layerVersion
|
|
17
|
-
private logLevel
|
|
18
|
-
private mergeXrayTraces
|
|
19
|
-
private profile
|
|
20
|
-
private regExPattern
|
|
21
|
-
private region
|
|
22
|
-
private service
|
|
16
|
+
private layerAWSAccount;
|
|
17
|
+
private layerVersion;
|
|
18
|
+
private logLevel;
|
|
19
|
+
private mergeXrayTraces;
|
|
20
|
+
private profile;
|
|
21
|
+
private regExPattern;
|
|
22
|
+
private region;
|
|
23
|
+
private service;
|
|
23
24
|
private sourceCodeIntegration;
|
|
24
25
|
private uploadGitMetadata;
|
|
25
|
-
private tracing
|
|
26
|
-
private version
|
|
26
|
+
private tracing;
|
|
27
|
+
private version;
|
|
28
|
+
private config;
|
|
27
29
|
private credentials?;
|
|
28
|
-
execute(): Promise<
|
|
30
|
+
execute(): Promise<0 | 1>;
|
|
29
31
|
private getCurrentGitStatus;
|
|
30
32
|
private getGitData;
|
|
31
33
|
private uploadGitData;
|