diff --git a/config/_default/menus/main.en.yaml b/config/_default/menus/main.en.yaml
index ccaf854547768..0c5823c5f6d38 100644
--- a/config/_default/menus/main.en.yaml
+++ b/config/_default/menus/main.en.yaml
@@ -3218,8 +3218,8 @@ menu:
parent: serverless
identifier: serverless_aws_lambda
weight: 1
- - name: Installation
- url: serverless/aws_lambda/installation
+ - name: Instrumentation
+ url: serverless/aws_lambda/instrumentation
parent: serverless_aws_lambda
identifier: serverless_aws_lambda_installation
weight: 101
diff --git a/content/en/serverless/aws_lambda/configuration.md b/content/en/serverless/aws_lambda/configuration.md
index 245c654d07cc5..015712112e410 100644
--- a/content/en/serverless/aws_lambda/configuration.md
+++ b/content/en/serverless/aws_lambda/configuration.md
@@ -41,6 +41,8 @@ First, [install][1] Datadog Serverless Monitoring to begin collecting metrics, t
- [Migrating between x86 to arm64 with the Datadog Lambda Extension](#migrating-between-x86-to-arm64-with-the-datadog-lambda-extension)
- [Configure the Datadog Lambda extension for local testing](#configure-the-datadog-lambda-extension-for-local-testing)
- [Instrument AWS Lambda with the OpenTelemetry API](#instrument-aws-lambda-with-the-opentelemetry-api)
+- [Using Datadog Lambda Extension v67+](#using-datadog-lambda-extension-v67)
+- [Configure Auto-linking for DynamoDB PutItem](#configure-auto-linking-for-dynamodb-putitem)
- [Troubleshoot](#troubleshoot)
- [Further Reading](#further-reading)
@@ -272,8 +274,7 @@ DD_APM_REPLACE_TAGS=[
}
]
```
-
-
+To collect payloads from AWS services, see [Capture Requests and Responses from AWS Services][54].
## Collect traces from non-Lambda resources
@@ -722,6 +723,55 @@ You can use this approach if, for example, your code has already been instrument
To instrument AWS Lambda with the OpenTelemetry API, set the environment variable `DD_TRACE_OTEL_ENABLED` to `true`. See [Custom instrumentation with the OpenTelemetry API][48] for more details.
+## Using Datadog Lambda Extension v67+
+
+Version 67+ of [the Datadog Extension][50] is optimized to significantly reduce cold start duration.
+
+To use the optimized extension, set the `DD_SERVERLESS_APPSEC_ENABLED` environment variable to `false`.
+
+When the `DD_SERVERLESS_APPSEC_ENABLED` environment variable is set to `true`, the Datadog Extension defaults to the fully compatible older version. You can also force your extension to use the older version by setting `DD_EXTENSION_VERSION` to `compatibility`. Datadog encourages you to report any feedback or bugs by adding an [issue on GitHub][51] and tagging your issue with `version/next`.
+
+## Configure Auto-linking for DynamoDB PutItem
+_Available for Python and Node.js runtimes_.
+
+When segments of your asynchronous requests cannot propagate trace context, Datadog's [Span Auto-linking][52] feature automatically detects linked spans.
+
+To enable Span Auto-linking for [DynamoDB Change Streams][53]'s `PutItem` operation, configure primary key names for your tables.
+
+{{< tabs >}}
+{{% tab "Python" %}}
+```python
+ddtrace.config.botocore['dynamodb_primary_key_names_for_tables'] = {
+ 'table_name': {'key1', 'key2'},
+ 'other_table': {'other_key'},
+}
+```
+{{% /tab %}}
+{{% tab "Node.js" %}}
+```js
+// Initialize the tracer with the configuration
+const tracer = require('dd-trace').init({
+ dynamoDb: {
+ tablePrimaryKeys: {
+ 'table_name': ['key1', 'key2'],
+ 'other_table': ['other_key']
+ }
+ }
+})
+```
+{{% /tab %}}
+{{% tab "Environment variable" %}}
+```sh
+export DD_BOTOCORE_DYNAMODB_TABLE_PRIMARY_KEYS='{
+ "table_name": ["key1", "key2"],
+ "other_table": ["other_key"]
+}'
+```
+{{% /tab %}}
+{{< /tabs >}}
+
+This enables DynamoDB `PutItem` calls to be instrumented with span pointers. Many DynamoDB API calls do not include the item's primary key fields as separate values, so they need to be provided to the tracer separately. This field is structured as a `dict` keyed by the table names as `str`. Each value is the set of primary key field names (as str) for the associated table. The set can have exactly one or two elements, depending on the table's primary key schema.
+
## Troubleshoot
If you have trouble configuring your installations, set the environment variable `DD_LOG_LEVEL` to `debug` for debugging logs. For additional troubleshooting tips, see the [serverless monitoring troubleshooting guide][39].
@@ -780,4 +830,8 @@ If you have trouble configuring your installations, set the environment variable
[47]: /logs/
[48]: /tracing/trace_collection/otel_instrumentation/
[49]: https://app.datadoghq.com/security/appsec?column=time&order=desc
-
+[50]: https://github.com/DataDog/datadog-lambda-extension
+[51]: https://github.com/DataDog/datadog-lambda-extension/issues
+[52]: /serverless/aws_lambda/distributed_tracing/#span-auto-linking
+[53]: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Streams.html
+[54]: /tracing/guide/aws_payload_tagging/?code-lang=python&tab=nodejs
\ No newline at end of file
diff --git a/content/en/serverless/aws_lambda/installation/_index.md b/content/en/serverless/aws_lambda/installation/_index.md
deleted file mode 100644
index 3f90e3cefebbe..0000000000000
--- a/content/en/serverless/aws_lambda/installation/_index.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: Install Serverless Monitoring for AWS Lambda
-aliases:
- - /serverless/installation/installing_the_library/
- - /serverless/installation
-further_reading:
- - link: '/serverless/configuration/'
- tag: 'Documentation'
- text: 'Configure Serverless Monitoring'
- - link: "/integrations/amazon_lambda/"
- tag: "Documentation"
- text: "AWS Lambda Integration"
----
-
-## Quick start
-
-If you are new to Datadog, [sign up for a Datadog account][1], then follow the Datadog Agent installation instructions for [AWS Lambda][2] to instrument your Lambda function for a quick start with Datadog. Completing the steps configures your Lambda functions to send real-time metrics, logs, and traces to Datadog.
-
-A sample application is
available on GitHub with instructions on how to deploy with multiple runtimes and infrastructure as code tools.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
For FIPS compliance, use the Datadog FIPS-compliant extension layer, but note that the .NET runtime layer does not require additional configuration. While the FIPS-compliant Lambda components work with any Datadog site, end-to-end FIPS compliance requires using the US1-FED site. See
AWS Lambda FIPS Compliance for more details.
A sample application is
available on GitHub with instructions on how to deploy with multiple runtimes and infrastructure as code tools.
If your Go Lambda functions are still using runtime
go1.x and you cannot migrate to the
provided.al2 runtime, you must
instrument using the Datadog Forwarder. Otherwise, follow the instructions in this guide to instrument using the Datadog Lambda Extension.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Datadog provides FIPS-compliant monitoring for AWS Lambda functions. For GovCloud environments, the
DD_LAMBDA_FIPS_MODE environment variable is enabled by default. When FIPS mode is enabled, AWS FIPS endpoints are used for Datadog API key lookups, and the Lambda metric helper function
Metric() requires the FIPS-compliant extension for metric submission. While the FIPS-compliant Lambda components work with any Datadog site, end-to-end FIPS compliance requires using the US1-FED site. See
AWS Lambda FIPS Compliance for more details.
A sample application is
available on GitHub with instructions on how to deploy with multiple runtimes and infrastructure as code tools.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
For FIPS compliance, use the Datadog FIPS-compliant extension layer, but note that the Java runtime layer does not require additional configuration. While the FIPS-compliant Lambda components work with any Datadog site, end-to-end FIPS compliance requires using the US1-FED site. See
AWS Lambda FIPS Compliance for more details.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
A sample application is
available on GitHub with instructions on how to deploy with multiple runtimes and infrastructure as code tools.
If you previously set up your Lambda functions using the Datadog Forwarder, see
instrumenting using the Datadog Forwarder. Otherwise, follow the instructions in this guide to instrument using the Datadog Lambda Extension.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Datadog provides FIPS-compliant monitoring for AWS Lambda functions. For GovCloud environments, the
DD_LAMBDA_FIPS_MODE environment variable is enabled by default. When FIPS mode is enabled, AWS FIPS endpoints are used for Datadog API key lookups, and the Lambda metric helper function
sendDistributionMetric requires the FIPS-compliant extension for metric submission. While the FIPS-compliant Lambda components work with any Datadog site, end-to-end FIPS compliance requires using the US1-FED site. See
AWS Lambda FIPS Compliance for more details.
A sample application is
available on GitHub with instructions on how to deploy with multiple runtimes and infrastructure as code tools.
Do not install the Datadog Lambda Library as a layer and as a JavaScript package. If you installed the Datadog Lambda Library as a layer, do not include datadog-lambda-js in your package.json, or install it as a dev dependency and run npm install --production before deploying.
-## Span Auto-linking
-
-When segments of your asynchronous requests cannot propagate trace context, Datadog's [Span Auto-linking][9] feature automatically detects linked spans.
-
-### Configure Auto-linking for DynamoDB PutItem
-
-To enable Span Auto-linking for [DynamoDB Change Streams][10]'s `PutItem` operation, configure primary key names for your tables.
-
-This enables DynamoDB `PutItem` calls to be instrumented with span pointers. Many DynamoDB API calls do not include the item's primary key fields as separate values, so they need to be provided to the tracer separately. This field is structured as a `object` keyed by the table names as `strings`. Each value is an `array` of primary key fields (as `string`) for the associated table. The array can have exactly one or two elements, depending on the table's primary key schema.
-
-{{< tabs >}}
-{{% tab "Node.js" %}}
-```js
-// Initialize the tracer with the configuration
-const tracer = require('dd-trace').init({
- dynamoDb: {
- tablePrimaryKeys: {
- 'table_name': ['key1', 'key2'],
- 'other_table': ['other_key']
- }
- }
-})
-```
-{{% /tab %}}
-
-{{% tab "Environment variable" %}}
-```sh
-export DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS='{
- "table_name": ["key1", "key2"],
- "other_table": ["other_key"]
-}'
-```
-{{% /tab %}}
-{{< /tabs >}}
-
-## Minimize cold start duration
-Version 67+ of [the Datadog Extension][7] is optimized to significantly reduce cold start duration.
+## FIPS compliance
-To use the optimized extension, disable App and API Protection (AAP), Continuous Profiler for Lambda, and OpenTelemetry based tracing. Set the following environment variables to `false`:
+{{% svl-lambda-fips %}}
-- `DD_TRACE_OTEL_ENABLED`
-- `DD_PROFILING_ENABLED`
-- `DD_SERVERLESS_APPSEC_ENABLED`
+## AWS Lambda and VPC
-Enabling any of these features cause the extension to default back to the fully compatible older version of the extension. You can also force your extension to use the older version by setting `DD_EXTENSION_VERSION` to `compatibility`. Datadog encourages you to report any feedback or bugs by adding an [issue on GitHub][8] and tagging your issue with `version/next`.
+{{% svl-lambda-vpc %}}
## What's next?
-- View metrics, logs, and traces on the [Serverless page][1] in Datadog. By default, the Datadog Lambda extension enables logs.
-- Turn on [threat monitoring][6] to get alerted on attackers targeting your service.
-- See the sample code to [monitor custom business logic](#monitor-custom-business-logic)
-- See the [troubleshooting guide][2] if you have trouble collecting the telemetry
-- See the [advanced configurations][3] to
- - connect your telemetry using tags
- - collect telemetry for Amazon API Gateway, SQS, etc.
- - capture the Lambda request and response payloads
- - link errors of your Lambda functions to your source code
- - filter or scrub sensitive information from logs or traces
+- Add custom tags to your telemetry by using the `DD_TAGS` environment variable
+- Configure [payload collection][12] to capture your functions' JSON request and response payloads
+- If you are using the Datadog Lambda Extension, turn off the Datadog Forwarder's Lambda logs
+- See [advanced configurations][3] for further capabilities
### Monitor custom business logic
@@ -551,4 +502,5 @@ exports.handler = async (event) => {
[8]: https://github.com/DataDog/datadog-lambda-extension/issues
[9]: /serverless/aws_lambda/distributed_tracing/#span-auto-linking
[10]: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Streams.html
-[11]: /serverless/aws_lambda/remote_instrumentation
\ No newline at end of file
+[11]: /serverless/aws_lambda/remote_instrumentation
+[12]: /serverless/aws_lambda/configuration?tab=datadogcli#collect-the-request-and-response-payloads
\ No newline at end of file
diff --git a/content/en/serverless/aws_lambda/installation/python.md b/content/en/serverless/aws_lambda/instrumentation/python.md
similarity index 83%
rename from content/en/serverless/aws_lambda/installation/python.md
rename to content/en/serverless/aws_lambda/instrumentation/python.md
index eb3581150b079..b51672e8686ea 100644
--- a/content/en/serverless/aws_lambda/installation/python.md
+++ b/content/en/serverless/aws_lambda/instrumentation/python.md
@@ -14,23 +14,22 @@ aliases:
- /serverless/datadog_lambda_library/python/
- /serverless/guide/python/
- /serverless/installation/python
+ - /serverless/aws_lambda/instrumentation/python
algolia:
tags: ['python lambda traces']
---
-
+Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Datadog provides FIPS-compliant monitoring for AWS Lambda functions. For GovCloud environments, the
DD_LAMBDA_FIPS_MODE environment variable is enabled by default. When FIPS mode is enabled, AWS FIPS endpoints are used for Datadog API key lookups, and the Lambda metric helper function
lambda_metric requires the FIPS-compliant extension for metric submission. While the FIPS-compliant Lambda components work with any Datadog site, end-to-end FIPS compliance requires using the US1-FED site. See
AWS Lambda FIPS Compliance for more details.
If you previously set up your Lambda functions using the Datadog Forwarder, see
instrumenting using the Datadog Forwarder. Otherwise, follow the instructions in this guide to instrument using the Datadog Lambda Extension.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
Version 67+ of the Datadog Lambda Extension uses an optimized version of the extension.
Read more.
For FIPS compliance, use the Datadog FIPS-compliant extension layer, but note that the Ruby runtime layer does not require additional configuration. While the FIPS-compliant Lambda components work with any Datadog site, end-to-end FIPS compliance requires using the US1-FED site. See
AWS Lambda FIPS Compliance for more details.