@datadog/datadog-ci 0.17.13 → 0.18.0

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

@@ -28,7 +28,7 @@ describe('commons', () => {
                 'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:10',
             ];
             const region = 'sa-east-1';
-            const lambdaLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+            const lambdaLibraryLayerName = constants_1.LAYER_LOOKUP[runtime];
             const fullLambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region) + ':49';
             const fullExtensionLayerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region) + ':11';
             layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerArn, lambdaLibraryLayerName, layerARNs);
@@ -49,7 +49,7 @@ describe('commons', () => {
                 'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:11',
             ];
             const region = 'sa-east-1';
-            const lambdaLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+            const lambdaLibraryLayerName = constants_1.LAYER_LOOKUP[runtime];
             const fullLambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region) + ':49';
             const fullExtensionLayerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region) + ':11';
             layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerArn, lambdaLibraryLayerName, layerARNs);
@@ -568,4 +568,48 @@ describe('commons', () => {
             });
         }));
     });
+    describe('Correctly handles multiple runtimes', () => {
+        test('returns true if all runtimes are uniform', () => __awaiter(void 0, void 0, void 0, function* () {
+            const configs = [
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                },
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                },
+            ];
+            expect(commons_1.checkRuntimeTypesAreUniform(configs)).toBe(true);
+        }));
+        test('returns false if runtimes are not uniform', () => __awaiter(void 0, void 0, void 0, function* () {
+            const configs = [
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                },
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                        Handler: 'index.handler',
+                        Runtime: 'python3.9',
+                    },
+                },
+            ];
+            expect(commons_1.checkRuntimeTypesAreUniform(configs)).toBe(false);
+        }));
+    });
 });

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

@@ -235,6 +235,40 @@ describe('uninstrument', () => {
         }
       `);
         }));
+        test('correctly removes .NET env vars', () => __awaiter(void 0, void 0, void 0, function* () {
+            const lambda = fixtures_1.makeMockLambda({
+                'arn:aws:lambda:us-east-1:000000000000:function:uninstrument': {
+                    Environment: {
+                        Variables: {
+                            [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'false',
+                            [constants_1.LOG_LEVEL_ENV_VAR]: 'debug',
+                            [constants_1.MERGE_XRAY_TRACES_ENV_VAR]: 'false',
+                            [constants_1.SITE_ENV_VAR]: 'datadoghq.com',
+                            [constants_1.TRACE_ENABLED_ENV_VAR]: 'false',
+                            [constants_1.SERVICE_ENV_VAR]: 'middletier',
+                            [constants_1.ENVIRONMENT_ENV_VAR]: 'staging',
+                            [constants_1.VERSION_ENV_VAR]: '0.2',
+                            [constants_1.ENABLE_PROFILING_ENV_VAR]: '1',
+                            [constants_1.PROFILER_ENV_VAR]: '{846F5F1C-F9AE-4B07-969E-05C26BC060D8}',
+                            [constants_1.PROFILER_PATH_ENV_VAR]: '/opt/datadog/Datadog.Trace.ClrProfiler.Native.so',
+                            [constants_1.DOTNET_TRACER_HOME_ENV_VAR]: '/opt/datadog',
+                        },
+                    },
+                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument',
+                    Runtime: 'dotnetcore3.1',
+                },
+            });
+            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
+            const result = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambda, cloudWatch, ['arn:aws:lambda:us-east-1:000000000000:function:uninstrument'], undefined);
+            expect(result[0].updateRequest).toMatchInlineSnapshot(`
+          Object {
+            "Environment": Object {
+              "Variables": Object {},
+            },
+            "FunctionName": "arn:aws:lambda:us-east-1:000000000000:function:uninstrument",
+          }
+        `);
+        }));
     });
     describe('getUninstrumentedFunctionConfig', () => {
         const OLD_ENV = process.env;

package/dist/commands/lambda/__tests__/instrument.test.js

@@ -268,6 +268,75 @@ TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
   \\"dd_sls_ci\\": \\"v${version}\\"
 }
 "
+`);
+            }));
+            test('prints dry run data for lambda .NET layer', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'dotnetcore3.1',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '129',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(0);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.bold(chalk_1.yellow('[Warning]'))} Instrument your ${chalk_1.hex('#FF9900').bold('Lambda')} functions in a dev or staging environment first. Should the instrumentation result be unsatisfactory, run \`${chalk_1.bold('uninstrument')}\` with the same arguments to revert the changes.
+\n${chalk_1.bold(chalk_1.yellow('[!]'))} Functions to be updated:
+\t- ${chalk_1.bold('arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world')}\n
+${chalk_1.bold(chalk_1.cyan('[Dry Run] '))}Will apply the following updates:
+UpdateFunctionConfiguration -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
+{
+  \\"FunctionName\\": \\"arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world\\",
+  \\"Environment\\": {
+    \\"Variables\\": {
+      \\"DD_API_KEY\\": \\"1234\\",
+      \\"DD_SITE\\": \\"datadoghq.com\\",
+      \\"DD_CAPTURE_LAMBDA_PAYLOAD\\": \\"false\\",
+      \\"DD_ENV\\": \\"staging\\",
+      \\"DD_TAGS\\": \\"layer:api,team:intake\\",
+      \\"DD_MERGE_XRAY_TRACES\\": \\"false\\",
+      \\"DD_SERVICE\\": \\"middletier\\",
+      \\"DD_TRACE_ENABLED\\": \\"true\\",
+      \\"DD_VERSION\\": \\"0.2\\",
+      \\"DD_FLUSH_TO_LOG\\": \\"true\\",
+      \\"CORECLR_ENABLE_PROFILING\\": \\"1\\",
+      \\"CORECLR_PROFILER\\": \\"{846F5F1C-F9AE-4B07-969E-05C26BC060D8}\\",
+      \\"CORECLR_PROFILER_PATH\\": \\"/opt/datadog/Datadog.Trace.ClrProfiler.Native.so\\",
+      \\"DD_DOTNET_TRACER_HOME\\": \\"/opt/datadog\\"
+    }
+  },
+  \\"Layers\\": [
+    \\"arn:aws:lambda:us-east-1:464622532012:layer:dd-trace-dotnet:129\\"
+  ]
+}
+TagResource -> arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world
+{
+  \\"dd_sls_ci\\": \\"v${version}\\"
+}
+"
 `);
             }));
             test('instrumenting with source code integrations fails if not run within a git repo', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -1044,6 +1113,155 @@ ${chalk_1.red('[Error]')} Couldn't find any Lambda functions in the specified re
 "Fetching Lambda functions, this might take a while.
 ${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry count exceeded.
 "
+`);
+            }));
+            test('aborts early when a layer version is set for Java', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'java8.al2',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '6',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Only the --extension-version argument should be set for the java8.al2 runtime. Please remove the --layer-version argument from the instrument command.
+"
+`);
+            }));
+            test('aborts early when a layer version is set for Ruby', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'ruby2.7',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '40',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Only the --extension-version argument should be set for the ruby2.7 runtime. Please remove the --layer-version argument from the instrument command.
+"
+`);
+            }));
+            test('aborts early when a layer version is set for a Custom runtime', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'provided.al2',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '6',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Only the --extension-version argument should be set for the provided.al2 runtime. Please remove the --layer-version argument from the instrument command.
+"
+`);
+            }));
+            test('aborts early when .NET is using ARM64 architecture', () => __awaiter(void 0, void 0, void 0, function* () {
+                ;
+                fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
+                aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
+                    'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world': {
+                        Architectures: ['arm64'],
+                        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                        Runtime: 'dotnetcore3.1',
+                    },
+                }));
+                const cli = fixtures_1.makeCli();
+                const context = fixtures_1.createMockContext();
+                const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
+                process.env.DATADOG_API_KEY = '1234';
+                const code = yield cli.run([
+                    'lambda',
+                    'instrument',
+                    '-f',
+                    functionARN,
+                    '--dry',
+                    '-v',
+                    '6',
+                    '--extra-tags',
+                    'layer:api,team:intake',
+                    '--service',
+                    'middletier',
+                    '--env',
+                    'staging',
+                    '--version',
+                    '0.2',
+                ], context);
+                const output = context.stdout.toString();
+                expect(code).toBe(1);
+                expect(output).toMatchInlineSnapshot(`
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Instrumenting arm64 architecture is not currently supported for .NET. Please only instrument .NET functions using x86_64 architecture.
+"
 `);
             }));
         });

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

@@ -1,7 +1,9 @@
 export declare const DD_LAMBDA_EXTENSION_LAYER_NAME = "Datadog-Extension";
 export declare const EXTENSION_LAYER_KEY = "extension";
-export declare const RUNTIME_LAYER_LOOKUP: {
+export declare const DOTNET_RUNTIME = "dotnetcore3.1";
+export declare const LAYER_LOOKUP: {
     readonly extension: "Datadog-Extension";
+    readonly 'dotnetcore3.1': "dd-trace-dotnet";
     readonly 'nodejs12.x': "Datadog-Node12-x";
     readonly 'nodejs14.x': "Datadog-Node14-x";
     readonly 'python3.6': "Datadog-Python36";
@@ -9,31 +11,45 @@ export declare const RUNTIME_LAYER_LOOKUP: {
     readonly 'python3.8': "Datadog-Python38";
     readonly 'python3.9': "Datadog-Python39";
 };
-export declare type Runtime = Exclude<keyof typeof RUNTIME_LAYER_LOOKUP, typeof EXTENSION_LAYER_KEY>;
-export declare const ARM_RUNTIMES: string[];
-export declare const ARM64_ARCHITECTURE = "arm64";
-export declare const ARM_LAYER_SUFFIX = "-ARM";
 export declare enum RuntimeType {
-    NODE = 0,
-    PYTHON = 1
+    DOTNET = 0,
+    CUSTOM = 1,
+    JAVA = 2,
+    NODE = 3,
+    PYTHON = 4,
+    RUBY = 5
 }
 export declare const RUNTIME_LOOKUP: {
-    [key: string]: RuntimeType;
-};
-export declare const HANDLER_LOCATION: {
-    'nodejs12.x': string;
-    'nodejs14.x': string;
-    'python3.6': string;
-    'python3.7': string;
-    'python3.8': string;
-    'python3.9': string;
+    'dotnetcore3.1': RuntimeType;
+    java11: RuntimeType;
+    'java8.al2': RuntimeType;
+    'nodejs12.x': RuntimeType;
+    'nodejs14.x': RuntimeType;
+    'provided.al2': RuntimeType;
+    'python3.6': RuntimeType;
+    'python3.7': RuntimeType;
+    'python3.8': RuntimeType;
+    'python3.9': RuntimeType;
+    'ruby2.5': RuntimeType;
+    'ruby2.7': RuntimeType;
 };
+export declare type Runtime = keyof typeof RUNTIME_LOOKUP;
+export declare type LayerKey = keyof typeof LAYER_LOOKUP;
+export declare const ARM_LAYERS: string[];
+export declare const ARM64_ARCHITECTURE = "arm64";
+export declare const ARM_LAYER_SUFFIX = "-ARM";
+export declare const PYTHON_HANDLER_LOCATION = "datadog_lambda.handler.handler";
+export declare const NODE_HANDLER_LOCATION = "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler";
 export declare const SITES: string[];
 export declare const AWS_REGIONS: string[];
 export declare const DEFAULT_LAYER_AWS_ACCOUNT = "464622532012";
 export declare const GOVCLOUD_LAYER_AWS_ACCOUNT = "002406178527";
 export declare const SUBSCRIPTION_FILTER_NAME = "datadog-ci-filter";
 export declare const TAG_VERSION_NAME = "dd_sls_ci";
+export declare const CORECLR_ENABLE_PROFILING = "1";
+export declare const CORECLR_PROFILER = "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}";
+export declare const CORECLR_PROFILER_PATH = "/opt/datadog/Datadog.Trace.ClrProfiler.Native.so";
+export declare const DD_DOTNET_TRACER_HOME = "/opt/datadog";
 export declare const API_KEY_ENV_VAR = "DD_API_KEY";
 export declare const API_KEY_SECRET_ARN_ENV_VAR = "DD_API_KEY_SECRET_ARN";
 export declare const KMS_API_KEY_ENV_VAR = "DD_KMS_API_KEY";
@@ -48,6 +64,10 @@ export declare const VERSION_ENV_VAR = "DD_VERSION";
 export declare const ENVIRONMENT_ENV_VAR = "DD_ENV";
 export declare const EXTRA_TAGS_ENV_VAR = "DD_TAGS";
 export declare const CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = "DD_CAPTURE_LAMBDA_PAYLOAD";
+export declare const ENABLE_PROFILING_ENV_VAR = "CORECLR_ENABLE_PROFILING";
+export declare const PROFILER_ENV_VAR = "CORECLR_PROFILER";
+export declare const PROFILER_PATH_ENV_VAR = "CORECLR_PROFILER_PATH";
+export declare const DOTNET_TRACER_HOME_ENV_VAR = "DD_DOTNET_TRACER_HOME";
 export declare const CI_SITE_ENV_VAR = "DATADOG_SITE";
 export declare const CI_API_KEY_ENV_VAR = "DATADOG_API_KEY";
 export declare const CI_API_KEY_SECRET_ARN_ENV_VAR = "DATADOG_API_KEY_SECRET_ARN";

package/dist/commands/lambda/constants.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = 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.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.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.AWS_REGIONS = 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,32 +15,34 @@ 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',
@@ -74,6 +79,11 @@ 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';
@@ -89,6 +99,10 @@ 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';

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,
@@ -39,12 +39,13 @@ export declare const collectFunctionsByRegion: (functions: string[], defaultRegi
  * @param region the region where the layer is stored.
  * @returns the latest version of the layer to find.
  */
-export declare const findLatestLayerVersion: (runtime: Runtime, region: string) => Promise<number>;
+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.
@@ -73,7 +74,7 @@ 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[];
 /**
@@ -110,7 +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,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.willUpdateFunctionConfigs = exports.updateLambdaFunctionConfigs = exports.sentenceMatchesRegEx = exports.isSupportedRuntime = exports.isLambdaActive = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.isMissingDatadogSiteEnvVar = exports.isMissingAWSCredentials = exports.findLatestLayerVersion = 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");
@@ -99,12 +99,12 @@ exports.collectFunctionsByRegion = collectFunctionsByRegion;
  * @param region the region where the layer is stored.
  * @returns the latest version of the layer to find.
  */
-const findLatestLayerVersion = (runtime, region) => __awaiter(void 0, void 0, void 0, function* () {
+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.RUNTIME_LAYER_LOOKUP[runtime];
+    const layerName = constants_1.LAYER_LOOKUP[layer];
     let foundLatestVersion = false;
     const lambda = new aws_sdk_1.Lambda({ region });
     while (!foundLatestVersion) {
@@ -173,6 +173,11 @@ const isMissingDatadogEnvVars = () => exports.isMissingDatadogSiteEnvVar() || ex
 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.
@@ -231,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;
@@ -315,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* () {

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

@@ -58,7 +58,7 @@ const getInstrumentedFunctionConfigsFromRegEx = (lambda, cloudWatch, region, pat
 });
 exports.getInstrumentedFunctionConfigsFromRegEx = getInstrumentedFunctionConfigsFromRegEx;
 const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    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) => __awaiter(
         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,7 +150,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
         ['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();
         }
@@ -134,7 +159,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
     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();
     }
@@ -148,19 +173,31 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
             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 || settings.interactive) {
-        let layerVersion = settings.layerVersion;
-        if (settings.interactive && !settings.layerVersion) {
-            layerVersion = yield commons_1.findLatestLayerVersion(config.Runtime, region);
+    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}`;
         }
-        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;
@@ -171,10 +208,6 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
         }
         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;

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
@@ -92,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) {
@@ -105,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.js

@@ -155,6 +155,9 @@ class InstrumentCommand extends clipanion_1.Command {
                 }
             }
             const configList = configGroups.map((group) => group.configs).reduce((a, b) => a.concat(b));
+            if (!commons_1.checkRuntimeTypesAreUniform(configList)) {
+                throw Error('Detected Lambda functions using different runtimes. Please only instrument batches of functions that share a similar runtime');
+            }
             this.printPlannedActions(configList);
             if (this.dryRun || configList.length === 0) {
                 return 0;

package/dist/commands/synthetics/__tests__/utils.test.js

@@ -291,6 +291,7 @@ describe('utils', () => {
                 pollingTimeout: 60 * 1000,
                 retry: { count: 5, interval: 30 },
                 startUrl: 'http://127.0.0.1:60/newPath',
+                startUrlSubstitutionRegex: '.*',
                 tunnel: { host: 'host', id: 'id', privateKey: 'privateKey' },
                 variables: { VAR_1: 'value' },
             };

package/dist/commands/synthetics/interfaces.d.ts

@@ -245,6 +245,7 @@ export interface ConfigOverride {
     pollingTimeout?: number;
     retry?: RetryConfig;
     startUrl?: string;
+    startUrlSubstitutionRegex?: string;
     tunnel?: TunnelInfo;
     variables?: {
         [key: string]: string;

package/dist/commands/synthetics/run-test.d.ts

@@ -28,6 +28,7 @@ export declare const getTestsList: (api: APIHelper, config: SyntheticsCIConfig,
         pollingTimeout?: number | undefined;
         retry?: import("./interfaces").RetryConfig | undefined;
         startUrl?: string | undefined;
+        startUrlSubstitutionRegex?: string | undefined;
         tunnel?: import("./tunnel").TunnelInfo | undefined;
         variables?: {
             [key: string]: string;
@@ -52,6 +53,7 @@ export declare const getTestsList: (api: APIHelper, config: SyntheticsCIConfig,
         pollingTimeout?: number | undefined;
         retry?: import("./interfaces").RetryConfig | undefined;
         startUrl?: string | undefined;
+        startUrlSubstitutionRegex?: string | undefined;
         tunnel?: import("./tunnel").TunnelInfo | undefined;
         variables?: {
             [key: string]: string;

package/dist/commands/synthetics/utils.js

@@ -69,11 +69,15 @@ const handleConfig = (test, publicId, reporter, config) => {
         'locations',
         'pollingTimeout',
         'retry',
+        'startUrlSubstitutionRegex',
         'tunnel',
         'variables',
     ]));
     if ((test.type === 'browser' || test.subtype === 'http') && config.startUrl) {
         const context = parseUrlVariables(test.config.request.url, reporter);
+        if (URL_VARIABLES.some((v) => { var _a; return (_a = config.startUrl) === null || _a === void 0 ? void 0 : _a.includes(v); })) {
+            reporter.error('[DEPRECATION] The usage of URL variables is deprecated, see explanation in the README\n\n');
+        }
         handledConfig.startUrl = template(config.startUrl, context);
     }
     return handledConfig;
@@ -104,19 +108,20 @@ const parseUrlVariables = (url, reporter) => {
     context.SUBDOMAIN = subdomainMatch ? subdomainMatch[1] : undefined;
     return context;
 };
+const URL_VARIABLES = [
+    'DOMAIN',
+    'HASH',
+    'HOST',
+    'HOSTNAME',
+    'ORIGIN',
+    'PARAMS',
+    'PATHNAME',
+    'PORT',
+    'PROTOCOL',
+    'SUBDOMAIN',
+];
 const warnOnReservedEnvVarNames = (context, reporter) => {
-    const reservedVarNames = new Set([
-        'DOMAIN',
-        'HASH',
-        'HOST',
-        'HOSTNAME',
-        'ORIGIN',
-        'PARAMS',
-        'PATHNAME',
-        'PORT',
-        'PROTOCOL',
-        'SUBDOMAIN',
-    ]);
+    const reservedVarNames = new Set(URL_VARIABLES);
     const usedEnvVarNames = Object.keys(context).filter((name) => reservedVarNames.has(name));
     if (usedEnvVarNames.length > 0) {
         const names = usedEnvVarNames.join(', ');

package/dist/helpers/git.js

@@ -28,7 +28,7 @@ const getGitMetadata = () => __awaiter(void 0, void 0, void 0, function* () {
             git.branch(),
             git.listRemote(['--get-url']),
             git.show(['-s', '--format=%s']),
-            git.show(['-s', '--format=%an,%ae,%ad,%cn,%ce,%cd']),
+            git.show(['-s', '--format=%an,%ae,%aI,%cn,%ce,%cI']),
         ]);
         const [authorName, authorEmail, authorDate, committerName, committerEmail, committerDate,] = authorAndCommitter.split(',');
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/datadog-ci",
-  "version": "0.17.13",
+  "version": "0.18.0",
   "description": "Run datadog actions from the CI.",
   "repository": "https://github.com/DataDog/datadog-ci",
   "license": "Apache-2.0",