@datadog/datadog-ci 1.9.0 → 1.12.0

package/dist/commands/lambda/__tests__/functions/{instrument.test.js → instrument.part2.test.js}

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -31,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 jest.mock('../../loggroup');
 const constants_1 = require("../../constants");
 const instrument_1 = require("../../functions/instrument");
-const loggroup = __importStar(require("../../loggroup"));
 const fixtures_1 = require("../fixtures");
 describe('instrument', () => {
     describe('calculateUpdateRequest', () => {
@@ -443,318 +423,161 @@ describe('instrument', () => {
             }
             expect(error === null || error === void 0 ? void 0 : error.message).toBe('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
         }));
-    });
-    describe('getInstrumentedFunctionConfig', () => {
-        const OLD_ENV = process.env;
-        beforeEach(() => {
-            jest.resetModules();
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = OLD_ENV;
-        });
-        test('throws an error when it encounters an unsupported runtime', () => __awaiter(void 0, void 0, void 0, function* () {
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Runtime: 'go',
-                },
-            });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
+        describe('test universal instrumentation workflow for Java and .Net', () => {
+            const region = 'us-east-1';
+            const config = {
+                FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                Handler: 'index.handler',
+                Layers: [],
+                Runtime: 'runtime',
+            };
             const settings = {
                 flushMetricsToLogs: false,
-                layerVersion: 23,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                layerVersion: 13,
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const config = (yield lambda
-                .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
-                .promise()).Configuration;
-            yield expect(instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings)).rejects.toThrow();
-        }));
-        test('replaces the layer arn when the version has changed', () => __awaiter(void 0, void 0, void 0, function* () {
-            var _a;
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
+            const dotnetRuntime = 'dotnet6';
+            const javaRuntime = 'java11';
+            describe(`test for runtime ${dotnetRuntime}`, () => {
+                const dotNetConfig = Object.assign(Object.assign({}, config), { Runtime: dotnetRuntime });
+                const dotNetConfigOnArm86 = Object.assign(Object.assign({}, config), { Runtime: dotnetRuntime, Architectures: ['arm64'] });
+                test('should throw error when the extension version and trace version are not compatible', () => __awaiter(void 0, void 0, void 0, function* () {
+                    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = '5678';
+                    const badSettings = Object.assign(Object.assign({}, settings), { extensionVersion: 24, layerVersion: 3 });
+                    let error;
+                    try {
+                        yield instrument_1.calculateUpdateRequest(dotNetConfig, badSettings, region, dotnetRuntime);
+                    }
+                    catch (e) {
+                        if (e instanceof Error) {
+                            error = e;
+                        }
+                    }
+                    expect(error === null || error === void 0 ? void 0 : error.message).toBe(`For the ${dotnetRuntime} runtime, the dd-trace version 3 is not compatible with the dd-extension version 24`);
+                }));
+                test('should throw error if it is running on arm64 with an old dd-extension version', () => __awaiter(void 0, void 0, void 0, function* () {
+                    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = '5678';
+                    const curSettings = Object.assign(Object.assign({}, settings), { extensionVersion: 23 });
+                    let error;
+                    try {
+                        yield instrument_1.calculateUpdateRequest(dotNetConfigOnArm86, curSettings, region, dotnetRuntime);
+                    }
+                    catch (e) {
+                        if (e instanceof Error) {
+                            error = e;
+                        }
+                    }
+                    expect(error === null || error === void 0 ? void 0 : error.message).toBe('Instrumenting arm64 architecture is not supported for the given dd-extension version. Please choose the latest dd-extension version or use x86_64 architecture.');
+                }));
+                const baseVariables = {
+                    DD_KMS_API_KEY: '5678',
+                    DD_MERGE_XRAY_TRACES: 'false',
+                    DD_SITE: 'datadoghq.com',
+                    DD_TRACE_ENABLED: 'false',
+                };
+                const compatibleTracerAndExtension = {
+                    Environment: {
+                        Variables: Object.assign(Object.assign({}, baseVariables), { AWS_LAMBDA_EXEC_WRAPPER: '/opt/datadog_wrapper' }),
+                    },
+                    FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
                     Layers: [
-                        { Arn: 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:22' },
-                        { Arn: 'arn:aws:lambda:us-east-1:464622532012:layer:AnotherLayer:10' },
+                        'arn:aws:lambda:us-east-1:123456789012:layer:Datadog-Extension:25',
+                        'arn:aws:lambda:us-east-1:123456789012:layer:dd-trace-dotnet:4',
                     ],
-                    Runtime: 'nodejs12.x',
-                },
-            });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                flushMetricsToLogs: false,
-                layerVersion: 23,
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const config = (yield lambda
-                .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
-                .promise()).Configuration;
-            const result = yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings);
-            expect((_a = result.updateRequest) === null || _a === void 0 ? void 0 : _a.Layers).toMatchInlineSnapshot(`
-                      Array [
-                        "arn:aws:lambda:us-east-1:464622532012:layer:AnotherLayer:10",
-                        "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:23",
-                      ]
-                `);
-        }));
-        test('returns configurations without updateRequest when no changes need to be made', () => __awaiter(void 0, void 0, void 0, function* () {
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
+                };
+                const oldExtensionVersion = {
                     Environment: {
-                        Variables: {
-                            [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'false',
-                            [constants_1.LAMBDA_HANDLER_ENV_VAR]: 'index.handler',
-                            [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',
-                        },
+                        Variables: Object.assign(Object.assign({}, baseVariables), { 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' }),
                     },
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Handler: '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler',
-                    Layers: [{ Arn: 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:22' }],
-                    Runtime: 'nodejs12.x',
-                },
-            });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                flushMetricsToLogs: false,
-                layerVersion: 22,
-                logLevel: 'debug',
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const config = (yield lambda
-                .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
-                .promise()).Configuration;
-            expect((yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings))
-                .updateRequest).toBeUndefined();
-        }));
-        test('uses the GovCloud lambda layer when a GovCloud region is detected', () => __awaiter(void 0, void 0, void 0, function* () {
-            var _b;
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws-us-gov:lambda:us-gov-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws-us-gov:lambda:us-gov-east-1:000000000000:function:autoinstrument',
-                    Runtime: 'nodejs12.x',
-                },
-            });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                flushMetricsToLogs: false,
-                layerVersion: 30,
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const config = (yield lambda
-                .getFunction({ FunctionName: 'arn:aws-us-gov:lambda:us-gov-east-1:000000000000:function:autoinstrument' })
-                .promise()).Configuration;
-            const result = yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-gov-east-1', settings);
-            expect((_b = result.updateRequest) === null || _b === void 0 ? void 0 : _b.Layers).toMatchInlineSnapshot(`
-                      Array [
-                        "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node12-x:30",
-                      ]
-                `);
-        }));
-        test('requests log group configuration when forwarderARN is set', () => __awaiter(void 0, void 0, void 0, function* () {
-            ;
-            loggroup.calculateLogGroupUpdateRequest.mockImplementation(() => ({ logGroupName: '/aws/lambda/group' }));
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
-                },
-            });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                flushMetricsToLogs: false,
-                forwarderARN: 'my-forwarder',
-                layerVersion: 22,
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const config = (yield lambda
-                .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
-                .promise()).Configuration;
-            const result = yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings);
-            expect(result).toBeDefined();
-            expect(result.logGroupConfiguration).toMatchInlineSnapshot(`
-                Object {
-                  "logGroupName": "/aws/lambda/group",
-                }
-            `);
-        }));
-    });
-    describe('getInstrumentedFunctionConfigs', () => {
-        const OLD_ENV = process.env;
-        beforeEach(() => {
-            jest.resetModules();
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = OLD_ENV;
-        });
-        test('returns the update request for each function', () => __awaiter(void 0, void 0, void 0, function* () {
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
-                },
+                    FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    Layers: [
+                        'arn:aws:lambda:us-east-1:123456789012:layer:Datadog-Extension:23',
+                        'arn:aws:lambda:us-east-1:123456789012:layer:dd-trace-dotnet:2',
+                    ],
+                };
+                const traceUndefined = {
+                    Environment: {
+                        Variables: Object.assign(Object.assign({}, baseVariables), { 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' }),
+                    },
+                    FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    Layers: ['arn:aws:lambda:us-east-1:123456789012:layer:Datadog-Extension:15'],
+                };
+                test.each `
+          extensionVersion | traceVersion | outputResult
+          ${25}            | ${4}         | ${compatibleTracerAndExtension}
+          ${23}            | ${2}         | ${oldExtensionVersion}
+          ${15}            | ${undefined} | ${traceUndefined}
+        `('should the output match the expected if extensionVersion=$extensionVersion and traceVersion=$traceVersion', ({ extensionVersion, traceVersion, outputResult }) => __awaiter(void 0, void 0, void 0, function* () {
+                    const curSettings = Object.assign(Object.assign({}, settings), { extensionVersion, layerVersion: traceVersion });
+                    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = '5678';
+                    const updateRequest = yield instrument_1.calculateUpdateRequest(dotNetConfig, curSettings, region, dotnetRuntime);
+                    expect(updateRequest).toEqual(outputResult);
+                }));
             });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                environment: 'staging',
-                flushMetricsToLogs: false,
-                layerVersion: 22,
-                logLevel: 'debug',
-                mergeXrayTraces: false,
-                service: 'middletier',
-                tracingEnabled: false,
-                version: '0.2',
-            };
-            const result = yield instrument_1.getInstrumentedFunctionConfigs(lambda, cloudWatch, 'us-east-1', ['arn:aws:lambda:us-east-1:000000000000:function:autoinstrument'], settings);
-            expect(result.length).toEqual(1);
-            expect(result[0].updateRequest).toMatchInlineSnapshot(`
-        Object {
-          "Environment": Object {
-            "Variables": Object {
-              "DD_ENV": "staging",
-              "DD_FLUSH_TO_LOG": "false",
-              "DD_LAMBDA_HANDLER": "index.handler",
-              "DD_LOG_LEVEL": "debug",
-              "DD_MERGE_XRAY_TRACES": "false",
-              "DD_SERVICE": "middletier",
-              "DD_SITE": "datadoghq.com",
-              "DD_TRACE_ENABLED": "false",
-              "DD_VERSION": "0.2",
-            },
-          },
-          "FunctionName": "arn:aws:lambda:us-east-1:000000000000:function:autoinstrument",
-          "Handler": "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler",
-          "Layers": Array [
-            "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:22",
-          ],
-        }
-      `);
-        }));
-        test('returns results for multiple functions', () => __awaiter(void 0, void 0, void 0, function* () {
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:another-func': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:another-func',
-                    Runtime: 'nodejs12.x',
-                },
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
+            describe(`test for runtime ${javaRuntime}`, () => {
+                const javaConfig = Object.assign(Object.assign({}, config), { Runtime: javaRuntime });
+                test('should throw error when the extension version and trace version are not compatible', () => __awaiter(void 0, void 0, void 0, function* () {
+                    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = '5678';
+                    const badSettings = Object.assign(Object.assign({}, settings), { extensionVersion: 24, layerVersion: 4 });
+                    let error;
+                    try {
+                        yield instrument_1.calculateUpdateRequest(javaConfig, badSettings, region, javaRuntime);
+                    }
+                    catch (e) {
+                        if (e instanceof Error) {
+                            error = e;
+                        }
+                    }
+                    expect(error === null || error === void 0 ? void 0 : error.message).toBe(`For the ${javaRuntime} runtime, the dd-trace version 4 is not compatible with the dd-extension version 24`);
+                }));
+                const baseVariables = {
+                    DD_KMS_API_KEY: '5678',
+                    DD_MERGE_XRAY_TRACES: 'false',
+                    DD_SITE: 'datadoghq.com',
+                    DD_TRACE_ENABLED: 'false',
+                };
+                const compatibleTracerAndExtension = {
                     Environment: {
-                        Variables: {
-                            [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'false',
-                            [constants_1.LAMBDA_HANDLER_ENV_VAR]: 'index.handler',
-                            [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',
-                        },
+                        Variables: Object.assign(Object.assign({}, baseVariables), { AWS_LAMBDA_EXEC_WRAPPER: '/opt/datadog_wrapper' }),
                     },
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Runtime: 'nodejs12.x',
-                },
+                    FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    Layers: [
+                        'arn:aws:lambda:us-east-1:123456789012:layer:Datadog-Extension:25',
+                        'arn:aws:lambda:us-east-1:123456789012:layer:dd-trace-java:5',
+                    ],
+                };
+                const oldExtensionVersion = {
+                    Environment: {
+                        Variables: Object.assign({}, baseVariables),
+                    },
+                    FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    Layers: [
+                        'arn:aws:lambda:us-east-1:123456789012:layer:Datadog-Extension:23',
+                        'arn:aws:lambda:us-east-1:123456789012:layer:dd-trace-java:2',
+                    ],
+                };
+                const traceUndefined = {
+                    Environment: {
+                        Variables: Object.assign({}, baseVariables),
+                    },
+                    FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                    Layers: ['arn:aws:lambda:us-east-1:123456789012:layer:Datadog-Extension:15'],
+                };
+                test.each `
+          extensionVersion | traceVersion | outputResult
+          ${25}            | ${5}         | ${compatibleTracerAndExtension}
+          ${23}            | ${2}         | ${oldExtensionVersion}
+          ${15}            | ${undefined} | ${traceUndefined}
+        `('should the output match the expected if extensionVersion=$extensionVersion and traceVersion=$traceVersion', ({ extensionVersion, traceVersion, outputResult }) => __awaiter(void 0, void 0, void 0, function* () {
+                    const curSettings = Object.assign(Object.assign({}, settings), { extensionVersion, layerVersion: traceVersion });
+                    process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = '5678';
+                    const updateRequest = yield instrument_1.calculateUpdateRequest(javaConfig, curSettings, region, javaRuntime);
+                    expect(updateRequest).toEqual(outputResult);
+                }));
             });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                environment: 'staging',
-                flushMetricsToLogs: false,
-                layerVersion: 23,
-                mergeXrayTraces: false,
-                service: 'middletier',
-                tracingEnabled: false,
-                version: '0.2',
-            };
-            const result = yield instrument_1.getInstrumentedFunctionConfigs(lambda, cloudWatch, 'us-east-1', [
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                'arn:aws:lambda:us-east-1:000000000000:function:another-func',
-            ], settings);
-            expect(result.length).toEqual(2);
-        }));
-    });
-    describe('getInstrumentedFunctionConfigsFromRegEx', () => {
-        const OLD_ENV = process.env;
-        beforeEach(() => {
-            jest.resetModules();
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = OLD_ENV;
         });
-        test('returns the update request for each function that matches the pattern', () => __awaiter(void 0, void 0, void 0, function* () {
-            const lambda = fixtures_1.makeMockLambda({
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scooby': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scooby',
-                    FunctionName: 'autoinstrument-scooby',
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
-                },
-                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scr.': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scr.',
-                    FunctionName: 'autoinstrument-scr.',
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
-                },
-            });
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                flushMetricsToLogs: false,
-                layerVersion: 22,
-                logLevel: 'debug',
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const result = yield instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'autoinstrument-scr.', settings);
-            expect(result.length).toEqual(1);
-            expect(result[0].updateRequest).toMatchInlineSnapshot(`
-        Object {
-          "Environment": Object {
-            "Variables": Object {
-              "DD_FLUSH_TO_LOG": "false",
-              "DD_LAMBDA_HANDLER": "index.handler",
-              "DD_LOG_LEVEL": "debug",
-              "DD_MERGE_XRAY_TRACES": "false",
-              "DD_SITE": "datadoghq.com",
-              "DD_TRACE_ENABLED": "false",
-            },
-          },
-          "FunctionName": "arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scr.",
-          "Handler": "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler",
-          "Layers": Array [
-            "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:22",
-          ],
-        }
-      `);
-        }));
-        test('fails when retry count is exceeded', () => __awaiter(void 0, void 0, void 0, function* () {
-            const makeMockLambdaListFunctionsError = () => ({
-                listFunctions: jest.fn().mockImplementation((args) => ({
-                    promise: () => Promise.reject('ListFunctionsError'),
-                })),
-            });
-            const lambda = makeMockLambdaListFunctionsError();
-            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const settings = {
-                flushMetricsToLogs: false,
-                layerVersion: 22,
-                logLevel: 'debug',
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded. ListFunctionsError'));
-        }));
     });
 });
-//# sourceMappingURL=instrument.test.js.map
+//# sourceMappingURL=instrument.part2.test.js.map

package/dist/commands/lambda/__tests__/functions/instrument.part2.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrument.part2.test.js","sourceRoot":"","sources":["../../../../../src/commands/lambda/__tests__/functions/instrument.part2.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;AAE3B,+CAAyG;AACzG,2DAAiE;AAGjE,0CAA0C;AAE1C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAA;QAC3B,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,YAAY,EAAE,CAAA;YACnB,OAAO,CAAC,GAAG,GAAG,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,GAAG,OAAO,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,8DAA8D,EAAE,GAAS,EAAE;YAC9E,MAAM,OAAO,GAAG,YAAY,CAAA;YAC5B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAE1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;OAiB3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,kFAAkF,EAAE,GAAS,EAAE;YAClG,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,MAAM,MAAM,GAAG;gBACb,aAAa,EAAE,CAAC,OAAO,CAAC;gBACxB,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,EAAE;gBAChB,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAE1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;OAiB3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,oFAAoF,EAAE,GAAS,EAAE;YACpG,OAAO,CAAC,GAAG,CAAC,8BAAkB,CAAC,GAAG,MAAM,CAAA;YACxC,MAAM,OAAO,GAAG,YAAY,CAAA;YAC5B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,gBAAgB,EAAE,CAAC;gBACnB,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAE1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;OAkB3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,+FAA+F,EAAE,GAAS,EAAE;YAC/G,OAAO,CAAC,GAAG,CAAC,yCAA6B,CAAC,GAAG,0BAA0B,CAAA;YACvE,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,gBAAgB,EAAE,EAAE;gBACpB,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,EAAE;gBAChB,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;OAkB3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,wFAAwF,EAAE,GAAS,EAAE;YACxG,OAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,GAAG,MAAM,CAAA;YAC5C,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,gBAAgB,EAAE,CAAC;gBACnB,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAE1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;OAkB3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,2DAA2D,EAAE,GAAS,EAAE;YAC3E,OAAO,CAAC,GAAG,GAAG;gBACZ,CAAC,8BAAkB,CAAC,EAAE,MAAM;gBAC5B,CAAC,yCAA6B,CAAC,EAAE,MAAM;gBACvC,CAAC,kCAAsB,CAAC,EAAE,oBAAoB;aAC/C,CAAA;YAED,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;aACX,CAAA;YACD,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,EAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACtF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;OAY3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,2DAA2D,EAAE,GAAS,EAAE;YAC3E,OAAO,CAAC,GAAG,CAAC,8BAAkB,CAAC,GAAG,MAAM,CAAA;YAExC,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;aACX,CAAA;YACD,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,QAAQ,GAA4B;gBACxC,gBAAgB,EAAE,EAAE;gBACpB,kBAAkB,EAAE,IAAI;gBACxB,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;OAiB3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,sFAAsF,EAAE,GAAS,EAAE;YACtG,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAE1B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;OAc3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,0EAA0E,EAAE,GAAS,EAAE;YAC1F,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,cAAc,CAAA;YACzC,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;aACX,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,OAAO,GAAG,WAAW,CAAA;YAE3B,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACrF,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;OAc3C,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,2DAA2D,EAAE,GAAS,EAAE;YAC3E,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,cAAc,CAAA;YACzC,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;aACX,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,WAAW,EAAE,KAAK;gBAClB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,IAAI,KAAK,CAAA;YACT,IAAI;gBACF,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;aAChE;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,YAAY,KAAK,EAAE;oBACtB,KAAK,GAAG,CAAC,CAAA;iBACV;aACF;YACD,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,CACzB,+HAA+H,CAChI,CAAA;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,qIAAqI,EAAE,GAAS,EAAE;YACrJ,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;aACX,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,gBAAgB,EAAE,CAAC;gBACnB,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,OAAO,GAAG,WAAW,CAAA;YAC3B,IAAI,KAAK,CAAA;YACT,IAAI;gBACF,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;aAChE;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,YAAY,KAAK,EAAE;oBACtB,KAAK,GAAG,CAAC,CAAA;iBACV;aACF;YACD,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,CACzB,oHAAoH,CACrH,CAAA;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,oGAAoG,EAAE,GAAS,EAAE;YACpH,OAAO,CAAC,GAAG,CAAC,yCAA6B,CAAC,GAAG,0BAA0B,CAAA;YACvE,MAAM,OAAO,GAAG,YAAY,CAAA;YAC5B,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,OAAO;aACjB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,EAAE;gBAChB,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,IAAI,KAAK,CAAA;YACT,IAAI;gBACF,MAAM,mCAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;aAChE;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,YAAY,KAAK,EAAE;oBACtB,KAAK,GAAG,CAAC,CAAA;iBACV;aACF;YACD,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,CACzB,0HAA0H,CAC3H,CAAA;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,QAAQ,CAAC,2DAA2D,EAAE,GAAG,EAAE;YACzE,MAAM,MAAM,GAAG,WAAW,CAAA;YAC1B,MAAM,MAAM,GAAG;gBACb,WAAW,EAAE,mEAAmE;gBAChF,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,SAAS;aACnB,CAAA;YACD,MAAM,QAAQ,GAAG;gBACf,kBAAkB,EAAE,KAAK;gBACzB,eAAe,EAAE,yBAAc;gBAC/B,YAAY,EAAE,EAAE;gBAChB,eAAe,EAAE,KAAK;gBACtB,cAAc,EAAE,KAAK;aACtB,CAAA;YACD,MAAM,aAAa,GAAG,SAAS,CAAA;YAC/B,MAAM,WAAW,GAAG,QAAQ,CAAA;YAE5B,QAAQ,CAAC,oBAAoB,aAAa,EAAE,EAAE,GAAG,EAAE;gBACjD,MAAM,YAAY,mCAAO,MAAM,KAAE,OAAO,EAAE,aAAa,GAAC,CAAA;gBACxD,MAAM,mBAAmB,mCAAO,MAAM,KAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,OAAO,CAAC,GAAC,CAAA;gBACzF,IAAI,CAAC,oFAAoF,EAAE,GAAS,EAAE;oBACpG,OAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,GAAG,MAAM,CAAA;oBAC5C,MAAM,WAAW,mCAAO,QAAQ,KAAE,gBAAgB,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,GAAC,CAAA;oBACxE,IAAI,KAAK,CAAA;oBACT,IAAI;wBACF,MAAM,mCAAsB,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;qBAC/E;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,YAAY,KAAK,EAAE;4BACtB,KAAK,GAAG,CAAC,CAAA;yBACV;qBACF;oBACD,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,CACzB,WAAW,aAAa,qFAAqF,CAC9G,CAAA;gBACH,CAAC,CAAA,CAAC,CAAA;gBAEF,IAAI,CAAC,+EAA+E,EAAE,GAAS,EAAE;oBAC/F,OAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,GAAG,MAAM,CAAA;oBAC5C,MAAM,WAAW,mCAAO,QAAQ,KAAE,gBAAgB,EAAE,EAAE,GAAC,CAAA;oBACvD,IAAI,KAAK,CAAA;oBACT,IAAI;wBACF,MAAM,mCAAsB,CAAC,mBAAmB,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;qBACtF;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,YAAY,KAAK,EAAE;4BACtB,KAAK,GAAG,CAAC,CAAA;yBACV;qBACF;oBACD,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,CACzB,iKAAiK,CAClK,CAAA;gBACH,CAAC,CAAA,CAAC,CAAA;gBAEF,MAAM,aAAa,GAAG;oBACpB,cAAc,EAAE,MAAM;oBACtB,oBAAoB,EAAE,OAAO;oBAC7B,OAAO,EAAE,eAAe;oBACxB,gBAAgB,EAAE,OAAO;iBAC1B,CAAA;gBACD,MAAM,4BAA4B,GAAG;oBACnC,WAAW,EAAE;wBACX,SAAS,kCAAM,aAAa,KAAE,uBAAuB,EAAE,sBAAsB,GAAC;qBAC/E;oBACD,YAAY,EAAE,mEAAmE;oBACjF,MAAM,EAAE;wBACN,kEAAkE;wBAClE,+DAA+D;qBAChE;iBACF,CAAA;gBACD,MAAM,mBAAmB,GAAG;oBAC1B,WAAW,EAAE;wBACX,SAAS,kCACJ,aAAa,KAChB,wBAAwB,EAAE,GAAG,EAC7B,gBAAgB,EAAE,wCAAwC,EAC1D,qBAAqB,EAAE,kDAAkD,EACzE,qBAAqB,EAAE,cAAc,GACtC;qBACF;oBACD,YAAY,EAAE,mEAAmE;oBACjF,MAAM,EAAE;wBACN,kEAAkE;wBAClE,+DAA+D;qBAChE;iBACF,CAAA;gBACD,MAAM,cAAc,GAAG;oBACrB,WAAW,EAAE;wBACX,SAAS,kCACJ,aAAa,KAChB,wBAAwB,EAAE,GAAG,EAC7B,gBAAgB,EAAE,wCAAwC,EAC1D,qBAAqB,EAAE,kDAAkD,EACzE,qBAAqB,EAAE,cAAc,GACtC;qBACF;oBACD,YAAY,EAAE,mEAAmE;oBACjF,MAAM,EAAE,CAAC,kEAAkE,CAAC;iBAC7E,CAAA;gBAED,IAAI,CAAC,IAAI,CAAA;;YAEL,EAAE,iBAAiB,CAAC,cAAc,4BAA4B;YAC9D,EAAE,iBAAiB,CAAC,cAAc,mBAAmB;YACrD,EAAE,iBAAiB,SAAS,MAAM,cAAc;SACnD,CACC,2GAA2G,EAC3G,CAAO,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,EAAE,EAAE;oBACvD,MAAM,WAAW,mCAAO,QAAQ,KAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,GAAC,CAAA;oBAC/E,OAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,GAAG,MAAM,CAAA;oBAC5C,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;oBACpG,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC7C,CAAC,CAAA,CACF,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,QAAQ,CAAC,oBAAoB,WAAW,EAAE,EAAE,GAAG,EAAE;gBAC/C,MAAM,UAAU,mCAAO,MAAM,KAAE,OAAO,EAAE,WAAW,GAAC,CAAA;gBAEpD,IAAI,CAAC,oFAAoF,EAAE,GAAS,EAAE;oBACpG,OAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,GAAG,MAAM,CAAA;oBAC5C,MAAM,WAAW,mCAAO,QAAQ,KAAE,gBAAgB,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,GAAC,CAAA;oBACxE,IAAI,KAAK,CAAA;oBACT,IAAI;wBACF,MAAM,mCAAsB,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;qBAC3E;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,YAAY,KAAK,EAAE;4BACtB,KAAK,GAAG,CAAC,CAAA;yBACV;qBACF;oBACD,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,CACzB,WAAW,WAAW,qFAAqF,CAC5G,CAAA;gBACH,CAAC,CAAA,CAAC,CAAA;gBAEF,MAAM,aAAa,GAAG;oBACpB,cAAc,EAAE,MAAM;oBACtB,oBAAoB,EAAE,OAAO;oBAC7B,OAAO,EAAE,eAAe;oBACxB,gBAAgB,EAAE,OAAO;iBAC1B,CAAA;gBACD,MAAM,4BAA4B,GAAG;oBACnC,WAAW,EAAE;wBACX,SAAS,kCAAM,aAAa,KAAE,uBAAuB,EAAE,sBAAsB,GAAC;qBAC/E;oBACD,YAAY,EAAE,mEAAmE;oBACjF,MAAM,EAAE;wBACN,kEAAkE;wBAClE,6DAA6D;qBAC9D;iBACF,CAAA;gBACD,MAAM,mBAAmB,GAAG;oBAC1B,WAAW,EAAE;wBACX,SAAS,oBACJ,aAAa,CACjB;qBACF;oBACD,YAAY,EAAE,mEAAmE;oBACjF,MAAM,EAAE;wBACN,kEAAkE;wBAClE,6DAA6D;qBAC9D;iBACF,CAAA;gBACD,MAAM,cAAc,GAAG;oBACrB,WAAW,EAAE;wBACX,SAAS,oBACJ,aAAa,CACjB;qBACF;oBACD,YAAY,EAAE,mEAAmE;oBACjF,MAAM,EAAE,CAAC,kEAAkE,CAAC;iBAC7E,CAAA;gBAED,IAAI,CAAC,IAAI,CAAA;;YAEL,EAAE,iBAAiB,CAAC,cAAc,4BAA4B;YAC9D,EAAE,iBAAiB,CAAC,cAAc,mBAAmB;YACrD,EAAE,iBAAiB,SAAS,MAAM,cAAc;SACnD,CACC,2GAA2G,EAC3G,CAAO,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,EAAE,EAAE;oBACvD,MAAM,WAAW,mCAAO,QAAQ,KAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,GAAC,CAAA;oBAC/E,OAAO,CAAC,GAAG,CAAC,kCAAsB,CAAC,GAAG,MAAM,CAAA;oBAC5C,MAAM,aAAa,GAAG,MAAM,mCAAsB,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;oBAChG,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC7C,CAAC,CAAA,CACF,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/commands/lambda/__tests__/functions/versionChecker.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("../../constants");
+const versionChecker_1 = require("../../functions/versionChecker");
+describe('Test extension and trace version checker', () => {
+    test.each `
+    runtimeType           | extensionVersion | result
+    ${constants_1.RuntimeType.JAVA}   | ${27}            | ${true}
+    ${constants_1.RuntimeType.JAVA}   | ${23}            | ${false}
+    ${constants_1.RuntimeType.JAVA}   | ${undefined}     | ${false}
+    ${constants_1.RuntimeType.DOTNET} | ${27}            | ${true}
+    ${constants_1.RuntimeType.DOTNET} | ${23}            | ${false}
+    ${constants_1.RuntimeType.DOTNET} | ${undefined}     | ${false}
+    ${constants_1.RuntimeType.NODE}   | ${27}            | ${true}
+    ${constants_1.RuntimeType.PYTHON} | ${23}            | ${true}
+  `('should function isExtensionSupportUniversalInstrumentation() return $result if runtimeType=$runtimeType and extensionVersion=$extensionVersion', ({ runtimeType, extensionVersion, result }) => {
+        expect(versionChecker_1.isExtensionCompatibleWithUniversalInstrumentation(runtimeType, extensionVersion)).toEqual(result);
+    });
+    test.each `
+    runtimeType           | traceVersion | result
+    ${constants_1.RuntimeType.JAVA}   | ${5}         | ${true}
+    ${constants_1.RuntimeType.JAVA}   | ${4}         | ${false}
+    ${constants_1.RuntimeType.JAVA}   | ${undefined} | ${true}
+    ${constants_1.RuntimeType.DOTNET} | ${3}         | ${false}
+    ${constants_1.RuntimeType.DOTNET} | ${4}         | ${true}
+    ${constants_1.RuntimeType.DOTNET} | ${undefined} | ${true}
+    ${constants_1.RuntimeType.NODE}   | ${8}         | ${true}
+    ${constants_1.RuntimeType.PYTHON} | ${2}         | ${true}
+  `('should function isExtensionCompatibleWithTrace() return $result if runtimeType=$runtimeType and traceVersion=$traceVersion', ({ runtimeType, traceVersion, result }) => {
+        expect(versionChecker_1.isTracerCompatibleWithExtension(runtimeType, traceVersion)).toEqual(result);
+    });
+});
+//# sourceMappingURL=versionChecker.test.js.map

package/dist/commands/lambda/__tests__/functions/versionChecker.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"versionChecker.test.js","sourceRoot":"","sources":["../../../../../src/commands/lambda/__tests__/functions/versionChecker.test.ts"],"names":[],"mappings":";;AAAA,+CAA2C;AAC3C,mEAGuC;AAEvC,QAAQ,CAAC,0CAA0C,EAAE,GAAG,EAAE;IACxD,IAAI,CAAC,IAAI,CAAA;;MAEL,uBAAW,CAAC,IAAI,QAAQ,EAAE,iBAAiB,IAAI;MAC/C,uBAAW,CAAC,IAAI,QAAQ,EAAE,iBAAiB,KAAK;MAChD,uBAAW,CAAC,IAAI,QAAQ,SAAS,UAAU,KAAK;MAChD,uBAAW,CAAC,MAAM,MAAM,EAAE,iBAAiB,IAAI;MAC/C,uBAAW,CAAC,MAAM,MAAM,EAAE,iBAAiB,KAAK;MAChD,uBAAW,CAAC,MAAM,MAAM,SAAS,UAAU,KAAK;MAChD,uBAAW,CAAC,IAAI,QAAQ,EAAE,iBAAiB,IAAI;MAC/C,uBAAW,CAAC,MAAM,MAAM,EAAE,iBAAiB,IAAI;GAClD,CACC,gJAAgJ,EAChJ,CAAC,EAAC,WAAW,EAAE,gBAAgB,EAAE,MAAM,EAAC,EAAE,EAAE;QAC1C,MAAM,CAAC,kEAAiD,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1G,CAAC,CACF,CAAA;IAED,IAAI,CAAC,IAAI,CAAA;;MAEL,uBAAW,CAAC,IAAI,QAAQ,CAAC,cAAc,IAAI;MAC3C,uBAAW,CAAC,IAAI,QAAQ,CAAC,cAAc,KAAK;MAC5C,uBAAW,CAAC,IAAI,QAAQ,SAAS,MAAM,IAAI;MAC3C,uBAAW,CAAC,MAAM,MAAM,CAAC,cAAc,KAAK;MAC5C,uBAAW,CAAC,MAAM,MAAM,CAAC,cAAc,IAAI;MAC3C,uBAAW,CAAC,MAAM,MAAM,SAAS,MAAM,IAAI;MAC3C,uBAAW,CAAC,IAAI,QAAQ,CAAC,cAAc,IAAI;MAC3C,uBAAW,CAAC,MAAM,MAAM,CAAC,cAAc,IAAI;GAC9C,CACC,4HAA4H,EAC5H,CAAC,EAAC,WAAW,EAAE,YAAY,EAAE,MAAM,EAAC,EAAE,EAAE;QACtC,MAAM,CAAC,gDAA+B,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpF,CAAC,CACF,CAAA;AACH,CAAC,CAAC,CAAA"}

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

@@ -1314,43 +1314,6 @@ ${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. ListFunctionsError
 "
-`);
-            }));
-            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* () {
@@ -1461,7 +1424,7 @@ ${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. Error: Max retry coun
                 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.
+"${chalk_1.red('[Error]')} Couldn't fetch Lambda functions. 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.
 "
 `);
             }));