Skip to content

[SVLS-7298] Add support for merging upstream traces with Step Function#31180

Merged
ryanstrat merged 13 commits intomasterfrom
ryan.strat/upstream-sfn-tracing
Aug 22, 2025
Merged

[SVLS-7298] Add support for merging upstream traces with Step Function#31180
ryanstrat merged 13 commits intomasterfrom
ryan.strat/upstream-sfn-tracing

Conversation

@ryanstrat
Copy link
Copy Markdown
Contributor

@ryanstrat ryanstrat commented Aug 19, 2025 •
edited
Loading

What does this PR do? What is the motivation?

This PR expands the documentation related to Step Function trace merging and updates the related JSONata strings, which propagate Datadog Context more effectively.

Merge instructions

This is ready to merge once it is approved.

Merge readiness:

  • Ready for merge

@ryanstrat ryanstrat requested review from a team as code owners August 19, 2025 18:58
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 19, 2025 •
edited
Loading

✅ Documentation Team Review

The documentation team has approved this pull request. Thank you for your contribution!

@janine-c janine-c self-assigned this Aug 19, 2025
janine-c
janine-c approved these changes Aug 19, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@janine-c janine-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, Ryan! I made some really minor suggestions, but none of them are dealbreakers by any means. Don't hesitate to ping me if you have any questions!

Comment thread content/en/serverless/step_functions/distributed-maps.md Outdated
Comment thread content/en/serverless/step_functions/merge-step-functions-lambda.md Outdated
Comment thread content/en/serverless/step_functions/merge-step-functions-lambda.md
Comment thread content/en/serverless/step_functions/merge-step-functions-lambda.md Outdated
Comment on lines +384 to +388
For services not covered in this guide, you can merge traces by manually propagating [Datadog trace context][3].

**Upstream services to Step Functions**: Include trace context in the Step Function input payload as JSON under the `_datadog` key, which can be located anywhere in the payload.

**Step Functions to Downstream services**: Add Step Function execution context to your task definitions using the patterns shown above. Additional configuration of the downstream service may be required.
Copy link
Copy Markdown
Contributor

@janine-c janine-c Aug 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
For services not covered in this guide, you can merge traces by manually propagating [Datadog trace context][3].
**Upstream services to Step Functions**: Include trace context in the Step Function input payload as JSON under the `_datadog` key, which can be located anywhere in the payload.
**Step Functions to Downstream services**: Add Step Function execution context to your task definitions using the patterns shown above. Additional configuration of the downstream service may be required.
For services not covered in this guide, you can merge traces by manually propagating [Datadog trace context][3].
- **Upstream services to Step Functions**: Include trace context in the Step Function input payload as JSON under the `_datadog` key, which can be located anywhere in the payload.
- **Step Functions to downstream services**: Add Step Function execution context to your task definitions using the patterns shown above. Additional configuration of the downstream service may be required.

@janine-c janine-c removed their assignment Aug 19, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 20, 2025

Preview links (active after the build_preview check completes)

Modified Files

ryanstrat and others added 5 commits August 20, 2025 14:05
@ryanstrat
Formatting
ca899b9
@ryanstrat
Improve clarity of downstream trace propagation
115b832
@ryanstrat @janine-c
Apply suggestion from @janine-c
8f62ff3 
Co-authored-by: Janine Chan <64388808+janine-c@users.noreply.github.com>
@ryanstrat @janine-c
Apply suggestion from @janine-c
522964f 
Co-authored-by: Janine Chan <64388808+janine-c@users.noreply.github.com>
@ryanstrat @janine-c
Apply suggestion from @janine-c
ac4f7d1 
Co-authored-by: Janine Chan <64388808+janine-c@users.noreply.github.com>
@ryanstrat ryanstrat requested a review from janine-c August 21, 2025 20:00
janine-c
janine-c approved these changes Aug 21, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@janine-c janine-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Some more minor suggestions 🙂

Comment thread content/en/serverless/step_functions/merge-step-functions-lambda.md Outdated
Comment thread content/en/serverless/step_functions/merge-step-functions-lambda.md Outdated
Comment thread content/en/serverless/step_functions/merge-step-functions-lambda.md Outdated
ryanstrat and others added 3 commits August 21, 2025 16:24
@ryanstrat @janine-c
Apply suggestion from @janine-c
d97445e 
Co-authored-by: Janine Chan <64388808+janine-c@users.noreply.github.com>
@ryanstrat
Apply suggestions from reviews
931957e
@ryanstrat
Fix capitalization
bbee695
@ryanstrat
Copy link
Copy Markdown
Contributor Author

ryanstrat commented Aug 21, 2025

/merge

@dd-devflow-routing-codex
Copy link
Copy Markdown

dd-devflow-routing-codex Bot commented Aug 21, 2025 •
edited
Loading

View all feedbacks in Devflow UI.

2025-08-21 20:49:53 UTC ℹ️ Start processing command /merge

2025-08-21 20:50:00 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2025-08-21 21:27:13 UTC ℹ️ MergeQueue: queue is disabled

Added to the queue but the mergequeue is not enabled for now.

2025-08-22 14:03:02 UTC ℹ️ MergeQueue: This merge request was already merged

This pull request was merged directly.

@ryanstrat ryanstrat merged commit ddea507 into master Aug 22, 2025
20 of 22 checks passed
@ryanstrat ryanstrat deleted the ryan.strat/upstream-sfn-tracing branch August 22, 2025 14:02
@ryanstrat ryanstrat mentioned this pull request Dec 3, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@janine-c janine-c janine-c approved these changes

+1 more reviewer

@avedmala avedmala avedmala approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

mergequeue-status: done

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ryanstrat @avedmala @janine-c