feat: seed root session ID in master for stable telemetry headers by khanayan123 · Pull Request #345 · DataDog/nginx-datadog

khanayan123 · 2026-04-07T18:07:53Z

Summary

Seed root_session_id in the master process before workers fork, so all workers share the same root session ID for telemetry correlation per the Stable Service Instance Identifier RFC.

Changes

Add root_session_id field to datadog_main_conf_t
Generate RuntimeID in create_datadog_main_conf (master process, pre-fork)
Pass root_session_id to TracerConfig in make_tracer (worker process, post-fork)

Dependencies

Requires dd-trace-cpp#295 to be merged first (adds root_session_id to TracerConfig)

Generate root_session_id in create_datadog_main_conf (master process) and pass it to TracerConfig in make_tracer (worker process). All workers inherit the same root via fork memory copy, ensuring consistent DD-Root-Session-ID across telemetry from all workers. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

xlamorlette-datadog

lgtm

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

khanayan123 · 2026-04-14T14:12:18Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-04-14T14:12:23Z

View all feedbacks in Devflow UI.

2026-04-14 14:12:22 UTC ℹ️ Start processing command /merge

2026-04-14 14:12:29 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 0s (p90).

2026-04-14 14:43:05 UTC 🚨 MergeQueue: This merge request is in error

mergequeue build completed successfully, but the github api returned an error while merging the pr.
It's probably because:

target branch of PR is restricted to only allow up-to-date branches, but the pr is now outdated

Details

Error: PUT https://api.github.com/repos/DataDog/nginx-datadog/pulls/345/merge: 405 2 of 2 required status checks are expected. [] (Request ID: 8092:144AB2:62E95F:199A84D:69DE526F)

FullStacktrace:
activity error (type: github.GithubService_MergePullRequest, scheduledEventID: 50, startedEventID: 51, identity: 1@github-worker-54d465dd76-b9wps@): PUT https://api.github.com/repos/DataDog/nginx-datadog/pulls/345/merge: 405 2 of 2 required status checks are expected. [] (Request ID: 8092:144AB2:62E95F:199A84D:69DE526F) (type: GitFailure, retryable: false): PUT https://api.github.com/repos/DataDog/nginx-datadog/pulls/345/merge: 405 2 of 2 required status checks are expected. [] (type: ErrorResponse, retryable: true)

khanayan123 · 2026-04-15T14:34:23Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-04-15T14:34:27Z

View all feedbacks in Devflow UI.

2026-04-15 14:34:27 UTC ℹ️ Start processing command /merge

2026-04-15 14:34:34 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals. View in MergeQueue UI.
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.

2026-04-15 14:59:17 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in master is approximately 0s (p90).

2026-04-15 15:22:23 UTC ℹ️ MergeQueue: This merge request was merged

chore: update dd-trace-cpp submodule to stable session ID headers branch

22ecd02

Points to ayan.khan/stable-session-id-headers tip for integration validation of DD-Session-ID and DD-Root-Session-ID telemetry headers. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

khanayan123 mentioned this pull request Apr 8, 2026

feat: seed root session ID for stable telemetry headers DataDog/httpd-datadog#54

Open

xlamorlette-datadog reviewed Apr 10, 2026

View reviewed changes

khanayan123 and others added 2 commits April 10, 2026 14:05

chore: update dd-trace-cpp submodule to latest

267814e

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: remove submodule pin, keep only src changes

4adedd4

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

khanayan123 changed the title ~~chore: validate stable session ID headers from dd-trace-cpp~~ feat: seed root session ID in master for stable telemetry headers Apr 13, 2026

khanayan123 marked this pull request as ready for review April 13, 2026 15:15

khanayan123 requested a review from a team as a code owner April 13, 2026 15:15

Merge branch 'master' into ayan.khan/stable-session-id-headers

bf99832

khanayan123 requested a review from xlamorlette-datadog April 13, 2026 15:15

chore: update dd-trace-cpp submodule to main (includes #295)

44fc0fd

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

xlamorlette-datadog approved these changes Apr 14, 2026

View reviewed changes

gh-worker-dd-devflow-36fce6 bot added mergequeue-status: queued mergequeue-status: in_progress mergequeue-status: error and removed mergequeue-status: queued mergequeue-status: in_progress labels Apr 14, 2026

Merge branch 'master' into ayan.khan/stable-session-id-headers

07364ec

gh-worker-dd-devflow-36fce6 bot added mergequeue-status: waiting mergequeue-status: queued mergequeue-status: in_progress and removed mergequeue-status: error mergequeue-status: waiting mergequeue-status: queued labels Apr 15, 2026

gh-worker-dd-mergequeue-cf854d bot merged commit 2dfda7f into master Apr 15, 2026
177 checks passed

gh-worker-dd-devflow-36fce6 bot removed the mergequeue-status: in_progress label Apr 15, 2026

gh-worker-dd-mergequeue-cf854d bot deleted the ayan.khan/stable-session-id-headers branch April 15, 2026 15:22

gh-worker-dd-devflow-36fce6 bot added the mergequeue-status: done label Apr 15, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: seed root session ID in master for stable telemetry headers#345

feat: seed root session ID in master for stable telemetry headers#345
gh-worker-dd-mergequeue-cf854d[bot] merged 7 commits intomasterfrom
ayan.khan/stable-session-id-headers

khanayan123 commented Apr 7, 2026 •

edited

Loading

Uh oh!

datadog-official bot commented Apr 7, 2026 •

edited by datadog-prod-us1-6 bot

Loading

Uh oh!

xlamorlette-datadog left a comment

Uh oh!

khanayan123 commented Apr 14, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 bot commented Apr 14, 2026 •

edited

Loading

Uh oh!

khanayan123 commented Apr 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 bot commented Apr 15, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

khanayan123 commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Dependencies

Related

Uh oh!

datadog-official bot commented Apr 7, 2026 • edited by datadog-prod-us1-6 bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xlamorlette-datadog left a comment

Choose a reason for hiding this comment

Uh oh!

khanayan123 commented Apr 14, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 bot commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

khanayan123 commented Apr 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 bot commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

khanayan123 commented Apr 7, 2026 •

edited

Loading

datadog-official bot commented Apr 7, 2026 •

edited by datadog-prod-us1-6 bot

Loading

gh-worker-devflow-routing-ef8351 bot commented Apr 14, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 bot commented Apr 15, 2026 •

edited

Loading