@datadog/datadog-ci-plugin-lambda 3.21.0 → 3.21.2

package/dist/functions/instrument.js

@@ -0,0 +1,271 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateUpdateRequest = exports.getInstrumentedFunctionConfigsFromRegEx = exports.getInstrumentedFunctionConfig = exports.getInstrumentedFunctionConfigs = void 0;
+const constants_1 = require("@datadog/datadog-ci-base/constants");
+const validation_1 = require("@datadog/datadog-ci-base/helpers/validation");
+const constants_2 = require("../constants");
+const loggroup_1 = require("../loggroup");
+const tags_1 = require("../tags");
+const commons_1 = require("./commons");
+const versionChecker_1 = require("./versionChecker");
+const getInstrumentedFunctionConfigs = (lambdaClient, cloudWatchLogsClient, region, functionARNs, settings) => __awaiter(void 0, void 0, void 0, function* () {
+    const lambdaFunctionConfigs = yield (0, commons_1.getLambdaFunctionConfigs)(lambdaClient, functionARNs);
+    const configs = [];
+    for (const config of lambdaFunctionConfigs) {
+        const functionConfig = yield (0, exports.getInstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, region, settings);
+        configs.push(functionConfig);
+    }
+    return configs;
+});
+exports.getInstrumentedFunctionConfigs = getInstrumentedFunctionConfigs;
+const getInstrumentedFunctionConfig = (lambdaClient, cloudWatchLogsClient, config, region, settings) => __awaiter(void 0, void 0, void 0, function* () {
+    const functionARN = config.FunctionArn;
+    const runtime = config.Runtime;
+    if (!(0, commons_1.isSupportedRuntime)(runtime)) {
+        throw Error(`Can't instrument ${functionARN}, runtime ${runtime} not supported`);
+    }
+    const updateRequest = yield (0, exports.calculateUpdateRequest)(config, settings, region, runtime);
+    let logGroupConfiguration;
+    if (settings.forwarderARN !== undefined) {
+        const logGroupName = `/aws/lambda/${config.FunctionName}`;
+        logGroupConfiguration = yield (0, loggroup_1.calculateLogGroupUpdateRequest)(cloudWatchLogsClient, logGroupName, settings.forwarderARN);
+    }
+    const tagConfiguration = yield (0, tags_1.calculateTagUpdateRequest)(lambdaClient, functionARN);
+    return {
+        functionARN,
+        lambdaConfig: config,
+        logGroupConfiguration,
+        tagConfiguration,
+        updateFunctionConfigurationCommandInput: updateRequest,
+    };
+});
+exports.getInstrumentedFunctionConfig = getInstrumentedFunctionConfig;
+const getInstrumentedFunctionConfigsFromRegEx = (lambdaClient, cloudWatchLogsClient, region, pattern, settings) => __awaiter(void 0, void 0, void 0, function* () {
+    const matchedFunctions = yield (0, commons_1.getLambdaFunctionConfigsFromRegex)(lambdaClient, pattern);
+    const functionsToUpdate = [];
+    for (const config of matchedFunctions) {
+        const functionConfig = yield (0, exports.getInstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, region, settings);
+        functionsToUpdate.push(functionConfig);
+    }
+    return functionsToUpdate;
+});
+exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
+const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f;
+    const oldEnvVars = Object.assign({}, (_a = config.Environment) === null || _a === void 0 ? void 0 : _a.Variables);
+    const changedEnvVars = {};
+    const functionARN = config.FunctionArn;
+    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];
+    const apiKeySecretArn = process.env[constants_2.CI_API_KEY_SECRET_ARN_ENV_VAR];
+    const apiKmsKey = process.env[constants_2.CI_KMS_API_KEY_ENV_VAR];
+    const site = process.env[constants_1.CI_SITE_ENV_VAR];
+    if (functionARN === undefined) {
+        return undefined;
+    }
+    const updateRequest = {
+        FunctionName: functionARN,
+    };
+    let needsUpdate = false;
+    const runtimeType = constants_2.RUNTIME_LOOKUP[runtime];
+    if (runtimeType === constants_2.RuntimeType.CUSTOM) {
+        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.`);
+        }
+    }
+    // Update Python Handler
+    if (runtimeType === constants_2.RuntimeType.PYTHON && (settings.layerVersion !== undefined || settings.interactive)) {
+        const expectedHandler = constants_2.PYTHON_HANDLER_LOCATION;
+        if (config.Handler !== expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = constants_2.PYTHON_HANDLER_LOCATION;
+        }
+    }
+    // Update Node Handler
+    if (runtimeType === constants_2.RuntimeType.NODE && (settings.layerVersion !== undefined || settings.interactive)) {
+        const expectedHandler = constants_2.NODE_HANDLER_LOCATION;
+        if (config.Handler !== expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = constants_2.NODE_HANDLER_LOCATION;
+        }
+    }
+    // Update Env Vars
+    if (runtimeType === constants_2.RuntimeType.PYTHON || runtimeType === constants_2.RuntimeType.NODE) {
+        if (oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR] === undefined) {
+            needsUpdate = true;
+            changedEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR] = (_c = config.Handler) !== null && _c !== void 0 ? _c : '';
+        }
+    }
+    // KMS > Secrets Manager > API Key
+    if (apiKmsKey !== undefined && oldEnvVars[constants_2.KMS_API_KEY_ENV_VAR] !== apiKmsKey) {
+        needsUpdate = true;
+        changedEnvVars[constants_2.KMS_API_KEY_ENV_VAR] = apiKmsKey;
+    }
+    else if (apiKeySecretArn !== undefined && oldEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] !== apiKeySecretArn) {
+        const isNode = runtimeType === constants_2.RuntimeType.NODE;
+        const isSendingSynchronousMetrics = settings.extensionVersion === undefined && !settings.flushMetricsToLogs;
+        if (isSendingSynchronousMetrics && isNode) {
+            throw new Error('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
+        }
+        needsUpdate = true;
+        changedEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] = apiKeySecretArn;
+    }
+    else if (apiKey !== undefined && oldEnvVars[constants_1.API_KEY_ENV_VAR] !== apiKey) {
+        needsUpdate = true;
+        changedEnvVars[constants_1.API_KEY_ENV_VAR] = apiKey;
+    }
+    if (site !== undefined && oldEnvVars[constants_1.SITE_ENV_VAR] !== site) {
+        if ((0, validation_1.isValidDatadogSite)(site)) {
+            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, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, or ddog-gov.com.');
+        }
+    }
+    if (site === undefined && oldEnvVars[constants_1.SITE_ENV_VAR] === undefined) {
+        needsUpdate = true;
+        changedEnvVars[constants_1.SITE_ENV_VAR] = 'datadoghq.com';
+    }
+    const environmentVarsTupleArray = [
+        ['apmFlushDeadline', constants_2.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR],
+        ['appsecEnabled', constants_2.APPSEC_ENABLED_ENV_VAR],
+        ['captureLambdaPayload', constants_2.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR],
+        ['environment', constants_1.ENVIRONMENT_ENV_VAR],
+        ['extraTags', constants_1.DD_TAGS_ENV_VAR],
+        ['loggingEnabled', constants_2.LOG_ENABLED_ENV_VAR],
+        ['mergeXrayTraces', constants_2.MERGE_XRAY_TRACES_ENV_VAR],
+        ['service', constants_1.SERVICE_ENV_VAR],
+        ['tracingEnabled', constants_1.DD_TRACE_ENABLED_ENV_VAR],
+        ['version', constants_1.VERSION_ENV_VAR],
+        ['llmobsMlApp', constants_1.DD_LLMOBS_ML_APP_ENV_VAR],
+    ];
+    for (const [key, environmentVar] of environmentVarsTupleArray) {
+        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_2.FLUSH_TO_LOG_ENV_VAR] !== ((_e = settings.flushMetricsToLogs) === null || _e === void 0 ? void 0 : _e.toString())) {
+        needsUpdate = true;
+        changedEnvVars[constants_2.FLUSH_TO_LOG_ENV_VAR] = settings.flushMetricsToLogs.toString();
+    }
+    const newEnvVars = Object.assign(Object.assign({}, oldEnvVars), changedEnvVars);
+    if (newEnvVars[constants_1.DD_LOG_LEVEL_ENV_VAR] !== settings.logLevel) {
+        needsUpdate = true;
+        if (settings.logLevel) {
+            newEnvVars[constants_1.DD_LOG_LEVEL_ENV_VAR] = settings.logLevel;
+        }
+        else {
+            delete newEnvVars[constants_1.DD_LOG_LEVEL_ENV_VAR];
+        }
+    }
+    // Enable ASM
+    if (settings['appsecEnabled'] === true) {
+        newEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] = constants_2.AWS_LAMBDA_EXEC_WRAPPER;
+    }
+    // Enable LLMObs
+    if (settings['llmobsMlApp'] !== undefined) {
+        newEnvVars[constants_1.DD_LLMOBS_ENABLED_ENV_VAR] = 'true';
+        newEnvVars[constants_1.DD_LLMOBS_ML_APP_ENV_VAR] = settings['llmobsMlApp'];
+        // For LLM Observability to use the agent from the extension layer as a proxy.
+        // LLM Observability setup documentation will point to the `-e` extension layer option to
+        // always use the extension layer.
+        newEnvVars[constants_1.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR] = 'false';
+    }
+    let layerARNs = (0, commons_1.getLayers)(config);
+    const originalLayerARNs = layerARNs;
+    let needsLayerUpdate = false;
+    let layerOrTraceVersion;
+    if ((0, commons_1.isLayerRuntime)(runtime)) {
+        const lambdaLibraryLayerArn = (0, commons_1.getLayerArn)(config, config.Runtime, region, settings);
+        const lambdaLibraryLayerName = constants_2.LAYER_LOOKUP[runtime];
+        let fullLambdaLibraryLayerARN;
+        if (settings.layerVersion !== undefined || settings.interactive) {
+            layerOrTraceVersion = settings.layerVersion;
+            if (settings.interactive && !settings.layerVersion) {
+                layerOrTraceVersion = yield (0, commons_1.findLatestLayerVersion)(config.Runtime, region);
+            }
+            fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${layerOrTraceVersion}`;
+        }
+        layerARNs = (0, commons_1.addLayerArn)(fullLambdaLibraryLayerARN, lambdaLibraryLayerName, layerARNs);
+    }
+    const lambdaExtensionLayerArn = (0, commons_1.getLayerArn)(config, constants_2.EXTENSION_LAYER_KEY, region, settings);
+    let fullExtensionLayerARN;
+    let extensionVersion;
+    if (settings.extensionVersion !== undefined || settings.interactive) {
+        extensionVersion = settings.extensionVersion;
+        if (settings.interactive && !settings.extensionVersion) {
+            extensionVersion = yield (0, commons_1.findLatestLayerVersion)(constants_2.EXTENSION_LAYER_KEY, region);
+        }
+        if (settings.lambdaFips) {
+            if (oldEnvVars[constants_2.DD_LAMBDA_FIPS_MODE_ENV_VAR] !== 'true') {
+                needsUpdate = true;
+                newEnvVars[constants_2.DD_LAMBDA_FIPS_MODE_ENV_VAR] = 'true';
+            }
+        }
+        fullExtensionLayerARN = `${lambdaExtensionLayerArn}:${extensionVersion}`;
+    }
+    layerARNs = (0, commons_1.addLayerArn)(fullExtensionLayerARN, constants_2.DD_LAMBDA_EXTENSION_LAYER_NAME, layerARNs);
+    // Special handling for .NET and Java to support universal instrumentation
+    if (runtimeType === constants_2.RuntimeType.DOTNET || runtimeType === constants_2.RuntimeType.JAVA) {
+        if (layerOrTraceVersion && (0, versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation)(runtimeType, extensionVersion)) {
+            // If the user configures the trace version and the extension support univeral instrumenation
+            // Then check whether the trace and extension are compatible with each other
+            if ((0, versionChecker_1.isTracerCompatibleWithExtension)(runtimeType, layerOrTraceVersion)) {
+                needsUpdate = true;
+                newEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] = constants_2.AWS_LAMBDA_EXEC_WRAPPER;
+            }
+            else {
+                throw new Error(`For the ${runtime} runtime, the dd-trace version ${layerOrTraceVersion} is not compatible with the dd-extension version ${extensionVersion}`);
+            }
+        }
+        else if (runtimeType === constants_2.RuntimeType.DOTNET) {
+            // If it is an old extension version or the trace version is null, leave it is as the old workflow
+            if (!(0, versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation)(runtimeType, extensionVersion) &&
+                ((_f = config.Architectures) === null || _f === void 0 ? void 0 : _f.includes(constants_2.ARM64_ARCHITECTURE))) {
+                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.');
+            }
+            else {
+                needsUpdate = true;
+                newEnvVars[constants_2.ENABLE_PROFILING_ENV_VAR] = constants_2.CORECLR_ENABLE_PROFILING;
+                newEnvVars[constants_2.PROFILER_ENV_VAR] = constants_2.CORECLR_PROFILER;
+                newEnvVars[constants_2.PROFILER_PATH_ENV_VAR] = constants_2.CORECLR_PROFILER_PATH;
+                newEnvVars[constants_2.DOTNET_TRACER_HOME_ENV_VAR] = constants_2.DD_DOTNET_TRACER_HOME;
+            }
+        }
+    }
+    updateRequest.Environment = {
+        Variables: newEnvVars,
+    };
+    if (originalLayerARNs.sort().join(',') !== layerARNs.sort().join(',')) {
+        needsLayerUpdate = true;
+    }
+    if (needsLayerUpdate) {
+        needsUpdate = true;
+        updateRequest.Layers = layerARNs;
+    }
+    layerARNs.forEach((layerARN) => {
+        if (layerARN.includes(constants_2.DD_LAMBDA_EXTENSION_LAYER_NAME) &&
+            newEnvVars[constants_1.API_KEY_ENV_VAR] === undefined &&
+            newEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] === undefined &&
+            newEnvVars[constants_2.KMS_API_KEY_ENV_VAR] === undefined) {
+            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`);
+        }
+    });
+    return needsUpdate ? updateRequest : undefined;
+});
+exports.calculateUpdateRequest = calculateUpdateRequest;
+//# sourceMappingURL=instrument.js.map

package/dist/functions/instrument.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/functions/instrument.ts"],"names":[],"mappings":"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"}

package/dist/functions/uninstrument.d.ts

@@ -0,0 +1,7 @@
+import { CloudWatchLogsClient } from '@aws-sdk/client-cloudwatch-logs';
+import { LambdaClient, FunctionConfiguration as LFunctionConfiguration, Runtime, UpdateFunctionConfigurationRequest } from '@aws-sdk/client-lambda';
+import { FunctionConfiguration } from '../interfaces';
+export declare const getUninstrumentedFunctionConfigs: (lambdaClient: LambdaClient, cloudWatchLogsClient: CloudWatchLogsClient, functionARNs: string[], forwarderARN: string | undefined) => Promise<FunctionConfiguration[]>;
+export declare const getUninstrumentedFunctionConfig: (lambdaClient: LambdaClient, cloudWatchLogsClient: CloudWatchLogsClient, config: LFunctionConfiguration, forwarderARN: string | undefined) => Promise<FunctionConfiguration>;
+export declare const getUninstrumentedFunctionConfigsFromRegEx: (lambdaClient: LambdaClient, cloudWatchLogsClient: CloudWatchLogsClient, pattern: string, forwarderArn: string | undefined) => Promise<FunctionConfiguration[]>;
+export declare const calculateUpdateRequest: (config: LFunctionConfiguration, runtime: Runtime) => UpdateFunctionConfigurationRequest | undefined;

package/dist/functions/uninstrument.js

@@ -0,0 +1,156 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateUpdateRequest = exports.getUninstrumentedFunctionConfigsFromRegEx = exports.getUninstrumentedFunctionConfig = exports.getUninstrumentedFunctionConfigs = void 0;
+const constants_1 = require("@datadog/datadog-ci-base/constants");
+const constants_2 = require("../constants");
+const loggroup_1 = require("../loggroup");
+const tags_1 = require("../tags");
+const commons_1 = require("./commons");
+const getUninstrumentedFunctionConfigs = (lambdaClient, cloudWatchLogsClient, functionARNs, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
+    const lambdaFunctionConfigs = yield (0, commons_1.getLambdaFunctionConfigs)(lambdaClient, functionARNs);
+    const configs = [];
+    for (const config of lambdaFunctionConfigs) {
+        const functionConfig = yield (0, exports.getUninstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, config, forwarderARN);
+        configs.push(functionConfig);
+    }
+    return configs;
+});
+exports.getUninstrumentedFunctionConfigs = getUninstrumentedFunctionConfigs;
+const getUninstrumentedFunctionConfig = (lambdaClient, cloudWatchLogsClient, config, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
+    const functionARN = config.FunctionArn;
+    const runtime = config.Runtime;
+    if (!(0, commons_1.isSupportedRuntime)(runtime)) {
+        throw Error(`Can't un-instrument ${functionARN}, runtime ${runtime} not supported`);
+    }
+    const updateRequest = (0, exports.calculateUpdateRequest)(config, runtime);
+    let logGroupConfiguration;
+    if (forwarderARN) {
+        const logGroupName = `/aws/lambda/${config.FunctionName}`;
+        logGroupConfiguration = yield (0, loggroup_1.calculateLogGroupRemoveRequest)(cloudWatchLogsClient, logGroupName, forwarderARN);
+    }
+    const tagConfiguration = yield (0, tags_1.calculateTagRemoveRequest)(lambdaClient, functionARN);
+    return {
+        functionARN,
+        lambdaConfig: config,
+        logGroupConfiguration,
+        tagConfiguration,
+        updateFunctionConfigurationCommandInput: updateRequest,
+    };
+});
+exports.getUninstrumentedFunctionConfig = getUninstrumentedFunctionConfig;
+const getUninstrumentedFunctionConfigsFromRegEx = (lambdaClient, cloudWatchLogsClient, pattern, forwarderArn) => __awaiter(void 0, void 0, void 0, function* () {
+    const matchedFunctions = yield (0, commons_1.getLambdaFunctionConfigsFromRegex)(lambdaClient, pattern);
+    const functionsToUpdate = [];
+    for (const config of matchedFunctions) {
+        const functionConfig = yield (0, exports.getUninstrumentedFunctionConfig)(lambdaClient, cloudWatchLogsClient, 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);
+    const functionARN = config.FunctionArn;
+    if (functionARN === undefined) {
+        return undefined;
+    }
+    const updateRequest = {
+        FunctionName: functionARN,
+    };
+    let needsUpdate = false;
+    const runtimeType = constants_2.RUNTIME_LOOKUP[runtime];
+    // Remove Handler for Python
+    if (runtimeType === constants_2.RuntimeType.PYTHON) {
+        const expectedHandler = constants_2.PYTHON_HANDLER_LOCATION;
+        if (config.Handler === expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
+            delete oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
+        }
+    }
+    // Remove Handler for Node
+    if (runtimeType === constants_2.RuntimeType.NODE) {
+        const expectedHandler = constants_2.NODE_HANDLER_LOCATION;
+        if (config.Handler === expectedHandler) {
+            needsUpdate = true;
+            updateRequest.Handler = oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
+            delete oldEnvVars[constants_2.LAMBDA_HANDLER_ENV_VAR];
+        }
+    }
+    // Remove AWS_LAMBDA_EXEC_WRAPPER for .NET and Java or if ASM is enabled
+    if (runtimeType === constants_2.RuntimeType.DOTNET ||
+        runtimeType === constants_2.RuntimeType.JAVA ||
+        oldEnvVars[constants_2.APPSEC_ENABLED_ENV_VAR] === 'true') {
+        if (oldEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR] === constants_2.AWS_LAMBDA_EXEC_WRAPPER) {
+            needsUpdate = true;
+            delete oldEnvVars[constants_2.AWS_LAMBDA_EXEC_WRAPPER_VAR];
+        }
+    }
+    /**
+     * Array used to remove environment vars used in
+     * the Lambda environment.
+     */
+    const environmentVarsArray = [
+        constants_1.API_KEY_ENV_VAR,
+        constants_2.API_KEY_SECRET_ARN_ENV_VAR,
+        constants_2.KMS_API_KEY_ENV_VAR,
+        constants_1.SITE_ENV_VAR,
+        constants_2.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR,
+        constants_2.APPSEC_ENABLED_ENV_VAR,
+        constants_2.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR,
+        constants_1.ENVIRONMENT_ENV_VAR,
+        constants_1.DD_TAGS_ENV_VAR,
+        constants_2.FLUSH_TO_LOG_ENV_VAR,
+        constants_2.MERGE_XRAY_TRACES_ENV_VAR,
+        constants_1.DD_LOG_LEVEL_ENV_VAR,
+        constants_2.LOG_ENABLED_ENV_VAR,
+        constants_1.SERVICE_ENV_VAR,
+        constants_1.DD_TRACE_ENABLED_ENV_VAR,
+        constants_1.VERSION_ENV_VAR,
+        constants_2.ENABLE_PROFILING_ENV_VAR,
+        constants_2.PROFILER_ENV_VAR,
+        constants_2.PROFILER_PATH_ENV_VAR,
+        constants_2.DOTNET_TRACER_HOME_ENV_VAR,
+        constants_1.DD_LLMOBS_ENABLED_ENV_VAR,
+        constants_1.DD_LLMOBS_ML_APP_ENV_VAR,
+        constants_1.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR,
+        constants_2.DD_LAMBDA_FIPS_MODE_ENV_VAR,
+    ];
+    // Remove Environment Variables
+    for (const environmentVar of environmentVarsArray) {
+        if (oldEnvVars[environmentVar]) {
+            needsUpdate = true;
+            delete oldEnvVars[environmentVar];
+        }
+    }
+    updateRequest.Environment = {
+        Variables: oldEnvVars,
+    };
+    // Remove Layers
+    let needsLayerRemoval = false;
+    const lambdaLibraryLayerName = constants_2.LAYER_LOOKUP[runtime];
+    const originalLayerARNs = (0, 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_2.DD_LAMBDA_EXTENSION_LAYER_NAME)); })
+        .map((layer) => { var _a; return (_a = layer.Arn) !== null && _a !== void 0 ? _a : ''; });
+    if (originalLayerARNs.sort().join(',') !== layerARNs.sort().join(',')) {
+        needsLayerRemoval = true;
+    }
+    if (needsLayerRemoval) {
+        needsUpdate = true;
+        updateRequest.Layers = layerARNs;
+    }
+    return needsUpdate ? updateRequest : undefined;
+};
+exports.calculateUpdateRequest = calculateUpdateRequest;
+//# sourceMappingURL=uninstrument.js.map

package/dist/functions/uninstrument.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../src/functions/uninstrument.ts"],"names":[],"mappings":"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"}

package/dist/functions/versionChecker.d.ts

@@ -0,0 +1,3 @@
+import { RuntimeType } from '../constants';
+export declare const isExtensionCompatibleWithUniversalInstrumentation: (runtimeType: RuntimeType, extensionVersion?: number) => boolean;
+export declare const isTracerCompatibleWithExtension: (runtimeType: RuntimeType, traceVersion?: number) => boolean;

package/dist/functions/versionChecker.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTracerCompatibleWithExtension = exports.isExtensionCompatibleWithUniversalInstrumentation = void 0;
+const constants_1 = require("../constants");
+const UNIVERSAL_INSTRUMENTATION_JAVA_EXTENSION_VERSION = 24;
+const UNIVERSAL_INSTRUMENTATION_JAVA_TRACER_VERSION = 5;
+const UNIVERSAL_INSTRUMENTATION_DOTNET_EXTENSION_VERSION = 24;
+const UNIVERSAL_INSTRUMENTATION_DOTNET_TRACER_VERSION = 4;
+const isExtensionCompatibleWithUniversalInstrumentation = (runtimeType, extensionVersion) => {
+    if (extensionVersion === undefined) {
+        return false;
+    }
+    switch (runtimeType) {
+        case constants_1.RuntimeType.JAVA:
+            return extensionVersion >= UNIVERSAL_INSTRUMENTATION_JAVA_EXTENSION_VERSION;
+        case constants_1.RuntimeType.DOTNET:
+            return extensionVersion >= UNIVERSAL_INSTRUMENTATION_DOTNET_EXTENSION_VERSION;
+        default:
+            return true;
+    }
+};
+exports.isExtensionCompatibleWithUniversalInstrumentation = isExtensionCompatibleWithUniversalInstrumentation;
+const isTracerCompatibleWithExtension = (runtimeType, traceVersion) => {
+    // More complex compatbility rules can be configured for each extension version if necessary
+    if (traceVersion === undefined) {
+        return true;
+    }
+    switch (runtimeType) {
+        case constants_1.RuntimeType.JAVA:
+            return traceVersion >= UNIVERSAL_INSTRUMENTATION_JAVA_TRACER_VERSION;
+        case constants_1.RuntimeType.DOTNET:
+            return traceVersion >= UNIVERSAL_INSTRUMENTATION_DOTNET_TRACER_VERSION;
+        default:
+            return true;
+    }
+};
+exports.isTracerCompatibleWithExtension = isTracerCompatibleWithExtension;
+//# sourceMappingURL=versionChecker.js.map

package/dist/functions/versionChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"versionChecker.js","sourceRoot":"","sources":["../../src/functions/versionChecker.ts"],"names":[],"mappings":";;;AAAA,4CAAwC;AAExC,MAAM,gDAAgD,GAAG,EAAE,CAAA;AAC3D,MAAM,6CAA6C,GAAG,CAAC,CAAA;AACvD,MAAM,kDAAkD,GAAG,EAAE,CAAA;AAC7D,MAAM,+CAA+C,GAAG,CAAC,CAAA;AAElD,MAAM,iDAAiD,GAAG,CAC/D,WAAwB,EACxB,gBAAyB,EAChB,EAAE;IACX,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,OAAO,KAAK,CAAA;KACb;IACD,QAAQ,WAAW,EAAE;QACnB,KAAK,uBAAW,CAAC,IAAI;YACnB,OAAO,gBAAgB,IAAI,gDAAgD,CAAA;QAC7E,KAAK,uBAAW,CAAC,MAAM;YACrB,OAAO,gBAAgB,IAAI,kDAAkD,CAAA;QAC/E;YACE,OAAO,IAAI,CAAA;KACd;AACH,CAAC,CAAA;AAfY,QAAA,iDAAiD,qDAe7D;AAEM,MAAM,+BAA+B,GAAG,CAAC,WAAwB,EAAE,YAAqB,EAAW,EAAE;IAC1G,4FAA4F;IAC5F,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,OAAO,IAAI,CAAA;KACZ;IACD,QAAQ,WAAW,EAAE;QACnB,KAAK,uBAAW,CAAC,IAAI;YACnB,OAAO,YAAY,IAAI,6CAA6C,CAAA;QACtE,KAAK,uBAAW,CAAC,MAAM;YACrB,OAAO,YAAY,IAAI,+CAA+C,CAAA;QACxE;YACE,OAAO,IAAI,CAAA;KACd;AACH,CAAC,CAAA;AAbY,QAAA,+BAA+B,mCAa3C"}

package/dist/interfaces.d.ts

@@ -0,0 +1,91 @@
+import { CloudWatchLogsClient, CreateLogGroupCommandInput, DeleteSubscriptionFilterCommandInput, PutSubscriptionFilterCommandInput } from '@aws-sdk/client-cloudwatch-logs';
+import { FunctionConfiguration as LFunctionConfiguration, LambdaClient, TagResourceCommandInput, UpdateFunctionConfigurationCommandInput, UntagResourceCommandInput } from '@aws-sdk/client-lambda';
+/**
+ * Configuration options provided by the user through
+ * the CLI in order to instrument properly.
+ */
+export interface LambdaConfigOptions {
+    apmFlushDeadline?: string;
+    appsecEnabled?: boolean;
+    captureLambdaPayload?: string;
+    environment?: string;
+    extensionVersion?: string;
+    extraTags?: string;
+    flushMetricsToLogs?: string;
+    forwarder?: string;
+    functions: string[];
+    interactive?: boolean;
+    layerAWSAccount?: string;
+    layerVersion?: string;
+    logging?: string;
+    logLevel?: string;
+    mergeXrayTraces?: string;
+    profile?: string;
+    region?: string;
+    service?: string;
+    tracing?: string;
+    version?: string;
+    llmobs?: string;
+}
+/**
+ * Configuration comprised by a Lambda Function ARN,
+ * its configuration from AWS, its library layer ARN,
+ * the changes in logs, tags, and the update request.
+ */
+export interface FunctionConfiguration {
+    functionARN: string;
+    lambdaConfig: LFunctionConfiguration;
+    logGroupConfiguration?: LogGroupConfiguration;
+    tagConfiguration?: TagConfiguration;
+    updateFunctionConfigurationCommandInput?: UpdateFunctionConfigurationCommandInput;
+}
+export interface InstrumentedConfigurationGroup {
+    cloudWatchLogsClient: CloudWatchLogsClient;
+    configs: FunctionConfiguration[];
+    lambdaClient: LambdaClient;
+    region: string;
+}
+/**
+ * Basic settings to use in every specified
+ * lambda to be instrumented.
+ */
+export interface InstrumentationSettings extends InstrumentationTags {
+    apmFlushDeadline?: string;
+    appsecEnabled?: boolean;
+    captureLambdaPayload?: boolean;
+    extensionVersion?: number;
+    lambdaFips?: boolean;
+    flushMetricsToLogs: boolean;
+    forwarderARN?: string;
+    interactive?: boolean;
+    layerAWSAccount?: string;
+    layerVersion?: number;
+    loggingEnabled?: boolean;
+    logLevel?: string;
+    mergeXrayTraces: boolean;
+    tracingEnabled: boolean;
+    llmobsEnabled?: boolean;
+    llmobsMlApp?: string;
+}
+/**
+ * Interface for Unified Service Tagging.
+ *
+ * See more at: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/?tab=kubernetes#overview
+ */
+interface InstrumentationTags {
+    environment?: string;
+    extraTags?: string;
+    service?: string;
+    version?: string;
+}
+export interface LogGroupConfiguration {
+    createLogGroupCommandInput?: CreateLogGroupCommandInput;
+    deleteSubscriptionFilterCommandInput?: DeleteSubscriptionFilterCommandInput;
+    logGroupName: string;
+    putSubscriptionFilterCommandInput?: PutSubscriptionFilterCommandInput;
+}
+export interface TagConfiguration {
+    tagResourceCommandInput?: TagResourceCommandInput;
+    untagResourceCommandInput?: UntagResourceCommandInput;
+}
+export {};

package/dist/interfaces.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interfaces.js.map

package/dist/interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":""}

package/dist/loggroup.d.ts

@@ -0,0 +1,17 @@
+import { CloudWatchLogsClient, CreateLogGroupCommandInput, DeleteSubscriptionFilterCommandInput, PutSubscriptionFilterCommandInput, SubscriptionFilter } from '@aws-sdk/client-cloudwatch-logs';
+import { LogGroupConfiguration } from './interfaces';
+export declare enum SubscriptionState {
+    Empty = 0,
+    CorrectDestination = 1,
+    WrongDestinationOwned = 2,
+    WrongDestinationUnowned = 3
+}
+export declare const applyLogGroupConfig: (client: CloudWatchLogsClient, config: LogGroupConfiguration) => Promise<void>;
+export declare const createLogGroup: (client: CloudWatchLogsClient, input: CreateLogGroupCommandInput) => Promise<void>;
+export declare const deleteSubscriptionFilter: (client: CloudWatchLogsClient, input: DeleteSubscriptionFilterCommandInput) => Promise<void>;
+export declare const putSubscriptionFilter: (client: CloudWatchLogsClient, input: PutSubscriptionFilterCommandInput) => Promise<void>;
+export declare const calculateLogGroupUpdateRequest: (client: CloudWatchLogsClient, logGroupName: string, forwarderARN: string) => Promise<LogGroupConfiguration | undefined>;
+export declare const calculateLogGroupRemoveRequest: (client: CloudWatchLogsClient, logGroupName: string, forwarderARN: string) => Promise<LogGroupConfiguration>;
+export declare const hasLogGroup: (client: CloudWatchLogsClient, logGroupName: string) => Promise<boolean>;
+export declare const getSubscriptionFilterState: (client: CloudWatchLogsClient, logGroupName: string, forwarderARN: string) => Promise<SubscriptionState>;
+export declare const getSubscriptionFilters: (client: CloudWatchLogsClient, logGroupName: string) => Promise<SubscriptionFilter[] | undefined>;