Skip to content

Commit 746639d

Browse files
tedkahwajiclaude
andcommitted
Disambiguate AWS integration instrumentation from remote instrumentation
Add a comparison section to the setup guide covering where the work runs, how functions are selected, layer version control, credentials, and removal, plus a pointer to it from the technical reference. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
1 parent bb751b5 commit 746639d

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

hugo/content/en/integrations/guide/aws-agent-installation-technical-reference.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ This page explains how Datadog instruments and maintains your AWS workloads thro
2121

2222
This page covers Amazon EC2 instances and AWS Lambda functions. Amazon EKS is not supported.
2323

24+
Datadog also offers [remote instrumentation][4] for Lambda functions, which deploys an instrumenter function into your own account rather than making the changes from Datadog. For a comparison of the two, see [Choose between this guide and remote instrumentation][6].
25+
2426
## AWS resources that Datadog creates
2527

2628
### Created once, by the CloudFormation stack
@@ -201,3 +203,4 @@ To uninstall, remove resources from a rule, edit the rule's query, or delete the
201203
[3]: https://docs.datadoghq.com/integrations/guide/aws-agent-installation/#aws-lambda-functions
202204
[4]: https://docs.datadoghq.com/serverless/aws_lambda/remote_instrumentation/
203205
[5]: https://docs.datadoghq.com/account_management/workload_identity_federation/
206+
[6]: https://docs.datadoghq.com/integrations/guide/aws-agent-installation/#choose-between-this-guide-and-remote-instrumentation

hugo/content/en/integrations/guide/aws-agent-installation.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,33 @@ You can instrument your AWS workloads directly from Datadog, without connecting
5151
| Amazon EC2 instances | The Datadog Agent |
5252
| AWS Lambda functions | The Datadog Lambda extension, and the Datadog tracing layer matching the function's runtime |
5353

54-
Amazon EKS is not supported. For Lambda functions, this guide covers instrumentation managed from Datadog. To instrument functions with a Lambda function deployed in your own account instead, see [Remote instrumentation for AWS Lambda][9].
54+
Amazon EKS is not supported. For Lambda functions, Datadog offers a second product, remote instrumentation, which runs an instrumenter function in your own account. See [Choose between this guide and remote instrumentation](#choose-between-this-guide-and-remote-instrumentation).
5555

5656
<div class="alert alert-warning">A Lambda function can be managed by only one Datadog instrumentation product. Datadog skips any function that remote instrumentation already manages, and skips any function you instrumented yourself.</div>
5757

58+
## Choose between this guide and remote instrumentation
59+
60+
Datadog offers two ways to add instrumentation to Lambda functions without redeploying them yourself:
61+
62+
- **Instrumentation through the AWS integration**, covered by this guide, is managed entirely from Datadog. Datadog updates your functions with the IAM role created by the CloudFormation stack, and deploys no compute into your account.
63+
- **[Remote instrumentation][9]** deploys a Datadog instrumenter function, `datadog-remote-instrumenter`, into your own account. That function applies the instrumentation and keeps it in place.
64+
65+
Both add the same Datadog Lambda extension and tracing layers, and both restore instrumentation that is changed outside of Datadog. They differ in where the work runs, how functions are selected, and what you install.
66+
67+
| | Instrumentation through the AWS integration | Remote instrumentation |
68+
|---|---|---|
69+
| Workloads | Amazon EC2 instances and AWS Lambda functions | AWS Lambda functions |
70+
| What Datadog deploys in your account | No compute. Datadog calls the AWS APIs with the IAM role created by the CloudFormation stack | An instrumenter Lambda function, a CloudTrail, and supporting resources |
71+
| Scope of setup | One CloudFormation stack per AWS account | One CloudFormation stack per account and region |
72+
| Selecting functions | You choose the functions a rule covers, and review the matched set before saving | You write targeting rules on function names and tags, with logical operators |
73+
| Functions created later | Not instrumented. The covered set is fixed when you save the rule | Instrumented automatically when they match your targeting rules |
74+
| Layer versions | Datadog selects and updates them | You set them, and they stay fixed until you change them |
75+
| Datadog credentials in your account | None for Lambda. Instrumented functions authenticate with [Workload Identity Federation][16] | A Datadog API key with Remote Configuration enabled |
76+
| Datadog permissions | Hosts Read and Agent Install | Serverless AWS Instrumentation Read and Write |
77+
| Removing instrumentation | Uninstall from Datadog | Delete the CloudFormation stack in that region |
78+
79+
Use instrumentation through the AWS integration when you want one place to instrument both EC2 instances and Lambda functions, want nothing extra deployed in your account, or want to avoid storing a Datadog API key there. Use remote instrumentation when you need functions created later to be instrumented as they appear, or when you want to control the layer versions applied to your functions.
80+
5881
## Prerequisites
5982

6083
For all workloads, confirm the following:

0 commit comments

Comments
 (0)