Skip to content

chore: configure Datadog merge queue#7561

Merged
watson merged 2 commits intomasterfrom
watson/merge-queue
Feb 18, 2026
Merged

chore: configure Datadog merge queue#7561
watson merged 2 commits intomasterfrom
watson/merge-queue

Conversation

@watson
Copy link
Copy Markdown
Collaborator

@watson watson commented Feb 18, 2026

What does this PR do?

Adds repository.datadog.yaml configuration to configure the Datadog merge queue with speculative workflow. It is heavily inspired by its dd-trace-py counterpart. This allows PRs to be validated against the latest base branch before merging, preventing conflicts and broken builds in high-velocity merges.

The queue is restricted to master to avoid running on other branches.

Configuration details:

  • Speculative workflow with fallback enabled
  • Up to 5 PRs validated in parallel
  • GitLab checks enabled with retry support
  • Fail-fast disabled to wait for full pipeline completion
  • Labels skipped to avoid triggering required status checks

Motivation

The merge queue helps prevent merge conflicts and broken builds by validating PRs against the latest base branch before merging, which is especially important in repositories with high merge velocity where multiple PRs may be merged in quick succession.

Additional Notes

For now, the merge queue isn't enforced, but opt-in. This allows us to test drive it, and only choose to enforce it if we decide the pros outweigh the cons.

Add `repository.datadog.yaml` configuration to enable the Datadog
merge queue with speculative workflow. This allows PRs to be
validated against the latest base branch before merging,
preventing conflicts and broken builds in high-velocity merges.

The queue is restricted to `master` to avoid running on other
branches. The All Green workflow is also excluded from merge queue
working branches, where it serves no purpose.

Configuration details:
- Speculative workflow with fallback enabled
- Up to 5 PRs validated in parallel
- GitLab checks enabled with retry support
- Fail-fast disabled to wait for full pipeline completion
- Labels skipped to avoid triggering required status checks
Copy link
Copy Markdown
Collaborator Author

watson commented Feb 18, 2026

This stack of pull requests is managed by Graphite. Learn more about stacking.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Feb 18, 2026

Overall package size

Self size: 4.64 MB
Deduped: 5.48 MB
No deduping: 5.48 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | import-in-the-middle | 2.0.6 | 81.92 kB | 813.08 kB | | dc-polyfill | 0.1.10 | 26.73 kB | 26.73 kB |

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@datadog-datadog-prod-us1

This comment has been minimized.

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 18, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.29%. Comparing base (8edb07d) to head (c30967d).
⚠️ Report is 7 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7561      +/-   ##
==========================================
+ Coverage   80.15%   80.29%   +0.13%     
==========================================
  Files         730      732       +2     
  Lines       31217    31468     +251     
==========================================
+ Hits        25023    25267     +244     
- Misses       6194     6201       +7     
Flag Coverage Δ
aiguard-macos 39.01% <ø> (-0.10%) ⬇️
aiguard-ubuntu 39.13% <ø> (-0.10%) ⬇️
aiguard-windows 38.87% <ø> (-0.10%) ⬇️
apm-capabilities-tracing-macos 48.38% <ø> (-0.37%) ⬇️
apm-capabilities-tracing-ubuntu 48.42% <ø> (-0.36%) ⬇️
apm-capabilities-tracing-windows 48.12% <ø> (-0.31%) ⬇️
apm-integrations-child-process 38.58% <ø> (-0.10%) ⬇️
apm-integrations-couchbase-18 37.48% <ø> (+0.05%) ⬆️
apm-integrations-couchbase-eol 37.97% <ø> (+0.05%) ⬆️
apm-integrations-oracledb 37.81% <ø> (-0.29%) ⬇️
appsec-express 55.66% <ø> (+0.21%) ⬆️
appsec-fastify 51.97% <ø> (-0.09%) ⬇️
appsec-graphql 52.14% <ø> (-0.27%) ⬇️
appsec-kafka 44.58% <ø> (-0.08%) ⬇️
appsec-ldapjs 44.18% <ø> (-0.24%) ⬇️
appsec-lodash 43.86% <ø> (-0.23%) ⬇️
appsec-macos 58.75% <ø> (+0.24%) ⬆️
appsec-mongodb-core 49.08% <ø> (-0.25%) ⬇️
appsec-mongoose 49.77% <ø> (-0.25%) ⬇️
appsec-mysql 51.14% <ø> (-0.27%) ⬇️
appsec-node-serialize 43.37% <ø> (-0.24%) ⬇️
appsec-passport 47.89% <ø> (-0.28%) ⬇️
appsec-postgres 50.88% <ø> (-0.26%) ⬇️
appsec-sourcing 42.72% <ø> (-0.23%) ⬇️
appsec-template 43.54% <ø> (-0.24%) ⬇️
appsec-ubuntu 58.83% <ø> (+0.24%) ⬆️
appsec-windows 58.60% <ø> (+0.24%) ⬆️
instrumentations-instrumentation-bluebird 32.28% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-body-parser 40.59% <ø> (-0.30%) ⬇️
instrumentations-instrumentation-child_process 37.89% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-cookie-parser 34.33% <ø> (-0.27%) ⬇️
instrumentations-instrumentation-express 34.67% <ø> (-0.27%) ⬇️
instrumentations-instrumentation-express-mongo-sanitize 34.46% <ø> (-0.27%) ⬇️
instrumentations-instrumentation-express-session 40.21% <ø> (-0.30%) ⬇️
instrumentations-instrumentation-fs 31.88% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-generic-pool 29.76% <ø> (-0.44%) ⬇️
instrumentations-instrumentation-http 39.93% <ø> (+0.24%) ⬆️
instrumentations-instrumentation-knex 32.28% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-mongoose 33.46% <ø> (-0.26%) ⬇️
instrumentations-instrumentation-multer 40.33% <ø> (-0.30%) ⬇️
instrumentations-instrumentation-mysql2 38.38% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-passport 44.18% <ø> (-0.30%) ⬇️
instrumentations-instrumentation-passport-http 43.85% <ø> (-0.29%) ⬇️
instrumentations-instrumentation-passport-local 44.40% <ø> (-0.30%) ⬇️
instrumentations-instrumentation-pg 37.79% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-promise 32.21% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-promise-js 32.21% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-q 32.26% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-url 32.18% <ø> (-0.10%) ⬇️
instrumentations-instrumentation-when 32.23% <ø> (-0.10%) ⬇️
llmobs-ai 41.42% <ø> (-0.09%) ⬇️
llmobs-anthropic 40.40% <ø> (-0.30%) ⬇️
llmobs-bedrock 39.32% <ø> (-0.26%) ⬇️
llmobs-google-genai 39.91% <ø> (-0.28%) ⬇️
llmobs-langchain 39.49% <ø> (-0.23%) ⬇️
llmobs-openai 44.23% <ø> (-0.30%) ⬇️
llmobs-vertex-ai 40.19% <ø> (-0.22%) ⬇️
platform-core 29.71% <ø> (ø)
platform-esbuild 32.89% <ø> (ø)
platform-instrumentations-misc 40.53% <ø> (ø)
platform-shimmer 36.14% <ø> (ø)
platform-unit-guardrails 31.27% <ø> (ø)
plugins-azure-event-hubs 24.02% <ø> (ø)
plugins-azure-service-bus 23.42% <ø> (ø)
plugins-bullmq 43.63% <ø> (-0.17%) ⬇️
plugins-cassandra 37.85% <ø> (-0.29%) ⬇️
plugins-cookie 25.08% <ø> (ø)
plugins-cookie-parser 24.87% <ø> (ø)
plugins-crypto 24.72% <ø> (ø)
plugins-dd-trace-api 38.43% <ø> (-0.10%) ⬇️
plugins-express-mongo-sanitize 25.04% <ø> (ø)
plugins-express-session 24.83% <ø> (ø)
plugins-fastify 42.36% <ø> (-0.26%) ⬇️
plugins-fetch 38.39% <ø> (-0.29%) ⬇️
plugins-fs 38.68% <ø> (-0.10%) ⬇️
plugins-generic-pool 24.06% <ø> (ø)
plugins-google-cloud-pubsub 45.51% <ø> (-0.36%) ⬇️
plugins-grpc 41.05% <ø> (-0.30%) ⬇️
plugins-handlebars 25.08% <ø> (ø)
plugins-hapi 40.22% <ø> (-0.31%) ⬇️
plugins-hono 40.49% <ø> (-0.30%) ⬇️
plugins-ioredis 38.49% <ø> (-0.10%) ⬇️
plugins-knex 24.80% <ø> (ø)
plugins-ldapjs 22.61% <ø> (ø)
plugins-light-my-request 24.48% <ø> (ø)
plugins-limitd-client 32.58% <ø> (+0.06%) ⬆️
plugins-lodash 24.13% <ø> (ø)
plugins-mariadb 39.59% <ø> (-0.10%) ⬇️
plugins-memcached 38.22% <ø> (-0.10%) ⬇️
plugins-microgateway-core 39.25% <ø> (-0.30%) ⬇️
plugins-moleculer 40.61% <ø> (-0.30%) ⬇️
plugins-mongodb 39.26% <ø> (-0.30%) ⬇️
plugins-mongodb-core 39.09% <ø> (-0.10%) ⬇️
plugins-mongoose 38.94% <ø> (-0.29%) ⬇️
plugins-multer 24.83% <ø> (ø)
plugins-mysql 39.23% <ø> (-0.10%) ⬇️
plugins-mysql2 39.33% <ø> (-0.10%) ⬇️
plugins-node-serialize 25.12% <ø> (ø)
plugins-opensearch 37.68% <ø> (-0.29%) ⬇️
plugins-passport-http 24.91% <ø> (ø)
plugins-postgres 35.73% <ø> (-0.09%) ⬇️
plugins-process 24.72% <ø> (ø)
plugins-pug 25.08% <ø> (ø)
plugins-redis 38.96% <ø> (+0.06%) ⬆️
plugins-router 43.12% <ø> (-0.27%) ⬇️
plugins-sequelize 23.66% <ø> (ø)
plugins-test-and-upstream-amqp10 38.56% <ø> (-0.10%) ⬇️
plugins-test-and-upstream-amqplib 43.90% <ø> (-0.10%) ⬇️
plugins-test-and-upstream-apollo 39.09% <ø> (-0.27%) ⬇️
plugins-test-and-upstream-avsc 38.82% <ø> (-0.10%) ⬇️
plugins-test-and-upstream-bunyan 33.89% <ø> (-0.10%) ⬇️
plugins-test-and-upstream-connect 40.90% <ø> (-0.31%) ⬇️
plugins-test-and-upstream-graphql 40.23% <ø> (-0.09%) ⬇️
plugins-test-and-upstream-koa 40.47% <ø> (-0.31%) ⬇️
plugins-test-and-upstream-protobufjs 39.06% <ø> (-0.10%) ⬇️
plugins-test-and-upstream-rhea 44.18% <ø> (-0.10%) ⬇️
plugins-undici 39.18% <ø> (-0.29%) ⬇️
plugins-url 24.72% <ø> (ø)
plugins-valkey 38.14% <ø> (-0.10%) ⬇️
plugins-vm 24.72% <ø> (ø)
plugins-winston 34.08% <ø> (-0.28%) ⬇️
plugins-ws 42.01% <ø> (-0.32%) ⬇️
profiling-macos 39.98% <ø> (-0.10%) ⬇️
profiling-ubuntu 40.11% <ø> (-0.10%) ⬇️
profiling-windows 41.34% <ø> (-0.09%) ⬇️
serverless-azure-functions-client 23.75% <ø> (ø)
serverless-azure-functions-eventhubs 23.75% <ø> (ø)
serverless-azure-functions-servicebus 23.75% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@watson watson self-assigned this Feb 18, 2026
@watson watson changed the title chore: enable Datadog merge queue chore: configure Datadog merge queue Feb 18, 2026
@watson watson marked this pull request as ready for review February 18, 2026 07:37
@watson watson requested a review from a team as a code owner February 18, 2026 07:37
@pr-commenter
Copy link
Copy Markdown

pr-commenter Bot commented Feb 18, 2026

Benchmarks

Benchmark execution time: 2026-02-18 13:27:08

Comparing candidate commit c30967d in PR branch watson/merge-queue with baseline commit 8edb07d in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 232 metrics, 28 unstable metrics.

Copy link
Copy Markdown
Member

@BridgeAR BridgeAR left a comment

Choose a reason for hiding this comment

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

Should we allow to circumvent the merge queue with a reason similar to Python? I think that would be beneficial in case we need to unbreak the CI because something weird happened.
Or should we just admin merge in that case?

@watson
Copy link
Copy Markdown
Collaborator Author

watson commented Feb 18, 2026

@BridgeAR I was thinking that we should just admin-merge in that case, similar to what we have done so far with the normal merge button

@watson
Copy link
Copy Markdown
Collaborator Author

watson commented Feb 18, 2026

If we later decide that it's better to do what the python tracer has done, we can always add it in. But I wanted to make this PR change as little of our current workflow as possible, to make it a less controversial change.

@watson watson merged commit 416a1d9 into master Feb 18, 2026
792 checks passed
@watson watson deleted the watson/merge-queue branch February 18, 2026 14:12
watson added a commit that referenced this pull request Feb 18, 2026
Move merge queue settings into `repository.datadog.yml` and
remove `repository.datadog.yaml`.

PR #7561 added the config under the wrong extension even though
the `.yml` file already existed.
watson added a commit that referenced this pull request Feb 18, 2026
Move merge queue settings into `repository.datadog.yml` and
remove `repository.datadog.yaml`.

PR #7561 added the config under the wrong extension even though
the `.yml` file already existed.
dd-octo-sts Bot pushed a commit that referenced this pull request Feb 19, 2026
Add `repository.datadog.yaml` configuration to enable the Datadog
merge queue with speculative workflow. This allows PRs to be
validated against the latest base branch before merging,
preventing conflicts and broken builds in high-velocity merges.

The queue is restricted to `master` to avoid running on other
branches.

Configuration details:
- Speculative workflow with fallback enabled
- Up to 5 PRs validated in parallel
- GitLab checks enabled with retry support
- Fail-fast disabled to wait for full pipeline completion
- Labels skipped to avoid triggering required status checks
dd-octo-sts Bot pushed a commit that referenced this pull request Feb 19, 2026
Move merge queue settings into `repository.datadog.yml` and
remove `repository.datadog.yaml`.

PR #7561 added the config under the wrong extension even though
the `.yml` file already existed.
@dd-octo-sts dd-octo-sts Bot mentioned this pull request Feb 19, 2026
dd-octo-sts Bot pushed a commit that referenced this pull request Feb 20, 2026
Add `repository.datadog.yaml` configuration to enable the Datadog
merge queue with speculative workflow. This allows PRs to be
validated against the latest base branch before merging,
preventing conflicts and broken builds in high-velocity merges.

The queue is restricted to `master` to avoid running on other
branches.

Configuration details:
- Speculative workflow with fallback enabled
- Up to 5 PRs validated in parallel
- GitLab checks enabled with retry support
- Fail-fast disabled to wait for full pipeline completion
- Labels skipped to avoid triggering required status checks
dd-octo-sts Bot pushed a commit that referenced this pull request Feb 20, 2026
Move merge queue settings into `repository.datadog.yml` and
remove `repository.datadog.yaml`.

PR #7561 added the config under the wrong extension even though
the `.yml` file already existed.
@dd-octo-sts dd-octo-sts Bot mentioned this pull request Feb 20, 2026
juan-fernandez pushed a commit that referenced this pull request Mar 5, 2026
Add `repository.datadog.yaml` configuration to enable the Datadog
merge queue with speculative workflow. This allows PRs to be
validated against the latest base branch before merging,
preventing conflicts and broken builds in high-velocity merges.

The queue is restricted to `master` to avoid running on other
branches.

Configuration details:
- Speculative workflow with fallback enabled
- Up to 5 PRs validated in parallel
- GitLab checks enabled with retry support
- Fail-fast disabled to wait for full pipeline completion
- Labels skipped to avoid triggering required status checks
juan-fernandez pushed a commit that referenced this pull request Mar 5, 2026
Move merge queue settings into `repository.datadog.yml` and
remove `repository.datadog.yaml`.

PR #7561 added the config under the wrong extension even though
the `.yml` file already existed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants