@datadog/datadog-ci-plugin-lambda 4.3.0 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/README.md +57 -48
  2. package/dist/commands/instrument.js +34 -28
  3. package/dist/commands/instrument.js.map +1 -1
  4. package/dist/constants.d.ts +8 -6
  5. package/dist/constants.js +11 -6
  6. package/dist/constants.js.map +1 -1
  7. package/dist/functions/commons.d.ts +5 -6
  8. package/dist/functions/commons.js +19 -60
  9. package/dist/functions/commons.js.map +1 -1
  10. package/dist/functions/instrument.js +23 -13
  11. package/dist/functions/instrument.js.map +1 -1
  12. package/dist/interfaces.d.ts +3 -2
  13. package/package.json +2 -2
package/README.md CHANGED
@@ -81,49 +81,55 @@ Configuration can be done using command-line arguments or a JSON configuration f
81
81
  #### `instrument`
82
82
  You can pass the following arguments to `instrument` to specify its behavior. These arguments will override the values set in the configuration file, if any.
83
83
 
84
- | Argument | Shorthand | Description | Default |
85
- |--------------------------------| --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |---------|
86
- | `--function` | `-f` | The ARN of the Lambda function to be **instrumented**, or the name of the Lambda function (`--region` must be defined). | |
87
- | `--functions-regex` | | A regex pattern to match with the Lambda function name. | |
88
- | `--interactive` | `-i` | Allows the user to interactively choose how their function gets instrumented. There is no need to provide any other flags if you choose to use interactive mode since you will be prompted for the information instead. | |
89
- | `--region` | `-r` | Default region to use, when `--function` is specified by the function name instead of the ARN. | |
90
- | `--service` | | Use `--service` to group related functions belonging to similar workloads. Learn more about the `service` tag [here][8]. | |
91
- | `--version` | | Add the `--version` tag to correlate spikes in latency, load or errors to new versions. Learn more about the `version` tag [here][7]. | |
92
- | `--env` | | Use `--env` to separate out your staging, development, and production environments. Learn more about the `env` tag [here][6]. | |
93
- | `--extra-tags` | | Add custom tags to your Lambda function in Datadog. Must be a list of `<key>:<value>` separated by commas such as: `layer:api,team:intake`. | |
94
- | `--profile` | | Specify the AWS named profile credentials to use to instrument. Learn more about AWS named profiles [here][11]. | |
95
- | `--layer-version` | `-v` | Version of the Datadog Lambda Library layer to apply. This varies between runtimes. To see the latest layer version check the [JS][2] or [python][3] datadog-lambda-layer repo release notes. | |
96
- | `--extension-version` | `-e` | Version of the Datadog Lambda Extension layer to apply. When `extension-version` is set, make sure to export `DATADOG_API_KEY` (or if encrypted, `DATADOG_KMS_API_KEY` or `DATADOG_API_KEY_SECRET_ARN`) in your environment as well. While using `extension-version`, leave out `forwarder`. Learn more about the Lambda Extension [here][4]. | |
97
- | `--tracing` | | Whether to enable dd-trace tracing on your Lambda. | `true` |
98
- | `--merge-xray-traces` | | Whether to join dd-trace traces to AWS X-Ray traces. Useful for tracing API Gateway spans. | `false` |
99
- | `--flush-metrics-to-logs` | | Whether to send metrics via the Datadog Forwarder [asynchronously][10]. If you disable this parameter, it's required to export `DATADOG_API_KEY` (or if encrypted, `DATADOG_KMS_API_KEY` or `DATADOG_API_KEY_SECRET_ARN`). | `true` |
100
- | `--capture-lambda-payload` | | Whether to capture and store the payload and response of a lambda invocation. | `false` |
101
- | `--forwarder` | | The ARN of the [datadog forwarder][9] to attach this function's LogGroup to. | |
102
- | `--dry-run` | `-d` | Preview changes running command would apply. | `false` |
103
- | `--logging` | | Whether to collect logs using the Lambda Extension. | `true` |
104
- | `--log-level` | | Set to `debug` to see additional output from the Datadog Lambda Library and/or Lambda Extension for troubleshooting purposes. | |
105
- | `--source-code-integration` | `-s` | Whether to enable [Datadog Source Code Integration][12]. This will tag your lambda(s) with the Git repository URL and the latest commit hash of the current local directory. **Note**: Git repository must not be ahead of remote, and must not be dirty. | `true` |
106
- | `--no-source-code-integration` | | Disables Datadog Source Code Integration. | |
107
- | `--upload-git-metadata` | `-u` | Whether to enable Git metadata uploading, as a part of source code integration. Git metadata uploading is only required if you don't have the Datadog Github Integration installed. | `true` |
108
- | `--no-upload-git-metadata` | | Disables Git metadata uploading, as a part of source code integration. Use this flag if you have the Datadog Github Integration installed, as it renders Git metadata uploading unnecessary. | |
109
- | `--apm-flush-deadline` | | Used to determine when to submit spans before a timeout occurs, in milliseconds. When the remaining time in an AWS Lambda invocation is less than the value set, the tracer attempts to submit the current active spans and all finished spans. Supported for NodeJS and Python. Defaults to `100` milliseconds. | |
110
- | `--llmobs` | | If specified, enables LLM Observability for the instrumented function(s) with the provided ML application name. | `false` |
111
- | `--lambda-fips` | | Enable FIPS support in the Lambda functions deployed using this tool. Note that for full FIPS compliance, a FIPS endpoint such as `ddog-gov.com` is required. | |
112
- <br />
84
+ <!-- BEGIN_USAGE:instrument -->
85
+ | Argument | Shorthand | Description | Default |
86
+ | -------- | --------- | ----------- | ------- |
87
+ | `--apm-flush-deadline` | | Used to determine when to submit spans before a timeout occurs, in milliseconds. When the remaining time in an AWS Lambda invocation is less than the value set, the tracer attempts to submit the current active spans and all finished spans. Supported for NodeJS and Python. | `100` |
88
+ | `--appsec` | | Enable Application Security Monitoring for the Lambda function. | `false` |
89
+ | `--capture-lambda-payload` or `--captureLambdaPayload` | | Whether to capture and store the payload and response of a lambda invocation. | `false` |
90
+ | `--config` | | Path to the configuration file | |
91
+ | `--dry` or `--dry-run` | `-d` | Preview changes running command would apply | `false` |
92
+ | `--env` | | Use --env to separate out your staging, development, and production environments. Learn more about the env tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-env-tag | |
93
+ | `--extension-version` or `--extensionVersion` | `-e` | Version of the Datadog Lambda Extension layer to apply. Setting this to 'latest' will use version 90. When using the extension, make sure to export DATADOG_API_KEY (or if encrypted, DATADOG_KMS_API_KEY or DATADOG_API_KEY_SECRET_ARN) in your environment as well. Mutually exclusive with the forwarder. Set to 'none' to explicitly disable adding the extension layer. Learn more about the Lambda Extension here: https://docs.datadoghq.com/serverless/libraries_integrations/extension | `latest` |
94
+ | `--extra-tags` or `--extraTags` | | Add custom tags to your Lambda function in Datadog. Must be a list of <key>:<value> separated by commas such as: layer:api,team:intake | |
95
+ | `--flush-metrics-to-logs` or `--flushMetricsToLogs` | | Whether to send metrics via the Datadog Forwarder asynchronously (https://docs.datadoghq.com/serverless/custom_metrics?tab=python#enabling-asynchronous-custom-metrics). If you disable this parameter, it's required to export DATADOG_API_KEY (or if encrypted, DATADOG_KMS_API_KEY or DATADOG_API_KEY_SECRET_ARN). | `true` |
96
+ | `--forwarder` | | The ARN of the datadog forwarder (https://docs.datadoghq.com/logs/guide/forwarder/) to attach this function's LogGroup to | |
97
+ | `--function` | `-f` | The ARN of the Lambda function to be instrumented, or the name of the Lambda function (--region must be defined) | |
98
+ | `--interactive` | `-i` | Allows the user to interactively choose how their function gets instrumented. There is no need to provide any other flags if you choose to use interactive mode since you will be prompted for the information instead | `false` |
99
+ | `--layer-version` or `--layerVersion` | `-v` | Version of the Datadog Lambda Library layer to apply. Setting this to 'latest' will use one of the following versions based on your runtime: dotnet - 22, java - 24, node - 132, python - 120, ruby - 26. Setting to 'none' will disable adding the language layer. | `latest` |
100
+ | `--logging` | | Whether to collect logs using the Lambda Extension. | `true` |
101
+ | `--log-level` or `--logLevel` | | Set to debug to see additional output from the Datadog Lambda Library and/or Lambda Extension for troubleshooting purposes | |
102
+ | `--merge-xray-traces` or `--mergeXrayTraces` | | Whether to join dd-trace traces to AWS X-Ray traces. Useful for tracing API Gateway spans. | `false` |
103
+ | `--profile` | | Specify the AWS named profile credentials to use to instrument. Learn more about AWS named profiles here: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html#using-profiles | |
104
+ | `--functions-regex` or `--functionsRegex` | | A regex pattern to match with the Lambda function name | |
105
+ | `--region` | `-r` | Default region to use, when --function is specified by the function name instead of the ARN | |
106
+ | `--service` | | Use --service to group related functions belonging to similar workloads. Learn more about the service tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-service-tag | |
107
+ | `--source-code-integration` or `--sourceCodeIntegration` | `-s` | Whether to enable Datadog Source Code Integration (https://docs.datadoghq.com/integrations/guide/source-code-integration). This will tag your lambda(s) with the Git repository URL and the latest commit hash of the current local directory. Note: Git repository must not be ahead of remote, and must not be dirty. | `true` |
108
+ | `--upload-git-metadata` or `--uploadGitMetadata` | `-u` | Whether to enable Git metadata uploading, as a part of source code integration. Git metadata uploading is only required if you don't have the Datadog Github Integration installed. | `true` |
109
+ | `--tracing` | | Whether to enable dd-trace tracing on your Lambda. | `true` |
110
+ | `--version` | | Add the --version tag to correlate spikes in latency, load or errors to new versions. Learn more about the version tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-version-tag | |
111
+ | `--llmobs` | | If specified, enables LLM Observability for the instrumented function(s) with the provided ML application name. | `false` |
112
+ | `--lambda-fips` | | Enable FIPS support in the Lambda functions deployed using this tool. Note that for full FIPS compliance, a FIPS endpoint such as ddog-gov.com is required | `false` |
113
+ <!-- END_USAGE:instrument -->
114
+
113
115
 
114
116
  #### `uninstrument`
115
117
  The following arguments are passed to `uninstrument` to specify its behavior. These arguments will override the values set in the configuration file, if any.
116
118
 
117
119
  Any other argument stated on the `instrument` table, but not below, will be ignored, this to allow you to uninstrument quicker, if needed.
118
120
 
119
- | Argument | Shorthand | Description | Default |
120
- | ------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------- | ------- |
121
- | `--function` | `-f` | The ARN of the Lambda function to be **uninstrumented**, or the name of the Lambda function (`--region` must be defined). | |
122
- | `--functions-regex` | | A regex pattern to match with the Lambda function name to be **uninstrumented**. | |
123
- | `--region` | `-r` | Default region to use, when `--function` is specified by the function name instead of the ARN. | |
124
- | `--profile` | | Specify the AWS named profile credentials to use to uninstrument. Learn more about AWS named profiles [here][11]. | |
125
- | `--forwarder` | | The ARN of the [datadog forwarder][9] to remove from this function. | |
126
- | `--dry-run` | `-d` | Preview changes running command would apply. | `false` |
121
+ <!-- BEGIN_USAGE:uninstrument -->
122
+ | Argument | Shorthand | Description | Default |
123
+ | -------- | --------- | ----------- | ------- |
124
+ | `--config` | | Path to the configuration file | |
125
+ | `--dry` or `--dry-run` | `-d` | Preview changes running command would apply | `false` |
126
+ | `--forwarder` | | The ARN of the datadog forwarder (https://docs.datadoghq.com/logs/guide/forwarder/) to remove from this function | |
127
+ | `--function` | `-f` | The ARN of the Lambda function to be uninstrumented, or the name of the Lambda function (--region must be defined) | |
128
+ | `--interactive` | `-i` | Allows the user to interactively choose how their function gets uninstrumented. There is no need to provide any other flags if you choose to use interactive mode since you will be prompted for the information instead | `false` |
129
+ | `--profile` | | Specify the AWS named profile credentials to use to uninstrument. Learn more about AWS named profiles here: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html#using-profiles | |
130
+ | `--functions-regex` or `--functionsRegex` | | A regex pattern to match with the Lambda function name to be uninstrumented | |
131
+ | `--region` | `-r` | Default region to use, when --function is specified by the function name instead of the ARN | |
132
+ <!-- END_USAGE:uninstrument -->
127
133
 
128
134
  <br/>
129
135
 
@@ -172,15 +178,18 @@ datadog-ci lambda flare -f <function-arn> -c <case-id> -e <email-on-case-id> --w
172
178
 
173
179
  **Arguments**
174
180
 
175
- | Argument | Shorthand | Description | Default |
176
- | --------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------- |
177
- | `--function` | `-f` | The ARN of the Lambda function to gather data for, or the name of the Lambda function (`--region` must be defined). | |
178
- | `--region` | `-r` | Default region to use, when `--function` is specified by the function name instead of the ARN. | |
179
- | `--case-id` | `-c` | The Datadog case ID to send the files to. | |
180
- | `--email` | `-e` | The email associated with the specified case ID. | |
181
- | `--with-logs` | | Collect recent CloudWatch logs for the specified function. | `false` |
182
- | `--start` and `--end` | | Only gather logs within the time range (`--with-logs` must be included.) Both arguments are numbers in milliseconds since Unix Epoch. | |
183
- | `--dry-run` | `-d` | Preview collected data which would be sent to Datadog support. | `false` |
181
+ <!-- BEGIN_USAGE:flare -->
182
+ | Argument | Shorthand | Description | Default |
183
+ | -------- | --------- | ----------- | ------- |
184
+ | `--dry` or `--dry-run` | `-d` | Preview collected data which would be sent to Datadog support | `false` |
185
+ | `--with-logs` | | Collect recent CloudWatch logs for the specified function | `false` |
186
+ | `--function` | `-f` | The ARN of the Lambda function to gather data for, or the name of the Lambda function (--region must be defined) | |
187
+ | `--region` | `-r` | Default region to use, when --function is specified by the function name instead of the ARN | |
188
+ | `--case-id` | `-c` | The Datadog case ID to send the files to | |
189
+ | `--email` | `-e` | The email associated with the specified case ID | |
190
+ | `--start` | | Only gather logs within the time range (--with-logs must be included). This argument is a number in milliseconds since Unix Epoch. Must be used with --end | |
191
+ | `--end` | | Only gather logs within the time range (--with-logs must be included). This argument is a number in milliseconds since Unix Epoch. Must be used with --start | |
192
+ <!-- END_USAGE:flare -->
184
193
 
185
194
  **Permissions**
186
195
 
@@ -197,12 +206,12 @@ For product feedback and questions, join the `#serverless` channel in the [Datad
197
206
  [1]: https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html
198
207
  [2]: https://github.com/DataDog/datadog-lambda-layer-js/releases
199
208
  [3]: https://github.com/DataDog/datadog-lambda-layer-python/releases
200
- [4]: https://docs.datadoghq.com/serverless/datadog_lambda_library/extension
209
+ [4]: https://docs.datadoghq.com/serverless/libraries_integrations/extension
201
210
  [5]: https://docs.datadoghq.com/account_management/api-app-keys/#api-keys
202
211
  [6]: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-env-tag
203
212
  [7]: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-version-tag
204
213
  [8]: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-service-tag
205
- [9]: https://docs.datadoghq.com/serverless/forwarder/
214
+ [9]: https://docs.datadoghq.com/logs/guide/forwarder/
206
215
  [10]: https://docs.datadoghq.com/serverless/custom_metrics?tab=python#enabling-asynchronous-custom-metrics
207
216
  [11]: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html#using-profiles
208
217
  [12]: https://docs.datadoghq.com/integrations/guide/source-code-integration
package/dist/commands/instrument.js CHANGED
@@ -270,33 +270,39 @@ class PluginCommand extends instrument_1.LambdaInstrumentCommand {
270
270
  });
271
271
  }
272
272
  getSettings() {
273
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
274
- const layerVersionStr = (_a = this.layerVersion) !== null && _a !== void 0 ? _a : this.config.layerVersion;
275
- const extensionVersionStr = (_b = this.extensionVersion) !== null && _b !== void 0 ? _b : this.config.extensionVersion;
276
- const layerAWSAccount = (_c = this.layerAWSAccount) !== null && _c !== void 0 ? _c : this.config.layerAWSAccount;
277
- const forwarderARN = (_d = this.forwarder) !== null && _d !== void 0 ? _d : this.config.forwarder;
273
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
274
+ const layerVersionStr = (_b = (_a = this.layerVersion) !== null && _a !== void 0 ? _a : this.config.layerVersion) !== null && _b !== void 0 ? _b : 'latest';
275
+ const extensionVersionStr = (_d = (_c = this.extensionVersion) !== null && _c !== void 0 ? _c : this.config.extensionVersion) !== null && _d !== void 0 ? _d : 'latest';
276
+ const layerAWSAccount = (_e = this.layerAWSAccount) !== null && _e !== void 0 ? _e : this.config.layerAWSAccount;
277
+ const forwarderARN = (_f = this.forwarder) !== null && _f !== void 0 ? _f : this.config.forwarder;
278
278
  let layerVersion;
279
- if (layerVersionStr !== undefined) {
280
- layerVersion = parseInt(layerVersionStr, 10);
279
+ if (layerVersionStr === 'latest' || layerVersionStr === 'none') {
280
+ layerVersion = layerVersionStr;
281
281
  }
282
- if (Number.isNaN(layerVersion)) {
283
- this.context.stdout.write(instrumentRenderer.renderInvalidLayerVersionError(layerVersion === null || layerVersion === void 0 ? void 0 : layerVersion.toString()));
284
- return;
282
+ else {
283
+ layerVersion = parseInt(layerVersionStr, 10);
284
+ if (Number.isNaN(layerVersion)) {
285
+ this.context.stdout.write(instrumentRenderer.renderInvalidLayerVersionError(layerVersionStr));
286
+ return;
287
+ }
285
288
  }
286
289
  let extensionVersion;
287
- if (extensionVersionStr !== undefined) {
288
- extensionVersion = parseInt(extensionVersionStr, 10);
290
+ if (extensionVersionStr === 'latest' || extensionVersionStr === 'none') {
291
+ extensionVersion = extensionVersionStr;
289
292
  }
290
- if (Number.isNaN(extensionVersion)) {
291
- this.context.stdout.write(instrumentRenderer.renderInvalidExtensionVersionError(extensionVersion === null || extensionVersion === void 0 ? void 0 : extensionVersion.toString()));
292
- return;
293
+ else {
294
+ extensionVersion = parseInt(extensionVersionStr, 10);
295
+ if (Number.isNaN(extensionVersion)) {
296
+ this.context.stdout.write(instrumentRenderer.renderInvalidExtensionVersionError(extensionVersionStr));
297
+ return;
298
+ }
293
299
  }
294
300
  const stringBooleansMap = {
295
- captureLambdaPayload: (_e = this.captureLambdaPayload) !== null && _e !== void 0 ? _e : this.config.captureLambdaPayload,
296
- flushMetricsToLogs: (_f = this.flushMetricsToLogs) !== null && _f !== void 0 ? _f : this.config.flushMetricsToLogs,
297
- logging: (_g = this.logging) !== null && _g !== void 0 ? _g : this.config.logging,
298
- mergeXrayTraces: (_h = this.mergeXrayTraces) !== null && _h !== void 0 ? _h : this.config.mergeXrayTraces,
299
- tracing: (_j = this.tracing) !== null && _j !== void 0 ? _j : this.config.tracing,
301
+ captureLambdaPayload: (_g = this.captureLambdaPayload) !== null && _g !== void 0 ? _g : this.config.captureLambdaPayload,
302
+ flushMetricsToLogs: (_h = this.flushMetricsToLogs) !== null && _h !== void 0 ? _h : this.config.flushMetricsToLogs,
303
+ logging: (_j = this.logging) !== null && _j !== void 0 ? _j : this.config.logging,
304
+ mergeXrayTraces: (_k = this.mergeXrayTraces) !== null && _k !== void 0 ? _k : this.config.mergeXrayTraces,
305
+ tracing: (_l = this.tracing) !== null && _l !== void 0 ? _l : this.config.tracing,
300
306
  };
301
307
  for (const [stringBoolean, value] of Object.entries(stringBooleansMap)) {
302
308
  if (!['true', 'false', undefined].includes(value === null || value === void 0 ? void 0 : value.toString().toLowerCase())) {
@@ -310,13 +316,13 @@ class PluginCommand extends instrument_1.LambdaInstrumentCommand {
310
316
  const mergeXrayTraces = (0, commons_1.coerceBoolean)(false, this.mergeXrayTraces, this.config.mergeXrayTraces);
311
317
  const tracingEnabled = (0, commons_1.coerceBoolean)(true, this.tracing, this.config.tracing);
312
318
  const interactive = (0, commons_1.coerceBoolean)(false, this.interactive, this.config.interactive);
313
- const logLevel = (_k = this.logLevel) !== null && _k !== void 0 ? _k : this.config.logLevel;
314
- const apmFlushDeadline = (_l = this.apmFlushDeadline) !== null && _l !== void 0 ? _l : this.config.apmFlushDeadline;
315
- const appsecEnabled = (_m = this.appsecEnabled) !== null && _m !== void 0 ? _m : this.config.appsecEnabled;
316
- const service = (_o = this.service) !== null && _o !== void 0 ? _o : this.config.service;
317
- const environment = (_p = this.environment) !== null && _p !== void 0 ? _p : this.config.environment;
318
- const version = (_q = this.version) !== null && _q !== void 0 ? _q : this.config.version;
319
- const llmobsMlApp = (_r = this.llmobs) !== null && _r !== void 0 ? _r : this.config.llmobs;
319
+ const logLevel = (_m = this.logLevel) !== null && _m !== void 0 ? _m : this.config.logLevel;
320
+ const apmFlushDeadline = (_o = this.apmFlushDeadline) !== null && _o !== void 0 ? _o : this.config.apmFlushDeadline;
321
+ const appsecEnabled = (_p = this.appsecEnabled) !== null && _p !== void 0 ? _p : this.config.appsecEnabled;
322
+ const service = (_q = this.service) !== null && _q !== void 0 ? _q : this.config.service;
323
+ const environment = (_r = this.environment) !== null && _r !== void 0 ? _r : this.config.environment;
324
+ const version = (_s = this.version) !== null && _s !== void 0 ? _s : this.config.version;
325
+ const llmobsMlApp = (_t = this.llmobs) !== null && _t !== void 0 ? _t : this.config.llmobs;
320
326
  const tagsMap = {
321
327
  environment,
322
328
  service,
@@ -331,7 +337,7 @@ class PluginCommand extends instrument_1.LambdaInstrumentCommand {
331
337
  if (tagsMissing.length > 0) {
332
338
  this.context.stdout.write(instrumentRenderer.renderTagsNotConfiguredWarning(tagsMissing));
333
339
  }
334
- const extraTags = (_t = (_s = this.extraTags) === null || _s === void 0 ? void 0 : _s.toLowerCase()) !== null && _t !== void 0 ? _t : (_u = this.config.extraTags) === null || _u === void 0 ? void 0 : _u.toLowerCase();
340
+ const extraTags = (_v = (_u = this.extraTags) === null || _u === void 0 ? void 0 : _u.toLowerCase()) !== null && _v !== void 0 ? _v : (_w = this.config.extraTags) === null || _w === void 0 ? void 0 : _w.toLowerCase();
335
341
  if (extraTags && !(0, commons_1.sentenceMatchesRegEx)(extraTags, constants_2.EXTRA_TAGS_REG_EXP)) {
336
342
  this.context.stdout.write(instrumentRenderer.renderExtraTagsDontComplyError());
337
343
  return;
package/dist/commands/instrument.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/commands/instrument.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/commands/instrument.ts"],"names":[],"mappings":"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"}
package/dist/constants.d.ts CHANGED
@@ -10,6 +10,7 @@ export declare const LAYER_LOOKUP: {
10
10
  readonly java11: "dd-trace-java";
11
11
  readonly java17: "dd-trace-java";
12
12
  readonly java21: "dd-trace-java";
13
+ readonly java25: "dd-trace-java";
13
14
  readonly 'java8.al2': "dd-trace-java";
14
15
  readonly 'nodejs16.x': "Datadog-Node16-x";
15
16
  readonly 'nodejs18.x': "Datadog-Node18-x";
@@ -25,14 +26,15 @@ export declare const LAYER_LOOKUP: {
25
26
  readonly 'python3.14': "Datadog-Python314";
26
27
  readonly 'ruby3.2': "Datadog-Ruby3-2";
27
28
  readonly 'ruby3.3': "Datadog-Ruby3-3";
29
+ readonly 'ruby3.4': "Datadog-Ruby3-4";
28
30
  };
29
31
  export declare enum RuntimeType {
30
- DOTNET = 0,
31
- CUSTOM = 1,
32
- JAVA = 2,
33
- NODE = 3,
34
- PYTHON = 4,
35
- RUBY = 5
32
+ DOTNET = "dotnet",
33
+ CUSTOM = "custom",
34
+ JAVA = "java",
35
+ NODE = "node",
36
+ PYTHON = "python",
37
+ RUBY = "ruby"
36
38
  }
37
39
  export declare const RUNTIME_LOOKUP: Partial<Record<Runtime, RuntimeType>>;
38
40
  export type LayerKey = keyof typeof LAYER_LOOKUP;
package/dist/constants.js CHANGED
@@ -14,6 +14,7 @@ exports.LAYER_LOOKUP = {
14
14
  java11: 'dd-trace-java',
15
15
  java17: 'dd-trace-java',
16
16
  java21: 'dd-trace-java',
17
+ java25: 'dd-trace-java',
17
18
  'java8.al2': 'dd-trace-java',
18
19
  'nodejs16.x': 'Datadog-Node16-x',
19
20
  'nodejs18.x': 'Datadog-Node18-x',
@@ -29,15 +30,16 @@ exports.LAYER_LOOKUP = {
29
30
  'python3.14': 'Datadog-Python314',
30
31
  'ruby3.2': 'Datadog-Ruby3-2',
31
32
  'ruby3.3': 'Datadog-Ruby3-3',
33
+ 'ruby3.4': 'Datadog-Ruby3-4',
32
34
  };
33
35
  var RuntimeType;
34
36
  (function (RuntimeType) {
35
- RuntimeType[RuntimeType["DOTNET"] = 0] = "DOTNET";
36
- RuntimeType[RuntimeType["CUSTOM"] = 1] = "CUSTOM";
37
- RuntimeType[RuntimeType["JAVA"] = 2] = "JAVA";
38
- RuntimeType[RuntimeType["NODE"] = 3] = "NODE";
39
- RuntimeType[RuntimeType["PYTHON"] = 4] = "PYTHON";
40
- RuntimeType[RuntimeType["RUBY"] = 5] = "RUBY";
37
+ RuntimeType["DOTNET"] = "dotnet";
38
+ RuntimeType["CUSTOM"] = "custom";
39
+ RuntimeType["JAVA"] = "java";
40
+ RuntimeType["NODE"] = "node";
41
+ RuntimeType["PYTHON"] = "python";
42
+ RuntimeType["RUBY"] = "ruby";
41
43
  })(RuntimeType || (exports.RuntimeType = RuntimeType = {}));
42
44
  // Lookup table for runtimes that are currently supported by the CLI
43
45
  exports.RUNTIME_LOOKUP = {
@@ -46,6 +48,7 @@ exports.RUNTIME_LOOKUP = {
46
48
  java11: RuntimeType.JAVA,
47
49
  java17: RuntimeType.JAVA,
48
50
  java21: RuntimeType.JAVA,
51
+ java25: RuntimeType.JAVA,
49
52
  'java8.al2': RuntimeType.JAVA,
50
53
  'nodejs16.x': RuntimeType.NODE,
51
54
  'nodejs18.x': RuntimeType.NODE,
@@ -63,6 +66,7 @@ exports.RUNTIME_LOOKUP = {
63
66
  'python3.14': RuntimeType.PYTHON,
64
67
  'ruby3.2': RuntimeType.RUBY,
65
68
  'ruby3.3': RuntimeType.RUBY,
69
+ 'ruby3.4': RuntimeType.RUBY,
66
70
  };
67
71
  exports.ARM_LAYERS = [
68
72
  exports.EXTENSION_LAYER_KEY,
@@ -77,6 +81,7 @@ exports.ARM_LAYERS = [
77
81
  'python3.14',
78
82
  'ruby3.2',
79
83
  'ruby3.3',
84
+ 'ruby3.4',
80
85
  ];
81
86
  exports.ARM64_ARCHITECTURE = 'arm64';
82
87
  exports.ARM_LAYER_SUFFIX = '-ARM';
package/dist/constants.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
package/dist/functions/commons.d.ts CHANGED
@@ -37,13 +37,12 @@ export declare const collectFunctionsByRegion: (functions: string[], defaultRegi
37
37
  [key: string]: string[];
38
38
  };
39
39
  /**
40
- * Given a layer runtime, return its latest version.
40
+ * Get the latest layer version from the layer-versions.json file for a given runtime
41
41
  *
42
- * @param runtime the runtime of the layer.
43
- * @param region the region where the layer is stored.
44
- * @returns the latest version of the layer to find.
42
+ * @param layer the layer key (runtime or 'extension')
43
+ * @returns the latest version number for that layer
45
44
  */
46
- export declare const findLatestLayerVersion: (layer: LayerKey, region: string) => Promise<number>;
45
+ export declare const getLatestLayerVersion: (layer: LayerKey) => number;
47
46
  export declare const getAWSFileCredentialsParams: (profile: string) => FromIniInit;
48
47
  /**
49
48
  * Returns the loaded AWS Credentials from the given profile.
@@ -116,7 +115,7 @@ export declare const getRegion: (functionARN: string) => string | undefined;
116
115
  * @returns if a runtime is supported.
117
116
  */
118
117
  export declare const isSupportedRuntime: (runtime?: string) => runtime is Runtime;
119
- export declare const isLayerRuntime: (runtime: string) => runtime is "dotnet6" | "dotnet8" | "java11" | "java17" | "java21" | "java8.al2" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "nodejs22.x" | "nodejs24.x" | "python3.10" | "python3.11" | "python3.12" | "python3.13" | "python3.14" | "python3.8" | "python3.9" | "ruby3.2" | "ruby3.3" | "extension";
118
+ export declare const isLayerRuntime: (runtime: string) => runtime is "dotnet6" | "dotnet8" | "java11" | "java17" | "java21" | "java25" | "java8.al2" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "nodejs22.x" | "nodejs24.x" | "python3.10" | "python3.11" | "python3.12" | "python3.13" | "python3.14" | "python3.8" | "python3.9" | "ruby3.2" | "ruby3.3" | "ruby3.4" | "extension";
120
119
  export declare const sentenceMatchesRegEx: (sentence: string, regex: RegExp) => RegExpMatchArray | null;
121
120
  export declare const supportsInTracerAppsec: (runtime: Runtime, layerVersion: number | undefined) => boolean;
122
121
  export declare const updateLambdaFunctionConfig: (lambdaClient: LambdaClient, cloudWatchLogsClient: CloudWatchLogsClient, config: FunctionConfiguration) => Promise<void>;
package/dist/functions/commons.js CHANGED
@@ -35,11 +35,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
35
35
  return (mod && mod.__esModule) ? mod : { "default": mod };
36
36
  };
37
37
  Object.defineProperty(exports, "__esModule", { value: true });
38
- exports.maskConfig = exports.willUpdateFunctionConfigs = exports.handleLambdaFunctionUpdates = exports.updateFunctionConfiguration = exports.updateLambdaFunctionConfig = exports.supportsInTracerAppsec = exports.sentenceMatchesRegEx = exports.isLayerRuntime = exports.isSupportedRuntime = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.checkRuntimeTypesAreUniform = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.getAWSCredentials = exports.getAWSProfileCredentials = exports.getAWSFileCredentialsParams = exports.findLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
38
+ exports.maskConfig = exports.willUpdateFunctionConfigs = exports.handleLambdaFunctionUpdates = exports.updateFunctionConfiguration = exports.updateLambdaFunctionConfig = exports.supportsInTracerAppsec = exports.sentenceMatchesRegEx = exports.isLayerRuntime = exports.isSupportedRuntime = exports.getRegion = exports.getLambdaFunctionConfig = exports.getLayers = exports.getLayerNameWithVersion = exports.getLayerArn = exports.getLambdaFunctionConfigs = exports.getLambdaFunctionConfigsFromRegex = exports.checkRuntimeTypesAreUniform = exports.getAllLambdaFunctionConfigs = exports.isMissingDatadogEnvVars = exports.isMissingAnyDatadogApiKeyEnvVar = exports.getAWSCredentials = exports.getAWSProfileCredentials = exports.getAWSFileCredentialsParams = exports.getLatestLayerVersion = exports.collectFunctionsByRegion = exports.coerceBoolean = exports.addLayerArn = void 0;
39
39
  const client_lambda_1 = require("@aws-sdk/client-lambda");
40
40
  const credential_providers_1 = require("@aws-sdk/credential-providers");
41
41
  const helpersRenderer = __importStar(require("@datadog/datadog-ci-base/helpers/renderer"));
42
42
  const constants_1 = require("@datadog/datadog-ci-base/helpers/serverless/constants");
43
+ const lambda_layer_versions_1 = require("@datadog/datadog-ci-base/helpers/serverless/lambda-layer-versions");
43
44
  const utils_1 = require("@datadog/datadog-ci-base/helpers/utils");
44
45
  const validation_1 = require("@datadog/datadog-ci-base/helpers/validation");
45
46
  const property_provider_1 = require("@smithy/property-provider");
@@ -128,66 +129,22 @@ const collectFunctionsByRegion = (functions, defaultRegion) => {
128
129
  };
129
130
  exports.collectFunctionsByRegion = collectFunctionsByRegion;
130
131
  /**
131
- * Given a layer runtime, return its latest version.
132
+ * Get the latest layer version from the layer-versions.json file for a given runtime
132
133
  *
133
- * @param runtime the runtime of the layer.
134
- * @param region the region where the layer is stored.
135
- * @returns the latest version of the layer to find.
134
+ * @param layer the layer key (runtime or 'extension')
135
+ * @returns the latest version number for that layer
136
136
  */
137
- const findLatestLayerVersion = (layer, region) => __awaiter(void 0, void 0, void 0, function* () {
138
- let latestVersion = 0;
139
- let searchStep = latestVersion > 0 ? 1 : 100;
140
- let layerVersion = latestVersion + searchStep;
141
- const account = region.startsWith('us-gov') ? constants_2.GOVCLOUD_LAYER_AWS_ACCOUNT : constants_2.DEFAULT_LAYER_AWS_ACCOUNT;
142
- const layerName = constants_2.LAYER_LOOKUP[layer];
143
- let foundLatestVersion = false;
144
- const lambdaClient = new client_lambda_1.LambdaClient({ region, retryStrategy: constants_2.EXPONENTIAL_BACKOFF_RETRY_STRATEGY });
145
- while (!foundLatestVersion) {
146
- try {
147
- // Search next version
148
- const command = new client_lambda_1.GetLayerVersionCommand({
149
- LayerName: `arn:aws:lambda:${region}:${account}:layer:${layerName}`,
150
- VersionNumber: layerVersion,
151
- });
152
- yield lambdaClient.send(command);
153
- latestVersion = layerVersion;
154
- // Increase layer version
155
- layerVersion += searchStep;
156
- }
157
- catch (_a) {
158
- // Search step is too big, reset target to previous version
159
- // with a smaller search step
160
- if (searchStep > 1) {
161
- layerVersion -= searchStep;
162
- searchStep /= 10;
163
- layerVersion += searchStep;
164
- }
165
- else {
166
- // Search step is 1, current version was not found.
167
- // It is likely that the last checked is the latest.
168
- // Check the next version to be certain, since
169
- // current version could've been deleted by accident.
170
- try {
171
- layerVersion += searchStep;
172
- const command = new client_lambda_1.GetLayerVersionCommand({
173
- LayerName: `arn:aws:lambda:${region}:${account}:layer:${layerName}`,
174
- VersionNumber: layerVersion,
175
- });
176
- yield lambdaClient.send(command);
177
- latestVersion = layerVersion;
178
- // Continue the search if the next version does exist (unlikely event)
179
- layerVersion += searchStep;
180
- }
181
- catch (_b) {
182
- // The next version doesn't exist either, so the previous version is indeed the latest
183
- foundLatestVersion = true;
184
- }
185
- }
186
- }
137
+ const getLatestLayerVersion = (layer) => {
138
+ if (layer === 'extension') {
139
+ return lambda_layer_versions_1.LAMBDA_LAYER_VERSIONS[layer];
187
140
  }
188
- return latestVersion;
189
- });
190
- exports.findLatestLayerVersion = findLatestLayerVersion;
141
+ const runtimeType = constants_2.RUNTIME_LOOKUP[layer];
142
+ if (runtimeType === undefined || runtimeType === constants_2.RuntimeType.CUSTOM) {
143
+ throw new Error(`No layer version found for ${runtimeType}`);
144
+ }
145
+ return lambda_layer_versions_1.LAMBDA_LAYER_VERSIONS[runtimeType];
146
+ };
147
+ exports.getLatestLayerVersion = getLatestLayerVersion;
191
148
  const getAWSFileCredentialsParams = (profile) => {
192
149
  const init = { profile };
193
150
  if (process.env[constants_2.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR] !== undefined) {
@@ -264,7 +221,7 @@ exports.checkRuntimeTypesAreUniform = checkRuntimeTypesAreUniform;
264
221
  * @returns an array of Lambda FunctionConfiguration's that match the pattern above.
265
222
  */
266
223
  const getLambdaFunctionConfigsFromRegex = (lambdaClient, pattern) => __awaiter(void 0, void 0, void 0, function* () {
267
- var _c;
224
+ var _a;
268
225
  const regEx = new RegExp(pattern);
269
226
  const matchedFunctions = [];
270
227
  let response;
@@ -272,7 +229,7 @@ const getLambdaFunctionConfigsFromRegex = (lambdaClient, pattern) => __awaiter(v
272
229
  while (true) {
273
230
  const command = new client_lambda_1.ListFunctionsCommand({ Marker: nextMarker });
274
231
  response = yield lambdaClient.send(command);
275
- (_c = response.Functions) === null || _c === void 0 ? void 0 : _c.map((fn) => { var _a; return ((_a = fn.FunctionName) === null || _a === void 0 ? void 0 : _a.match(regEx)) && matchedFunctions.push(fn); });
232
+ (_a = response.Functions) === null || _a === void 0 ? void 0 : _a.map((fn) => { var _a; return ((_a = fn.FunctionName) === null || _a === void 0 ? void 0 : _a.match(regEx)) && matchedFunctions.push(fn); });
276
233
  nextMarker = response.NextMarker;
277
234
  if (!nextMarker) {
278
235
  break;
@@ -391,6 +348,7 @@ const supportsInTracerAppsec = (runtime, layerVersion) => {
391
348
  case 'java11':
392
349
  case 'java17':
393
350
  case 'java21':
351
+ case 'java25':
394
352
  case 'java8.al2':
395
353
  case 'nodejs16.x':
396
354
  case 'nodejs18.x':
@@ -399,6 +357,7 @@ const supportsInTracerAppsec = (runtime, layerVersion) => {
399
357
  case 'nodejs24.x':
400
358
  case 'ruby3.2':
401
359
  case 'ruby3.3':
360
+ case 'ruby3.4':
402
361
  return false;
403
362
  }
404
363
  };
package/dist/functions/commons.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commons.js","sourceRoot":"","sources":["../../src/functions/commons.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commons.js","sourceRoot":"","sources":["../../src/functions/commons.ts"],"names":[],"mappings":"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"}
package/dist/functions/instrument.js CHANGED
@@ -77,12 +77,12 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
77
77
  let needsUpdate = false;
78
78
  const runtimeType = constants_2.RUNTIME_LOOKUP[runtime];
79
79
  if (runtimeType === constants_2.RuntimeType.CUSTOM) {
80
- if (settings.layerVersion !== undefined) {
80
+ if (settings.layerVersion !== 'none') {
81
81
  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.`);
82
82
  }
83
83
  }
84
84
  // Update Python Handler
85
- if (runtimeType === constants_2.RuntimeType.PYTHON && (settings.layerVersion !== undefined || settings.interactive)) {
85
+ if (runtimeType === constants_2.RuntimeType.PYTHON && (settings.layerVersion !== 'none' || settings.interactive)) {
86
86
  const expectedHandler = constants_2.PYTHON_HANDLER_LOCATION;
87
87
  if (config.Handler !== expectedHandler) {
88
88
  needsUpdate = true;
@@ -90,7 +90,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
90
90
  }
91
91
  }
92
92
  // Update Node Handler
93
- if (runtimeType === constants_2.RuntimeType.NODE && (settings.layerVersion !== undefined || settings.interactive)) {
93
+ if (runtimeType === constants_2.RuntimeType.NODE && (settings.layerVersion !== 'none' || settings.interactive)) {
94
94
  const expectedHandler = constants_2.NODE_HANDLER_LOCATION;
95
95
  if (config.Handler !== expectedHandler) {
96
96
  needsUpdate = true;
@@ -111,7 +111,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
111
111
  }
112
112
  else if (apiKeySecretArn !== undefined && oldEnvVars[constants_2.API_KEY_SECRET_ARN_ENV_VAR] !== apiKeySecretArn) {
113
113
  const isNode = runtimeType === constants_2.RuntimeType.NODE;
114
- const isSendingSynchronousMetrics = settings.extensionVersion === undefined && !settings.flushMetricsToLogs;
114
+ const isSendingSynchronousMetrics = settings.extensionVersion === 'none' && !settings.flushMetricsToLogs;
115
115
  if (isSendingSynchronousMetrics && isNode) {
116
116
  throw new Error('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
117
117
  }
@@ -154,7 +154,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
154
154
  }
155
155
  }
156
156
  // Skip adding DD_FLUSH_TO_LOGS when using Extension
157
- const isUsingExtension = settings.extensionVersion !== undefined;
157
+ const isUsingExtension = settings.extensionVersion !== 'none';
158
158
  if (!isUsingExtension &&
159
159
  settings.flushMetricsToLogs !== undefined &&
160
160
  oldEnvVars[constants_2.FLUSH_TO_LOG_ENV_VAR] !== ((_e = settings.flushMetricsToLogs) === null || _e === void 0 ? void 0 : _e.toString())) {
@@ -188,10 +188,15 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
188
188
  const lambdaLibraryLayerArn = (0, commons_1.getLayerArn)(config, config.Runtime, region, settings);
189
189
  const lambdaLibraryLayerName = constants_2.LAYER_LOOKUP[runtime];
190
190
  let fullLambdaLibraryLayerARN;
191
- if (settings.layerVersion !== undefined || settings.interactive) {
192
- layerOrTraceVersion = settings.layerVersion;
193
- if (settings.interactive && !settings.layerVersion) {
194
- layerOrTraceVersion = yield (0, commons_1.findLatestLayerVersion)(config.Runtime, region);
191
+ // In interactive mode, always set versions from file (unless explicit number given)
192
+ // In non-interactive mode, only set if not 'none'
193
+ if (settings.interactive || settings.layerVersion !== 'none') {
194
+ // Resolve 'latest' to actual version number from file, and interactive mode without a version will add latest
195
+ if (settings.layerVersion === 'latest' || (settings.interactive && settings.layerVersion === 'none')) {
196
+ layerOrTraceVersion = (0, commons_1.getLatestLayerVersion)(config.Runtime);
197
+ }
198
+ else if (typeof settings.layerVersion === 'number') {
199
+ layerOrTraceVersion = settings.layerVersion;
195
200
  }
196
201
  fullLambdaLibraryLayerARN = `${lambdaLibraryLayerArn}:${layerOrTraceVersion}`;
197
202
  }
@@ -210,10 +215,15 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
210
215
  const lambdaExtensionLayerArn = (0, commons_1.getLayerArn)(config, constants_2.EXTENSION_LAYER_KEY, region, settings);
211
216
  let fullExtensionLayerARN;
212
217
  let extensionVersion;
213
- if (settings.extensionVersion !== undefined || settings.interactive) {
214
- extensionVersion = settings.extensionVersion;
215
- if (settings.interactive && !settings.extensionVersion) {
216
- extensionVersion = yield (0, commons_1.findLatestLayerVersion)(constants_2.EXTENSION_LAYER_KEY, region);
218
+ // In interactive mode, always set versions from file (unless explicit number given)
219
+ // In non-interactive mode, only set if not 'none'
220
+ if (settings.interactive || settings.extensionVersion !== 'none') {
221
+ // Resolve 'latest' to actual version number from file, and interactive mode without a version will add latest
222
+ if (settings.extensionVersion === 'latest' || (settings.interactive && settings.extensionVersion === 'none')) {
223
+ extensionVersion = (0, commons_1.getLatestLayerVersion)(constants_2.EXTENSION_LAYER_KEY);
224
+ }
225
+ else if (typeof settings.extensionVersion === 'number') {
226
+ extensionVersion = settings.extensionVersion;
217
227
  }
218
228
  if (settings.lambdaFips) {
219
229
  if (oldEnvVars[constants_2.DD_LAMBDA_FIPS_MODE_ENV_VAR] !== 'true') {
package/dist/functions/instrument.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/functions/instrument.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/functions/instrument.ts"],"names":[],"mappings":"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"}
package/dist/interfaces.d.ts CHANGED
@@ -45,6 +45,7 @@ export interface InstrumentedConfigurationGroup {
45
45
  lambdaClient: LambdaClient;
46
46
  region: string;
47
47
  }
48
+ export type Version = number | 'latest' | 'none';
48
49
  /**
49
50
  * Basic settings to use in every specified
50
51
  * lambda to be instrumented.
@@ -53,13 +54,13 @@ export interface InstrumentationSettings extends InstrumentationTags {
53
54
  apmFlushDeadline?: string;
54
55
  appsecEnabled?: boolean;
55
56
  captureLambdaPayload?: boolean;
56
- extensionVersion?: number;
57
+ extensionVersion: Version;
57
58
  lambdaFips?: boolean;
58
59
  flushMetricsToLogs: boolean;
59
60
  forwarderARN?: string;
60
61
  interactive?: boolean;
61
62
  layerAWSAccount?: string;
62
- layerVersion?: number;
63
+ layerVersion: Version;
63
64
  loggingEnabled?: boolean;
64
65
  logLevel?: string;
65
66
  mergeXrayTraces: boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datadog/datadog-ci-plugin-lambda",
3
- "version": "4.3.0",
3
+ "version": "5.0.0",
4
4
  "description": "Datadog CI plugin for `lambda` commands",
5
5
  "license": "Apache-2.0",
6
6
  "keywords": [
@@ -39,7 +39,7 @@
39
39
  "prepack": "yarn package:clean-dist"
40
40
  },
41
41
  "peerDependencies": {
42
- "@datadog/datadog-ci-base": "4.3.0"
42
+ "@datadog/datadog-ci-base": "5.0.0"
43
43
  },
44
44
  "dependencies": {
45
45
  "@aws-sdk/client-cloudwatch-logs": "^3.940.0",