@datadog/datadog-ci 0.17.12 → 0.18.1

package/dist/commands/lambda/constants.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.SITES = exports.HANDLER_LOCATION = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_RUNTIMES = exports.RUNTIME_LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
+exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.AWS_REGIONS = exports.SITES = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.DOTNET_RUNTIME = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
+exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = void 0;
 exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
 exports.EXTENSION_LAYER_KEY = 'extension';
-exports.RUNTIME_LAYER_LOOKUP = {
+exports.DOTNET_RUNTIME = 'dotnetcore3.1';
+exports.LAYER_LOOKUP = {
     [exports.EXTENSION_LAYER_KEY]: exports.DD_LAMBDA_EXTENSION_LAYER_NAME,
+    'dotnetcore3.1': 'dd-trace-dotnet',
     'nodejs12.x': 'Datadog-Node12-x',
     'nodejs14.x': 'Datadog-Node14-x',
     'python3.6': 'Datadog-Python36',
@@ -12,43 +15,75 @@ exports.RUNTIME_LAYER_LOOKUP = {
     'python3.8': 'Datadog-Python38',
     'python3.9': 'Datadog-Python39',
 };
-exports.ARM_RUNTIMES = [exports.EXTENSION_LAYER_KEY, 'python3.8', 'python3.9'];
-exports.ARM64_ARCHITECTURE = 'arm64';
-exports.ARM_LAYER_SUFFIX = '-ARM';
 var RuntimeType;
 (function (RuntimeType) {
-    RuntimeType[RuntimeType["NODE"] = 0] = "NODE";
-    RuntimeType[RuntimeType["PYTHON"] = 1] = "PYTHON";
+    RuntimeType[RuntimeType["DOTNET"] = 0] = "DOTNET";
+    RuntimeType[RuntimeType["CUSTOM"] = 1] = "CUSTOM";
+    RuntimeType[RuntimeType["JAVA"] = 2] = "JAVA";
+    RuntimeType[RuntimeType["NODE"] = 3] = "NODE";
+    RuntimeType[RuntimeType["PYTHON"] = 4] = "PYTHON";
+    RuntimeType[RuntimeType["RUBY"] = 5] = "RUBY";
 })(RuntimeType = exports.RuntimeType || (exports.RuntimeType = {}));
 exports.RUNTIME_LOOKUP = {
+    'dotnetcore3.1': RuntimeType.DOTNET,
+    java11: RuntimeType.JAVA,
+    'java8.al2': RuntimeType.JAVA,
     'nodejs12.x': RuntimeType.NODE,
     'nodejs14.x': RuntimeType.NODE,
+    'provided.al2': RuntimeType.CUSTOM,
     'python3.6': RuntimeType.PYTHON,
     'python3.7': RuntimeType.PYTHON,
     'python3.8': RuntimeType.PYTHON,
     'python3.9': RuntimeType.PYTHON,
+    'ruby2.5': RuntimeType.RUBY,
+    'ruby2.7': RuntimeType.RUBY,
 };
-const PYTHON_HANDLER_LOCATION = 'datadog_lambda.handler.handler';
-const NODE_HANDLER_LOCATION = '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler';
-exports.HANDLER_LOCATION = {
-    'nodejs12.x': NODE_HANDLER_LOCATION,
-    'nodejs14.x': NODE_HANDLER_LOCATION,
-    'python3.6': PYTHON_HANDLER_LOCATION,
-    'python3.7': PYTHON_HANDLER_LOCATION,
-    'python3.8': PYTHON_HANDLER_LOCATION,
-    'python3.9': PYTHON_HANDLER_LOCATION,
-};
+exports.ARM_LAYERS = [exports.EXTENSION_LAYER_KEY, 'python3.8', 'python3.9'];
+exports.ARM64_ARCHITECTURE = 'arm64';
+exports.ARM_LAYER_SUFFIX = '-ARM';
+exports.PYTHON_HANDLER_LOCATION = 'datadog_lambda.handler.handler';
+exports.NODE_HANDLER_LOCATION = '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler';
 exports.SITES = [
     'datadoghq.com',
     'datadoghq.eu',
     'us3.datadoghq.com',
     'us5.datadoghq.com',
-    'ddog-gov.,com',
+    'ddog-gov.com',
+];
+exports.AWS_REGIONS = [
+    'us-east-1',
+    'us-east-2',
+    'us-west-1',
+    'us-west-2',
+    'af-south-1',
+    'ap-east-1',
+    'ap-south-1',
+    'ap-northeast-3',
+    'ap-northeast-2',
+    'ap-southeast-1',
+    'ap-southeast-2',
+    'ap-northeast-1',
+    'ca-central-1',
+    'eu-central-1',
+    'eu-west-1',
+    'eu-west-2',
+    'eu-south-1',
+    'eu-west-3',
+    'eu-north-1',
+    'me-south-1',
+    'sa-east-1',
+    'us-gov-east-1',
+    'us-gov-west-1',
 ];
 exports.DEFAULT_LAYER_AWS_ACCOUNT = '464622532012';
 exports.GOVCLOUD_LAYER_AWS_ACCOUNT = '002406178527';
 exports.SUBSCRIPTION_FILTER_NAME = 'datadog-ci-filter';
 exports.TAG_VERSION_NAME = 'dd_sls_ci';
+// Export const values for .NET tracer
+exports.CORECLR_ENABLE_PROFILING = '1';
+exports.CORECLR_PROFILER = '{846F5F1C-F9AE-4B07-969E-05C26BC060D8}';
+exports.CORECLR_PROFILER_PATH = '/opt/datadog/Datadog.Trace.ClrProfiler.Native.so';
+exports.DD_DOTNET_TRACER_HOME = '/opt/datadog';
 // Environment variables used in the Lambda environment
 exports.API_KEY_ENV_VAR = 'DD_API_KEY';
 exports.API_KEY_SECRET_ARN_ENV_VAR = 'DD_API_KEY_SECRET_ARN';
@@ -63,11 +98,20 @@ exports.SERVICE_ENV_VAR = 'DD_SERVICE';
 exports.VERSION_ENV_VAR = 'DD_VERSION';
 exports.ENVIRONMENT_ENV_VAR = 'DD_ENV';
 exports.EXTRA_TAGS_ENV_VAR = 'DD_TAGS';
+exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = 'DD_CAPTURE_LAMBDA_PAYLOAD';
+exports.ENABLE_PROFILING_ENV_VAR = 'CORECLR_ENABLE_PROFILING';
+exports.PROFILER_ENV_VAR = 'CORECLR_PROFILER';
+exports.PROFILER_PATH_ENV_VAR = 'CORECLR_PROFILER_PATH';
+exports.DOTNET_TRACER_HOME_ENV_VAR = 'DD_DOTNET_TRACER_HOME';
 // Environment variables used by Datadog CI
 exports.CI_SITE_ENV_VAR = 'DATADOG_SITE';
 exports.CI_API_KEY_ENV_VAR = 'DATADOG_API_KEY';
 exports.CI_API_KEY_SECRET_ARN_ENV_VAR = 'DATADOG_API_KEY_SECRET_ARN';
 exports.CI_KMS_API_KEY_ENV_VAR = 'DATADOG_KMS_API_KEY';
+exports.AWS_ACCESS_KEY_ID_ENV_VAR = 'AWS_ACCESS_KEY_ID';
+exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = 'AWS_SECRET_ACCESS_KEY';
+exports.AWS_DEFAULT_REGION_ENV_VAR = 'AWS_DEFAULT_REGION';
+exports.AWS_SESSION_TOKEN_ENV_VAR = 'AWS_SESSION_TOKEN';
 exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = 2;
 exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
 // DD_TAGS Regular Expression
@@ -75,3 +119,7 @@ exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
 // matches a list of <key>:<value> separated by commas
 // such as: layer:api,team:intake
 exports.EXTRA_TAGS_REG_EXP = /^(([a-zA-Z]+)\w+:[\w\-/\.]+)+((\,)([a-zA-Z]+)\w+:[\w\-/\.]+)*$/g;
+exports.AWS_ACCESS_KEY_ID_REG_EXP = /(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])/g;
+exports.AWS_SECRET_ACCESS_KEY_REG_EXP = /(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])/g;
+exports.DATADOG_API_KEY_REG_EXP = /(?<![a-f0-9])[a-f0-9]{32}(?![a-f0-9])/g;
+exports.DATADOG_APP_KEY_REG_EXP = /(?<![a-f0-9])[a-f0-9]{40}(?![a-f0-9])/g;

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

@@ -1,5 +1,5 @@
 import { CloudWatchLogs, Lambda } from 'aws-sdk';
-import { Runtime } from '../constants';
+import { LayerKey } from '../constants';
 import { FunctionConfiguration, InstrumentationSettings } from '../interfaces';
 /**
  * Returns an array of merged layer ARNs if given a Full Layer ARN,
@@ -32,6 +32,20 @@ export declare const coerceBoolean: (fallback: boolean, ...values: any[]) => boo
 export declare const collectFunctionsByRegion: (functions: string[], defaultRegion: string | undefined) => {
     [key: string]: string[];
 };
+/**
+ * Given a layer runtime, return its latest version.
+ *
+ * @param runtime the runtime of the layer.
+ * @param region the region where the layer is stored.
+ * @returns the latest version of the layer to find.
+ */
+export declare const findLatestLayerVersion: (layer: LayerKey, region: string) => Promise<number>;
+export declare const isMissingAWSCredentials: () => boolean;
+export declare const isMissingDatadogSiteEnvVar: () => boolean;
+export declare const isMissingAnyDatadogApiKeyEnvVar: () => boolean;
+export declare const isMissingDatadogEnvVars: () => boolean;
+export declare const getAllLambdaFunctionConfigs: (lambda: Lambda) => Promise<Lambda.FunctionConfiguration[]>;
+export declare const checkRuntimeTypesAreUniform: (configList: FunctionConfiguration[]) => boolean;
 /**
  * Given a Lambda instance and a regular expression,
  * returns all the Function Configurations that match.
@@ -60,7 +74,8 @@ export declare const getLambdaFunctionConfigs: (lambda: Lambda, functionARNs: st
  * @param settings instrumentation settings, mainly used to change the AWS account that contains the Layer.
  * @returns the ARN of a **Specific Runtime Layer** with the correct region, account, architecture, and name.
  */
-export declare const getLayerArn: (config: Lambda.FunctionConfiguration, runtime: Runtime, region: string, settings?: InstrumentationSettings | undefined) => string;
+export declare const getLayerArn: (config: Lambda.FunctionConfiguration, layer: LayerKey, region: string, settings?: InstrumentationSettings | undefined) => string;
+export declare const getLayerNameWithVersion: (layerArn: string) => string | undefined;
 export declare const getLayers: (config: Lambda.FunctionConfiguration) => string[];
 /**
  * Call the aws-sdk Lambda api to get a Function given
@@ -96,6 +111,8 @@ export declare const isLambdaActive: (lambda: Lambda, config: Lambda.FunctionCon
  * @param runtime a string representing a Lambda FunctionConfiguration Runtime.
  * @returns if a runtime is supported.
  */
-export declare const isSupportedRuntime: (runtime?: string | undefined) => runtime is Runtime;
+export declare const isSupportedRuntime: (runtime?: string | undefined) => runtime is "nodejs12.x" | "nodejs14.x" | "java8.al2" | "java11" | "python3.6" | "python3.7" | "python3.8" | "python3.9" | "dotnetcore3.1" | "ruby2.5" | "ruby2.7" | "provided.al2";
+export declare const isLayerRuntime: (runtime: string) => runtime is "nodejs12.x" | "nodejs14.x" | "python3.6" | "python3.7" | "python3.8" | "python3.9" | "dotnetcore3.1" | "extension";
 export declare const sentenceMatchesRegEx: (sentence: string, regex: RegExp) => RegExpMatchArray | null;
 export declare const updateLambdaFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, configs: FunctionConfiguration[]) => Promise<void>;
+export declare const willUpdateFunctionConfigs: (configs: FunctionConfiguration[]) => boolean;

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

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLambdaFunctionConfigs = exports.sentenceMatchesRegEx = exports.isSupportedRuntime = exports.isLambdaActive = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
+exports.willUpdateFunctionConfigs = exports.updateLambdaFunctionConfigs = exports.sentenceMatchesRegEx = exports.isLayerRuntime = exports.isSupportedRuntime = exports.isLambdaActive = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.checkRuntimeTypesAreUniform = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.isMissingDatadogSiteEnvVar = exports.isMissingAWSCredentials = exports.findLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
+const aws_sdk_1 = require("aws-sdk");
 const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
 const tags_1 = require("../tags");
@@ -91,6 +92,92 @@ const collectFunctionsByRegion = (functions, defaultRegion) => {
     return groups;
 };
 exports.collectFunctionsByRegion = collectFunctionsByRegion;
+/**
+ * Given a layer runtime, return its latest version.
+ *
+ * @param runtime the runtime of the layer.
+ * @param region the region where the layer is stored.
+ * @returns the latest version of the layer to find.
+ */
+const findLatestLayerVersion = (layer, region) => __awaiter(void 0, void 0, void 0, function* () {
+    let latestVersion = 0;
+    let searchStep = latestVersion > 0 ? 1 : 100;
+    let layerVersion = latestVersion + searchStep;
+    const account = region.startsWith('us-gov') ? constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT : constants_1.DEFAULT_LAYER_AWS_ACCOUNT;
+    const layerName = constants_1.LAYER_LOOKUP[layer];
+    let foundLatestVersion = false;
+    const lambda = new aws_sdk_1.Lambda({ region });
+    while (!foundLatestVersion) {
+        try {
+            // Search next version
+            yield lambda
+                .getLayerVersion({
+                LayerName: `arn:aws:lambda:${region}:${account}:layer:${layerName}`,
+                VersionNumber: layerVersion,
+            })
+                .promise();
+            latestVersion = layerVersion;
+            // Increase layer version
+            layerVersion += searchStep;
+        }
+        catch (e) {
+            // Search step is too big, reset target to previous version
+            // with a smaller search step
+            if (searchStep > 1) {
+                layerVersion -= searchStep;
+                searchStep /= 10;
+                layerVersion += searchStep;
+            }
+            else {
+                // Search step is 1, current version was not found.
+                // It is likely that the last checked is the latest.
+                // Check the next version to be certain, since
+                // current version could've been deleted by accident.
+                try {
+                    layerVersion += searchStep;
+                    yield lambda
+                        .getLayerVersion({
+                        LayerName: `arn:aws:lambda:${region}:${account}:layer:${layerName}`,
+                        VersionNumber: layerVersion,
+                    })
+                        .promise();
+                    latestVersion = layerVersion;
+                    // Continue the search if the next version does exist (unlikely event)
+                    layerVersion += searchStep;
+                }
+                catch (e) {
+                    // The next version doesn't exist either, so the previous version is indeed the latest
+                    foundLatestVersion = true;
+                }
+            }
+        }
+    }
+    return latestVersion;
+});
+exports.findLatestLayerVersion = findLatestLayerVersion;
+const isMissingAWSCredentials = () => process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] === undefined || process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] === undefined;
+exports.isMissingAWSCredentials = isMissingAWSCredentials;
+const isMissingDatadogSiteEnvVar = () => {
+    const site = process.env[constants_1.CI_SITE_ENV_VAR];
+    if (site !== undefined) {
+        return !constants_1.SITES.includes(site);
+    }
+    return true;
+};
+exports.isMissingDatadogSiteEnvVar = isMissingDatadogSiteEnvVar;
+const isMissingAnyDatadogApiKeyEnvVar = () => !(process.env[constants_1.CI_API_KEY_ENV_VAR] ||
+    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] ||
+    process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR]);
+exports.isMissingAnyDatadogApiKeyEnvVar = isMissingAnyDatadogApiKeyEnvVar;
+const isMissingDatadogEnvVars = () => exports.isMissingDatadogSiteEnvVar() || exports.isMissingAnyDatadogApiKeyEnvVar();
+exports.isMissingDatadogEnvVars = isMissingDatadogEnvVars;
+const getAllLambdaFunctionConfigs = (lambda) => __awaiter(void 0, void 0, void 0, function* () { return exports.getLambdaFunctionConfigsFromRegex(lambda, '.'); });
+exports.getAllLambdaFunctionConfigs = getAllLambdaFunctionConfigs;
+// Returns false if not all runtimes are of the same RuntimeType across multiple functions
+const checkRuntimeTypesAreUniform = (configList) => configList
+    .map((item) => item.lambdaConfig.Runtime)
+    .every((runtime) => constants_1.RUNTIME_LOOKUP[runtime] === constants_1.RUNTIME_LOOKUP[configList[0].lambdaConfig.Runtime]);
+exports.checkRuntimeTypesAreUniform = checkRuntimeTypesAreUniform;
 /**
  * Given a Lambda instance and a regular expression,
  * returns all the Function Configurations that match.
@@ -149,10 +236,10 @@ exports.getLambdaFunctionConfigs = getLambdaFunctionConfigs;
  * @param settings instrumentation settings, mainly used to change the AWS account that contains the Layer.
  * @returns the ARN of a **Specific Runtime Layer** with the correct region, account, architecture, and name.
  */
-const getLayerArn = (config, runtime, region, settings) => {
+const getLayerArn = (config, layer, region, settings) => {
     var _a, _b;
-    let layerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
-    if (constants_1.ARM_RUNTIMES.includes(runtime) && ((_a = config.Architectures) === null || _a === void 0 ? void 0 : _a.includes(constants_1.ARM64_ARCHITECTURE))) {
+    let layerName = constants_1.LAYER_LOOKUP[layer];
+    if (constants_1.ARM_LAYERS.includes(layer) && ((_a = config.Architectures) === null || _a === void 0 ? void 0 : _a.includes(constants_1.ARM64_ARCHITECTURE))) {
         layerName += constants_1.ARM_LAYER_SUFFIX;
     }
     const account = (_b = settings === null || settings === void 0 ? void 0 : settings.layerAWSAccount) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_LAYER_AWS_ACCOUNT;
@@ -163,7 +250,12 @@ const getLayerArn = (config, runtime, region, settings) => {
     return `arn:aws:lambda:${region}:${account}:layer:${layerName}`;
 };
 exports.getLayerArn = getLayerArn;
-const getLayers = (config) => { var _a; return ((_a = config.Layers) !== null && _a !== void 0 ? _a : []).map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; }); };
+const getLayerNameWithVersion = (layerArn) => {
+    const [, , , , , , name, version] = layerArn.split(':');
+    return name && version ? `${name}:${version}` : undefined;
+};
+exports.getLayerNameWithVersion = getLayerNameWithVersion;
+const getLayers = (config) => { var _a; return ((_a = config.Layers) !== null && _a !== void 0 ? _a : []).map((layer) => layer.Arn); };
 exports.getLayers = getLayers;
 /**
  * Call the aws-sdk Lambda api to get a Function given
@@ -228,11 +320,10 @@ exports.isLambdaActive = isLambdaActive;
  * @param runtime a string representing a Lambda FunctionConfiguration Runtime.
  * @returns if a runtime is supported.
  */
-const isSupportedRuntime = (runtime) => {
-    const lookup = constants_1.RUNTIME_LAYER_LOOKUP;
-    return runtime !== undefined && lookup[runtime] !== undefined;
-};
+const isSupportedRuntime = (runtime) => runtime !== undefined && constants_1.RUNTIME_LOOKUP[runtime] !== undefined;
 exports.isSupportedRuntime = isSupportedRuntime;
+const isLayerRuntime = (runtime) => constants_1.LAYER_LOOKUP[runtime] !== undefined;
+exports.isLayerRuntime = isLayerRuntime;
 const sentenceMatchesRegEx = (sentence, regex) => sentence.match(regex);
 exports.sentenceMatchesRegEx = sentenceMatchesRegEx;
 const updateLambdaFunctionConfigs = (lambda, cloudWatch, configs) => __awaiter(void 0, void 0, void 0, function* () {
@@ -250,6 +341,22 @@ const updateLambdaFunctionConfigs = (lambda, cloudWatch, configs) => __awaiter(v
     yield Promise.all(results);
 });
 exports.updateLambdaFunctionConfigs = updateLambdaFunctionConfigs;
+const willUpdateFunctionConfigs = (configs) => {
+    var _a, _b, _c;
+    let willUpdate = false;
+    for (const config of configs) {
+        if (config.updateRequest !== undefined ||
+            ((_a = config.logGroupConfiguration) === null || _a === void 0 ? void 0 : _a.createLogGroupRequest) !== undefined ||
+            ((_b = config.logGroupConfiguration) === null || _b === void 0 ? void 0 : _b.deleteSubscriptionFilterRequest) !== undefined ||
+            ((_c = config.logGroupConfiguration) === null || _c === void 0 ? void 0 : _c.subscriptionFilterRequest) !== undefined ||
+            (config === null || config === void 0 ? void 0 : config.tagConfiguration) !== undefined) {
+            willUpdate = true;
+            break;
+        }
+    }
+    return willUpdate;
+};
+exports.willUpdateFunctionConfigs = willUpdateFunctionConfigs;
 /**
  * Waits for n ms
  *

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

@@ -4,4 +4,4 @@ import { FunctionConfiguration, InstrumentationSettings } from '../interfaces';
 export declare const getInstrumentedFunctionConfigs: (lambda: Lambda, cloudWatch: CloudWatchLogs, region: string, functionARNs: string[], settings: InstrumentationSettings) => Promise<FunctionConfiguration[]>;
 export declare const getInstrumentedFunctionConfig: (lambda: Lambda, cloudWatch: CloudWatchLogs, config: Lambda.FunctionConfiguration, region: string, settings: InstrumentationSettings) => Promise<FunctionConfiguration>;
 export declare const getInstrumentedFunctionConfigsFromRegEx: (lambda: Lambda, cloudWatch: CloudWatchLogs, region: string, pattern: string, settings: InstrumentationSettings) => Promise<FunctionConfiguration[]>;
-export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, settings: InstrumentationSettings, region: string, runtime: Runtime) => Lambda.UpdateFunctionConfigurationRequest | undefined;
+export declare const calculateUpdateRequest: (config: Lambda.FunctionConfiguration, settings: InstrumentationSettings, region: string, runtime: Runtime) => Promise<Lambda.UpdateFunctionConfigurationRequest | undefined>;

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

@@ -31,7 +31,7 @@ const getInstrumentedFunctionConfig = (lambda, cloudWatch, config, region, setti
         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 logGroupName = `/aws/lambda/${config.FunctionName}`;
@@ -57,8 +57,8 @@ const getInstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, region, pat
     return functionsToUpdate;
 });
 exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
-const calculateUpdateRequest = (config, settings, region, runtime) => {
-    var _a, _b, _c, _d;
+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;
@@ -73,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) {
@@ -116,6 +141,7 @@ 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],
         ['mergeXrayTraces', constants_1.MERGE_XRAY_TRACES_ENV_VAR],
@@ -124,15 +150,16 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         ['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] !== ((_d = settings.flushMetricsToLogs) === null || _d === void 0 ? void 0 : _d.toString())) {
+        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();
     }
@@ -146,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;
@@ -182,5 +225,5 @@ const calculateUpdateRequest = (config, settings, region, runtime) => {
         }
     });
     return needsUpdate ? updateRequest : undefined;
-};
+});
 exports.calculateUpdateRequest = calculateUpdateRequest;

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

@@ -67,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
@@ -83,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,
@@ -91,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) {
@@ -104,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?;