@datadog/datadog-ci 0.17.10 → 0.18.0

package/dist/commands/lambda/functions/instrument.js

@@ -9,33 +9,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateUpdateRequest = exports.getLambdaConfigsFromRegEx = exports.getFunctionConfig = exports.getFunctionConfigs = void 0;
+exports.calculateUpdateRequest = exports.getInstrumentedFunctionConfigsFromRegEx = exports.getInstrumentedFunctionConfig = exports.getInstrumentedFunctionConfigs = void 0;
 const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
 const tags_1 = require("../tags");
 const commons_1 = require("./commons");
-const getFunctionConfigs = (lambda, cloudWatch, region, functionARNs, settings) => __awaiter(void 0, void 0, void 0, function* () {
+const getInstrumentedFunctionConfigs = (lambda, cloudWatch, region, functionARNs, settings) => __awaiter(void 0, void 0, void 0, function* () {
     const lambdaFunctionConfigs = yield commons_1.getLambdaFunctionConfigs(lambda, functionARNs);
     const configs = [];
     for (const config of lambdaFunctionConfigs) {
-        const functionConfig = yield exports.getFunctionConfig(lambda, cloudWatch, config, region, settings);
+        const functionConfig = yield exports.getInstrumentedFunctionConfig(lambda, cloudWatch, config, region, settings);
         configs.push(functionConfig);
     }
     return configs;
 });
-exports.getFunctionConfigs = getFunctionConfigs;
-const getFunctionConfig = (lambda, cloudWatch, config, region, settings) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getInstrumentedFunctionConfigs = getInstrumentedFunctionConfigs;
+const getInstrumentedFunctionConfig = (lambda, cloudWatch, config, region, settings) => __awaiter(void 0, void 0, void 0, function* () {
     const functionARN = config.FunctionArn;
     const runtime = config.Runtime;
     if (!commons_1.isSupportedRuntime(runtime)) {
         throw Error(`Can't instrument ${functionARN}, runtime ${runtime} not supported`);
     }
     yield commons_1.isLambdaActive(lambda, config, functionARN);
-    const updateRequest = exports.calculateUpdateRequest(config, settings, region, runtime);
+    const updateRequest = yield exports.calculateUpdateRequest(config, settings, region, runtime);
     let logGroupConfiguration;
     if (settings.forwarderARN !== undefined) {
-        const arn = `/aws/lambda/${config.FunctionName}`;
-        logGroupConfiguration = yield loggroup_1.calculateLogGroupUpdateRequest(cloudWatch, arn, settings.forwarderARN);
+        const logGroupName = `/aws/lambda/${config.FunctionName}`;
+        logGroupConfiguration = yield loggroup_1.calculateLogGroupUpdateRequest(cloudWatch, logGroupName, settings.forwarderARN);
     }
     const tagConfiguration = yield tags_1.calculateTagUpdateRequest(lambda, functionARN);
     return {
@@ -46,41 +46,19 @@ const getFunctionConfig = (lambda, cloudWatch, config, region, settings) => __aw
         updateRequest,
     };
 });
-exports.getFunctionConfig = getFunctionConfig;
-const getLambdaConfigsFromRegEx = (lambda, cloudWatch, region, pattern, settings) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const regEx = new RegExp(pattern);
-    const matchedFunctions = [];
-    let retryCount = 0;
-    let listFunctionsResponse;
-    let nextMarker;
-    while (true) {
-        try {
-            listFunctionsResponse = yield lambda.listFunctions({ Marker: nextMarker }).promise();
-            (_a = listFunctionsResponse.Functions) === null || _a === void 0 ? void 0 : _a.map((fn) => { var _a; return ((_a = fn.FunctionName) === null || _a === void 0 ? void 0 : _a.match(regEx)) && matchedFunctions.push(fn); });
-            nextMarker = listFunctionsResponse.NextMarker;
-            if (!nextMarker) {
-                break;
-            }
-            retryCount = 0;
-        }
-        catch (e) {
-            retryCount++;
-            if (retryCount > constants_1.LIST_FUNCTIONS_MAX_RETRY_COUNT) {
-                throw Error('Max retry count exceeded.');
-            }
-        }
-    }
+exports.getInstrumentedFunctionConfig = getInstrumentedFunctionConfig;
+const getInstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, region, pattern, settings) => __awaiter(void 0, void 0, void 0, function* () {
+    const matchedFunctions = yield commons_1.getLambdaFunctionConfigsFromRegex(lambda, pattern);
     const functionsToUpdate = [];
     for (const config of matchedFunctions) {
-        const functionConfig = yield exports.getFunctionConfig(lambda, cloudWatch, config, region, settings);
+        const functionConfig = yield exports.getInstrumentedFunctionConfig(lambda, cloudWatch, config, region, settings);
         functionsToUpdate.push(functionConfig);
     }
     return functionsToUpdate;
 });
-exports.getLambdaConfigsFromRegEx = getLambdaConfigsFromRegEx;
-const calculateUpdateRequest = (config, settings, region, runtime) => {
-    var _a, _b, _c;
+exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
+const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e;
     const oldEnvVars = Object.assign({}, (_a = config.Environment) === null || _a === void 0 ? void 0 : _a.Variables);
     const changedEnvVars = {};
     const functionARN = config.FunctionArn;
@@ -95,16 +73,41 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         FunctionName: functionARN,
     };
     let needsUpdate = false;
-    // Update Handler
-    const expectedHandler = constants_1.HANDLER_LOCATION[runtime];
-    if (config.Handler !== expectedHandler) {
-        needsUpdate = true;
-        updateRequest.Handler = constants_1.HANDLER_LOCATION[runtime];
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.JAVA ||
+        constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.CUSTOM ||
+        constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.RUBY) {
+        if (settings.layerVersion !== undefined) {
+            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.`);
+        }
+    }
+    // We don't support ARM Architecture for .NET at this time. Abort instrumentation if the combination is detected.
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.DOTNET) {
+        if ((_b = config.Architectures) === null || _b === void 0 ? void 0 : _b.includes(constants_1.ARM64_ARCHITECTURE)) {
+            throw new Error('Instrumenting arm64 architecture is not currently supported for .NET. Please only instrument .NET functions using x86_64 architecture.');
+        }
+    }
+    // Update Python Handler
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.PYTHON) {
+        const expectedHandler = constants_1.PYTHON_HANDLER_LOCATION;
+        if (config.Handler !== expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = constants_1.PYTHON_HANDLER_LOCATION;
+        }
+    }
+    // Update Node Handler
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.NODE) {
+        const expectedHandler = constants_1.NODE_HANDLER_LOCATION;
+        if (config.Handler !== expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = constants_1.NODE_HANDLER_LOCATION;
+        }
     }
     // Update Env Vars
-    if (oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR] === undefined) {
-        needsUpdate = true;
-        changedEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR] = (_b = config.Handler) !== null && _b !== void 0 ? _b : '';
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.PYTHON || constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.NODE) {
+        if (oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR] === undefined) {
+            needsUpdate = true;
+            changedEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR] = (_c = config.Handler) !== null && _c !== void 0 ? _c : '';
+        }
     }
     // KMS > Secrets Manager > API Key
     if (apiKmsKey !== undefined && oldEnvVars[constants_1.KMS_API_KEY_ENV_VAR] !== apiKmsKey) {
@@ -125,13 +128,12 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         changedEnvVars[constants_1.API_KEY_ENV_VAR] = apiKey;
     }
     if (site !== undefined && oldEnvVars[constants_1.SITE_ENV_VAR] !== site) {
-        const siteList = ['datadoghq.com', 'datadoghq.eu', 'us3.datadoghq.com', 'ddog-gov.com'];
-        if (siteList.includes(site.toLowerCase())) {
+        if (constants_1.SITES.includes(site.toLowerCase())) {
             needsUpdate = true;
             changedEnvVars[constants_1.SITE_ENV_VAR] = site;
         }
         else {
-            throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, or ddog-gov.com.');
+            throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, or ddog-gov.com.');
         }
     }
     if (site === undefined && oldEnvVars[constants_1.SITE_ENV_VAR] === undefined) {
@@ -139,20 +141,28 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         changedEnvVars[constants_1.SITE_ENV_VAR] = 'datadoghq.com';
     }
     const environmentVarsTupleArray = [
+        ['captureLambdaPayload', constants_1.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR],
         ['environment', constants_1.ENVIRONMENT_ENV_VAR],
         ['extraTags', constants_1.EXTRA_TAGS_ENV_VAR],
-        ['flushMetricsToLogs', constants_1.FLUSH_TO_LOG_ENV_VAR],
         ['mergeXrayTraces', constants_1.MERGE_XRAY_TRACES_ENV_VAR],
         ['service', constants_1.SERVICE_ENV_VAR],
         ['tracingEnabled', constants_1.TRACE_ENABLED_ENV_VAR],
         ['version', constants_1.VERSION_ENV_VAR],
     ];
     for (const [key, environmentVar] of environmentVarsTupleArray) {
-        if (settings[key] !== undefined && oldEnvVars[environmentVar] !== ((_c = settings[key]) === null || _c === void 0 ? void 0 : _c.toString())) {
+        if (settings[key] !== undefined && oldEnvVars[environmentVar] !== ((_d = settings[key]) === null || _d === void 0 ? void 0 : _d.toString())) {
             needsUpdate = true;
             changedEnvVars[environmentVar] = settings[key].toString();
         }
     }
+    // Skip adding DD_FLUSH_TO_LOGS when using Extension
+    const isUsingExtension = settings.extensionVersion !== undefined;
+    if (!isUsingExtension &&
+        settings.flushMetricsToLogs !== undefined &&
+        oldEnvVars[constants_1.FLUSH_TO_LOG_ENV_VAR] !== ((_e = settings.flushMetricsToLogs) === null || _e === void 0 ? void 0 : _e.toString())) {
+        needsUpdate = true;
+        changedEnvVars[constants_1.FLUSH_TO_LOG_ENV_VAR] = settings.flushMetricsToLogs.toString();
+    }
     const newEnvVars = Object.assign(Object.assign({}, oldEnvVars), changedEnvVars);
     if (newEnvVars[constants_1.LOG_LEVEL_ENV_VAR] !== settings.logLevel) {
         needsUpdate = true;
@@ -163,25 +173,41 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
             delete newEnvVars[constants_1.LOG_LEVEL_ENV_VAR];
         }
     }
+    if (runtime === constants_1.DOTNET_RUNTIME) {
+        needsUpdate = true;
+        newEnvVars[constants_1.ENABLE_PROFILING_ENV_VAR] = constants_1.CORECLR_ENABLE_PROFILING;
+        newEnvVars[constants_1.PROFILER_ENV_VAR] = constants_1.CORECLR_PROFILER;
+        newEnvVars[constants_1.PROFILER_PATH_ENV_VAR] = constants_1.CORECLR_PROFILER_PATH;
+        newEnvVars[constants_1.DOTNET_TRACER_HOME_ENV_VAR] = constants_1.DD_DOTNET_TRACER_HOME;
+    }
     updateRequest.Environment = {
         Variables: newEnvVars,
     };
-    // Update Layers
-    const lambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
-    const lambraLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
-    let fullLambdaLibraryLayerARN;
-    if (settings.layerVersion !== undefined) {
-        fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${settings.layerVersion}`;
+    let layerARNs = commons_1.getLayers(config);
+    const originalLayerARNs = layerARNs;
+    let needsLayerUpdate = false;
+    if (commons_1.isLayerRuntime(runtime)) {
+        const lambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
+        const lambdaLibraryLayerName = constants_1.LAYER_LOOKUP[runtime];
+        let fullLambdaLibraryLayerARN;
+        if (settings.layerVersion !== undefined || settings.interactive) {
+            let layerVersion = settings.layerVersion;
+            if (settings.interactive && !settings.layerVersion) {
+                layerVersion = yield commons_1.findLatestLayerVersion(config.Runtime, region);
+            }
+            fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${layerVersion}`;
+        }
+        layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerARN, lambdaLibraryLayerName, layerARNs);
     }
     const lambdaExtensionLayerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region, settings);
     let fullExtensionLayerARN;
-    if (settings.extensionVersion !== undefined) {
-        fullExtensionLayerARN = `${lambdaExtensionLayerArn}:${settings.extensionVersion}`;
+    if (settings.extensionVersion !== undefined || settings.interactive) {
+        let extensionVersion = settings.extensionVersion;
+        if (settings.interactive && !settings.extensionVersion) {
+            extensionVersion = yield commons_1.findLatestLayerVersion(constants_1.EXTENSION_LAYER_KEY, region);
+        }
+        fullExtensionLayerARN = `${lambdaExtensionLayerArn}:${extensionVersion}`;
     }
-    let layerARNs = commons_1.getLayers(config);
-    const originalLayerARNs = layerARNs;
-    let needsLayerUpdate = false;
-    layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerARN, lambraLibraryLayerName, layerARNs);
     layerARNs = commons_1.addLayerArn(fullExtensionLayerARN, constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME, layerARNs);
     if (originalLayerARNs.sort().join(',') !== layerARNs.sort().join(',')) {
         needsLayerUpdate = true;
@@ -199,5 +225,5 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         }
     });
     return needsUpdate ? updateRequest : undefined;
-};
+});
 exports.calculateUpdateRequest = calculateUpdateRequest;

package/dist/commands/lambda/functions/uninstrument.d.ts

@@ -1,6 +1,7 @@
 import { CloudWatchLogs, Lambda } from 'aws-sdk';
 import { Runtime } from '../constants';
 import { FunctionConfiguration } from '../interfaces';
-export declare const getFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, functionARNs: string[], forwarderARN: string | undefined) => Promise<FunctionConfiguration[]>;
-export declare const getFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, forwarderARN: string | undefined) => Promise<FunctionConfiguration>;
+export declare const getUninstrumentedFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, functionARNs: string[], forwarderARN: string | undefined) => Promise<FunctionConfiguration[]>;
+export declare const getUninstrumentedFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, forwarderARN: string | undefined) => Promise<FunctionConfiguration>;
+export declare const getUninstrumentedFunctionConfigsFromRegEx: (lambda: Lambda, cloudWatch: CloudWatchLogs, pattern: string, forwarderArn: string | undefined) => Promise<FunctionConfiguration[]>;
 export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, runtime: Runtime) => Lambda.UpdateFunctionConfigurationRequest | undefined;

package/dist/commands/lambda/functions/uninstrument.js

@@ -9,22 +9,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateUpdateRequest = exports.getFunctionConfig = exports.getFunctionConfigs = void 0;
+exports.calculateUpdateRequest = exports.getUninstrumentedFunctionConfigsFromRegEx = exports.getUninstrumentedFunctionConfig = exports.getUninstrumentedFunctionConfigs = void 0;
 const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
 const tags_1 = require("../tags");
 const commons_1 = require("./commons");
-const getFunctionConfigs = (lambda, cloudWatch, functionARNs, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
+const getUninstrumentedFunctionConfigs = (lambda, cloudWatch, functionARNs, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
     const lambdaFunctionConfigs = yield commons_1.getLambdaFunctionConfigs(lambda, functionARNs);
     const configs = [];
     for (const config of lambdaFunctionConfigs) {
-        const functionConfig = yield exports.getFunctionConfig(lambda, cloudWatch, config, forwarderARN);
+        const functionConfig = yield exports.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, forwarderARN);
         configs.push(functionConfig);
     }
     return configs;
 });
-exports.getFunctionConfigs = getFunctionConfigs;
-const getFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getUninstrumentedFunctionConfigs = getUninstrumentedFunctionConfigs;
+const getUninstrumentedFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
     const functionARN = config.FunctionArn;
     const runtime = config.Runtime;
     if (!commons_1.isSupportedRuntime(runtime)) {
@@ -33,8 +33,8 @@ const getFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaite
     const updateRequest = exports.calculateUpdateRequest(config, runtime);
     let logGroupConfiguration;
     if (forwarderARN) {
-        const arn = `/aws/lambda/${config.FunctionName}`;
-        logGroupConfiguration = yield loggroup_1.calculateLogGroupRemoveRequest(cloudWatch, arn, forwarderARN);
+        const logGroupName = `/aws/lambda/${config.FunctionName}`;
+        logGroupConfiguration = yield loggroup_1.calculateLogGroupRemoveRequest(cloudWatch, logGroupName, forwarderARN);
     }
     const tagConfiguration = yield tags_1.calculateTagRemoveRequest(lambda, functionARN);
     return {
@@ -45,7 +45,17 @@ const getFunctionConfig = (lambda, cloudWatch, config, forwarderARN) => __awaite
         updateRequest,
     };
 });
-exports.getFunctionConfig = getFunctionConfig;
+exports.getUninstrumentedFunctionConfig = getUninstrumentedFunctionConfig;
+const getUninstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, pattern, forwarderArn) => __awaiter(void 0, void 0, void 0, function* () {
+    const matchedFunctions = yield commons_1.getLambdaFunctionConfigsFromRegex(lambda, pattern);
+    const functionsToUpdate = [];
+    for (const config of matchedFunctions) {
+        const functionConfig = yield exports.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, forwarderArn);
+        functionsToUpdate.push(functionConfig);
+    }
+    return functionsToUpdate;
+});
+exports.getUninstrumentedFunctionConfigsFromRegEx = getUninstrumentedFunctionConfigsFromRegEx;
 const calculateUpdateRequest = (config, runtime) => {
     var _a, _b;
     const oldEnvVars = Object.assign({}, (_a = config.Environment) === null || _a === void 0 ? void 0 : _a.Variables);
@@ -57,12 +67,23 @@ const calculateUpdateRequest = (config, runtime) => {
         FunctionName: functionARN,
     };
     let needsUpdate = false;
-    // Remove Handler
-    const expectedHandler = constants_1.HANDLER_LOCATION[runtime];
-    if (config.Handler === expectedHandler) {
-        needsUpdate = true;
-        updateRequest.Handler = oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR];
-        delete oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR];
+    // Remove Handler for Python
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.PYTHON) {
+        const expectedHandler = constants_1.PYTHON_HANDLER_LOCATION;
+        if (config.Handler === expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR];
+            delete oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR];
+        }
+    }
+    // Remove Handler for Node
+    if (constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RuntimeType.NODE) {
+        const expectedHandler = constants_1.NODE_HANDLER_LOCATION;
+        if (config.Handler === expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR];
+            delete oldEnvVars[constants_1.LAMBDA_HANDLER_ENV_VAR];
+        }
     }
     /**
      * Array used to remove environment vars used in
@@ -73,6 +94,7 @@ const calculateUpdateRequest = (config, runtime) => {
         constants_1.API_KEY_SECRET_ARN_ENV_VAR,
         constants_1.KMS_API_KEY_ENV_VAR,
         constants_1.SITE_ENV_VAR,
+        constants_1.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR,
         constants_1.ENVIRONMENT_ENV_VAR,
         constants_1.EXTRA_TAGS_ENV_VAR,
         constants_1.FLUSH_TO_LOG_ENV_VAR,
@@ -81,6 +103,10 @@ const calculateUpdateRequest = (config, runtime) => {
         constants_1.SERVICE_ENV_VAR,
         constants_1.TRACE_ENABLED_ENV_VAR,
         constants_1.VERSION_ENV_VAR,
+        constants_1.ENABLE_PROFILING_ENV_VAR,
+        constants_1.PROFILER_ENV_VAR,
+        constants_1.PROFILER_PATH_ENV_VAR,
+        constants_1.DOTNET_TRACER_HOME_ENV_VAR,
     ];
     // Remove Environment Variables
     for (const environmentVar of environmentVarsArray) {
@@ -94,7 +120,7 @@ const calculateUpdateRequest = (config, runtime) => {
     };
     // Remove Layers
     let needsLayerRemoval = false;
-    const lambdaLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+    const lambdaLibraryLayerName = constants_1.LAYER_LOOKUP[runtime];
     const originalLayerARNs = commons_1.getLayers(config);
     const layerARNs = ((_b = config.Layers) !== null && _b !== void 0 ? _b : [])
         .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_1.DD_LAMBDA_EXTENSION_LAYER_NAME)); })

package/dist/commands/lambda/instrument.d.ts

@@ -1,5 +1,6 @@
 import { Command } from 'clipanion';
 export declare class InstrumentCommand extends Command {
+    private captureLambdaPayload?;
     private config;
     private configPath?;
     private dryRun;
@@ -9,6 +10,7 @@ export declare class InstrumentCommand extends Command {
     private flushMetricsToLogs?;
     private forwarder?;
     private functions;
+    private interactive;
     private layerAWSAccount?;
     private layerVersion?;
     private logLevel?;
@@ -20,7 +22,6 @@ export declare class InstrumentCommand extends Command {
     private tracing?;
     private version?;
     execute(): Promise<1 | 0>;
-    private convertStringBooleanToBoolean;
     private getCurrentGitStatus;
     private getGitDataAndUpload;
     private getSettings;