feat(datadog-aws): add per-service interceptor crates for SQS, SNS, and EventBridge by Dogbu-cyber · Pull Request #189 · DataDog/dd-trace-rs

Dogbu-cyber · 2026-03-17T20:39:06Z

PR Stack: #194 (workspace setup) -> #189 (aws-sdk injection) -> #190 (lambda consumer)

What does this PR do?

Adds trace context injection for the AWS SDK for Rust via three focused interceptor crates. Each crate pulls in only the AWS SDK dependency it needs — users add only what they use.

Crate architecture

instrumentation/
├── datadog-aws-core/       # internal — ServiceHandler trait, generic AwsInterceptor,
│                           #            attribute_keys, limits (not published)
├── datadog-aws-sqs/        # SqsInterceptor
├── datadog-aws-sns/        # SnsInterceptor
└── datadog-aws-eventbridge/ # EventBridgeInterceptor

Usage

// Only pull in the services you use
use datadog_aws_sqs::SqsInterceptor;
use datadog_aws_sns::SnsInterceptor;
use datadog_aws_eventbridge::EventBridgeInterceptor;

let sqs = aws_sdk_sqs::Client::from_conf(
    config.to_builder().interceptor(SqsInterceptor::new()).build()
);

Supported operations

Service	Inject operations	Tag-only operations	Injection point
SQS	`SendMessage`, `SendMessageBatch`	`ReceiveMessage`, `DeleteMessage`, `DeleteMessageBatch`	`_datadog` MessageAttribute (String, JSON)
SNS	`Publish`, `PublishBatch`	`GetTopicAttributes`, `ListSubscriptionsByTopic`, `Subscribe`, `CreateTopic`, etc.	`_datadog` MessageAttribute (Binary) — avoids subscription filter policy interference
EventBridge	`PutEvents`	`PutRule`, `PutTargets`, `DescribeRule`, etc.	`_datadog` key in event `detail` JSON

Each interceptor also creates a client span (sqs.request, sns.request, eventbridge.request) with standard Datadog tags: aws.service, aws.operation, aws.region, aws.partition, resource.name, operation.name, etc.

Design notes

datadog-aws-core exposes a ServiceHandler trait; each service crate implements it and wraps the generic AwsInterceptor in a concrete named type (SqsInterceptor etc.)
Injection never fails an AWS call — errors are swallowed and logged at debug level
SQS/SNS respect the 10-attribute cap but overwrite a stale _datadog attribute if present
EventBridge skips injection if the resulting detail would exceed 1 MB
Integration test infrastructure (mock_aws, init_test_tracer, sdk_config, span_attrs) lives in datadog-aws-core behind a test-utils feature flag, so service test files contain only the client builder and test cases

ygree · 2026-03-18T02:09:42Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 302fbb5267

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

joeyzhao2018

LGTM

Dogbu-cyber · 2026-03-30T19:21:53Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 80424aa3a6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-30T19:28:50Z

+        // EventBridge entries have a 1 MB detail size limit.
+        if new_detail.len() > ONE_MB {
+            continue;


Validate full PutEvents entry size before mutating Detail

The size guard only checks new_detail.len(), but EventBridge enforces the 1 MB limit on the entire PutEventsRequestEntry payload, not just the Detail field. If an entry is already near the limit because of Source, DetailType, Resources, etc., adding _datadog can push the total entry size over quota and make PutEvents fail, even though tracing is intended to be non-intrusive. This should use the documented entry-size calculation (or equivalent full-entry check) before writing the mutated detail.

Useful? React with 👍 / 👎.

ygree · 2026-04-13T22:26:40Z

+        loop {
+            let Ok((stream, _)) = listener.accept().await else {
+                break;
+            };


Suggested change

loop {

let Ok((stream, _)) = listener.accept().await else {

break;

};

while let Ok((stream, _)) = listener.accept().await {

ygree · 2026-04-14T00:10:16Z

+        // before extracting trace headers so the injected context points to
+        // this span, not the caller's span.
+        let parent_cx = Context::current();
+        let tracer = global::tracer(TRACER_NAME);


global::tracer(TRACER_NAME) is called on every AWS SDK invocation, but it acquires an RwLock read guard and boxes a new tracer each time for a constant name. Consider resolving it once in new() and storing it as an Arc<BoxedTracer> field.

ygree · 2026-04-14T19:48:33Z

+        };
+        let span = span_ctx.0.span();
+
+        // Re-set response tags to cover cases where read_after_transmit did not run


read_after_transmit seems to be redundant

…ventBridge Implements Datadog trace context injection for the AWS SDK for Rust via three focused interceptor crates, each pulling in only the AWS SDK dependency it needs: - datadog-aws-core: shared ServiceHandler trait and generic AwsInterceptor (internal, not published) - datadog-aws-sqs: SqsInterceptor - datadog-aws-sns: SnsInterceptor - datadog-aws-eventbridge: EventBridgeInterceptor Each interceptor creates a client span for the operation and injects Datadog trace context into the outbound payload: - SQS: String message attribute (_datadog, JSON) - SNS: Binary message attribute (_datadog) to avoid filter policy interference - EventBridge: _datadog key in the PutEvents detail JSON field Injection respects service limits (SQS/SNS 10-attribute cap, EventBridge 1 MB detail limit) and never fails an AWS call on injection error.

Move mock_aws, init_test_tracer, sdk_config, span_attrs, extract_traceparent, and split_traceparent into datadog-aws-core behind a test-utils feature flag. Each service crate's integration test now imports from core rather than duplicating ~80 lines of infrastructure. Service test dev-dependencies drop from 9 entries to 4 (core+test-utils, aws-types, serial_test, tokio).

Move ONE_MB and MAX_MESSAGE_ATTRIBUTES out of individual service crates and into datadog-aws-core/src/limits.rs. Both constants were either duplicated (MAX_MESSAGE_ATTRIBUTES in SQS and SNS) or service-local despite being applicable across multiple services.

- Drop PropagatorCarrier newtype: opentelemetry provides impl Injector for HashMap<String, String> out of the box, making the wrapper redundant - Change base_tags visibility from pub to pub(crate): it is an internal helper for AwsInterceptor, not part of the public API - Use serde_json::to_value in inject_into_put_events instead of manually mapping trace_headers into serde_json::Value::String entries

…base_tags

- Module-level `//!` doc on `interceptor` explaining the 3-hook pipeline - Field/function docs on `SpanContext`, `extract_trace_headers`, `set_response_tags`, `partition_from_region`, `base_tags`, and `AwsInterceptor::new`; existing inline comments promoted to `///` - Per-hook docs on `modify_before_serialization`, `read_before_transmit`, and `read_after_execution` - `#![cfg_attr(not(test), deny(clippy::panic/unwrap_used/expect_used))]` so tracing can never crash a customer AWS call

- `SqsOperation` enum and `from_name` doc explaining which ops inject - `SqsHandler`, `inject`, `service_tags`, `inject_into_send_message`, `inject_into_send_message_batch`, `extract_sqs_metadata`, and `build_datadog_attribute` all documented - `should_skip_injection` inline comment promoted to `///` doc - `#![cfg_attr(not(test), deny(clippy::panic/unwrap_used/expect_used))]`

- `SnsOperation` enum and `from_name` doc explaining which ops inject - `SnsHandler`, `inject`, `service_tags`, `inject_into_publish`, `inject_into_publish_batch`, `HasTopicArn`, `topic_arn_tag`, and `arn_resource_name` all documented - `should_skip_injection` inline comment promoted to `///` doc - `build_datadog_attribute` inline comment about Binary-vs-String promoted to `///` doc (SNS filter policy behaviour) - `#![cfg_attr(not(test), deny(clippy::panic/unwrap_used/expect_used))]`

- `EventBridgeOperation` enum and `from_name` doc explaining which ops inject - `EventBridgeHandler`, `inject`, `service_tags`, `extract_rule_name` (field name difference between rule-management ops), and `inject_into_put_events` (detail merge, start timestamp, size limit, and skip conditions) all documented - `inject` inline comment promoted to `///` doc - `#![cfg_attr(not(test), deny(clippy::panic/unwrap_used/expect_used))]`

Dogbu-cyber added the enhancement New feature or request label Mar 17, 2026

Dogbu-cyber mentioned this pull request Mar 17, 2026

feat(datadog-aws-lambda): add distributed tracing for Rust Lambda functions #190

Open

Dogbu-cyber marked this pull request as ready for review March 17, 2026 22:01

Dogbu-cyber requested a review from a team as a code owner March 17, 2026 22:01

joeyzhao2018 reviewed Mar 17, 2026

View reviewed changes

Comment thread integrations/aws/aws-sdk-rust/README.md Outdated

chatgpt-codex-connector bot reviewed Mar 18, 2026

View reviewed changes

Comment thread integrations/aws/aws-sdk-rust/Cargo.toml Outdated

Comment thread integrations/aws/aws-sdk-rust/src/services/sns.rs Outdated

Comment thread integrations/aws/aws-sdk-rust/src/services/sqs.rs Outdated

Dogbu-cyber changed the base branch from main to david.ogbureke/ci-integration-msrv March 22, 2026 00:54

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from ee01b82 to 612838b Compare March 22, 2026 00:55

Dogbu-cyber force-pushed the david.ogbureke/ci-integration-msrv branch 2 times, most recently from 141c5dd to 1184437 Compare March 22, 2026 20:52

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 612838b to 4f7442a Compare March 23, 2026 14:54

Dogbu-cyber mentioned this pull request Mar 23, 2026

chore(instrumentation): set up instrumentation workspace #194

Open

Dogbu-cyber changed the title ~~AWS SDK Integration~~ feat(datadog-aws-sdk): add trace context injection for SQS, SNS, and EventBridge Mar 23, 2026

joeyzhao2018 approved these changes Mar 27, 2026

View reviewed changes

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 3fa3937 to 80424aa Compare March 30, 2026 19:20

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 80424aa to 80fedd0 Compare March 30, 2026 19:26

chatgpt-codex-connector bot reviewed Mar 30, 2026

View reviewed changes

Dogbu-cyber force-pushed the david.ogbureke/ci-integration-msrv branch 2 times, most recently from 17f2c7a to 78a6876 Compare March 30, 2026 20:30

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 80fedd0 to 18c7914 Compare March 30, 2026 20:48

Dogbu-cyber force-pushed the david.ogbureke/ci-integration-msrv branch from 78a6876 to bf4ea81 Compare April 2, 2026 14:54

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch 2 times, most recently from 35b2e4f to 7d1fbbe Compare April 2, 2026 15:32

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 29211f0 to d999596 Compare April 13, 2026 12:51

ygree reviewed Apr 13, 2026

View reviewed changes

ygree reviewed Apr 14, 2026

View reviewed changes

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch 2 times, most recently from 7e64f6f to f1e120e Compare April 14, 2026 18:06

ygree reviewed Apr 14, 2026

View reviewed changes

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from f1e120e to 802625e Compare April 16, 2026 20:38

Dogbu-cyber changed the title ~~feat(datadog-aws-sdk): add trace context injection for SQS, SNS, and EventBridge~~ feat(datadog-aws): add per-service interceptor crates for SQS, SNS, and EventBridge Apr 16, 2026

Dogbu-cyber added 5 commits April 16, 2026 16:56

refactor(datadog-aws-core): avoid allocation for static partition in …

53afb9f

…base_tags

Dogbu-cyber force-pushed the david.ogbureke/ci-integration-msrv branch from d4b18bd to 642bdfd Compare April 16, 2026 21:09

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 2cfa3be to 5cf7cc6 Compare April 16, 2026 21:09

chore: apply cargo fmt

778b9a8

Dogbu-cyber force-pushed the david.ogbureke/aws-sdk-rust branch from 5cf7cc6 to 778b9a8 Compare April 16, 2026 21:38

chore(instrumentation): set workspace version to 0.1.0

b1bd2fd

Dogbu-cyber requested a review from ygree April 17, 2026 13:16

Dogbu-cyber added 9 commits April 17, 2026 17:42

refactor(datadog-aws-core): simplify integration mock server

5b33b96

refactor(datadog-aws-core): add typed integration test harness

5ac6c46

refactor(datadog-aws-core): keep intent-only TestHarness constructors

c346410

refactor(datadog-aws-core): use per-crate tracer scope names

ada7ca1

test(instrumentation): align integration assertions with updated tags

8c3e0c7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(datadog-aws): add per-service interceptor crates for SQS, SNS, and EventBridge#189

feat(datadog-aws): add per-service interceptor crates for SQS, SNS, and EventBridge#189
Dogbu-cyber wants to merge 16 commits intodavid.ogbureke/ci-integration-msrvfrom
david.ogbureke/aws-sdk-rust

Dogbu-cyber commented Mar 17, 2026 •

edited

Loading

Uh oh!

Uh oh!

ygree commented Mar 18, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

joeyzhao2018 left a comment

Uh oh!

Dogbu-cyber commented Mar 30, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 30, 2026

Uh oh!

ygree Apr 13, 2026

Uh oh!

ygree Apr 14, 2026

Uh oh!

ygree Apr 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Dogbu-cyber commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Crate architecture

Usage

Supported operations

Design notes

Uh oh!

Uh oh!

ygree commented Mar 18, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

joeyzhao2018 left a comment

Choose a reason for hiding this comment

Uh oh!

Dogbu-cyber commented Mar 30, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Apr 14, 2026

Choose a reason for hiding this comment

Uh oh!

ygree Apr 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Dogbu-cyber commented Mar 17, 2026 •

edited

Loading