Skip to content

Add served_by_colo to D1 tracing spans #6733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lambrospetrou merged 2 commits into from
May 6, 2026
+50 −0
Merged

Add served_by_colo to D1 tracing spans #6733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01f7132
Add served_by_colo to D1 tracing spans
lambrospetrou May 6, 2026
8175228
Update src/cloudflare/internal/d1-api.ts
lambrospetrou May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/cloudflare/internal/d1-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ interface D1Meta {
*/
served_by_region?: string;

/**
* The three-letter airport code of the colo that executed the query.
*/
served_by_colo?: string;

/**
* True if-and-only-if the database instance that executed the query was the primary.
*/
Expand Down Expand Up @@ -753,6 +758,10 @@ function addD1MetaToSpan(span: Span, meta: D1Meta): void {
'cloudflare.d1.response.served_by_region',
meta.served_by_region
);
span.setAttribute(
'cloudflare.d1.response.served_by_colo',
meta.served_by_colo
);
span.setAttribute(
'cloudflare.d1.response.served_by_primary',
meta.served_by_primary
Expand Down Expand Up @@ -795,6 +804,9 @@ function aggregateD1Meta(metas: PartialD1Meta[]): D1Meta {
if (meta.served_by_region) {
aggregatedMeta.served_by_region = meta.served_by_region;
}
if (meta.served_by_colo) {
aggregatedMeta.served_by_colo = meta.served_by_colo;
}
if (meta.served_by_primary) {
aggregatedMeta.served_by_primary = meta.served_by_primary;
}
Expand Down
37 changes: 37 additions & 0 deletions src/cloudflare/internal/test/d1/d1-api-instrumentation-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 0,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down Expand Up @@ -99,6 +100,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 0,
'cloudflare.d1.response.changed_db': true,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -125,6 +127,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 0,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -151,6 +154,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 0,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -177,6 +181,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 0,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down Expand Up @@ -209,6 +214,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': true,
'cloudflare.d1.response.changes': 2,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -235,6 +241,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': true,
'cloudflare.d1.response.changes': 2,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down Expand Up @@ -267,6 +274,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': true,
'cloudflare.d1.response.changes': 2,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -293,6 +301,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -319,6 +328,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -345,6 +355,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -371,6 +382,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -397,6 +409,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -423,6 +436,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -449,6 +463,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -475,6 +490,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -501,6 +517,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -527,6 +544,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -553,6 +571,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -579,6 +598,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -605,6 +625,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -631,6 +652,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -657,6 +679,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -683,6 +706,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down Expand Up @@ -712,6 +736,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -738,6 +763,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -764,6 +790,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -790,6 +817,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -816,6 +844,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -842,6 +871,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 2,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down Expand Up @@ -873,6 +903,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': true,
'cloudflare.d1.response.changes': 5,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -899,6 +930,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -925,6 +957,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -951,6 +984,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -977,6 +1011,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand All @@ -1003,6 +1038,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': false,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down Expand Up @@ -1030,6 +1066,7 @@ const expectedSpans = [
'cloudflare.d1.response.last_row_id': 3,
'cloudflare.d1.response.changed_db': true,
'cloudflare.d1.response.changes': 0,
'cloudflare.d1.response.served_by_colo': 'DFW',
closed: true,
},
{
Expand Down
1 change: 1 addition & 0 deletions src/cloudflare/internal/test/d1/d1-mock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export class D1MockDO {
meta: {
duration: Math.random() * 0.01,
served_by: 'd1-mock',
served_by_colo: 'DFW',
changes: num_changes,
last_row_id: last_row_id_after,
changed_db,
Expand Down
Loading