refactor: move constants out of internal.constants by emmettbutler · Pull Request #18964 · DataDog/dd-trace-py

emmettbutler · 2026-07-09T16:58:40Z

Description

This change relocates many constant definitions from ddtrace.internal.constants. For each constant, the destination was chosen based on the current set of dependent modules. Examples:

Imported by multiple contribs, appsec -> move to ddtrace.internal.utils.constants
Imported only by code related to propagation -> move to ddtrace.propagation._constants
Imported by dsm, llmobs -> move to ddtrace.internal.utils.constants
Imported by multiple contribs -> move to ddtrace.contrib.internal._constants

This approach reduces coupling by shrinking the widely-shared internal module slightly.

This change doesn't make any attempt to remove knowledge of external concepts from modules. For example, ddtrace.internal.utils.http currently knows about the concepts of sampling and span tags via its import of SAMPLING_DECISION_TRACE_TAG_KEY, but it ideally would not. Such abstraction leakage will be addressed in a future change.

Testing

No functional changes are expected

cit-pr-commenter-54b7da · 2026-07-09T16:59:43Z

Circular import analysis

⚠️ Existing circular imports

There are 4974 circular imports that already exist on the base branch and have not been changed by this PR.

Show existing cycles (showing 5 of 4974 shortest)

ddtrace.internal.core -> ddtrace._trace.span -> ddtrace.internal.core
ddtrace.internal.datastreams -> ddtrace.internal.datastreams.kafka -> ddtrace.internal.datastreams
ddtrace.internal.datastreams -> ddtrace.internal.datastreams.aiokafka -> ddtrace.internal.datastreams
ddtrace.internal.datastreams -> ddtrace.internal.datastreams.kombu -> ddtrace.internal.datastreams
ddtrace.internal.datastreams -> ddtrace.internal.datastreams.google_cloud_pubsub -> ddtrace.internal.datastreams

To see all cycles, download the cycles-base.json and cycles-pr.json artifacts from this CI job and run:
uv run --script scripts/import-analysis/cycles.py compare cycles-base.json cycles-pr.json

cit-pr-commenter-54b7da · 2026-07-09T16:59:48Z

Codeowners resolved as

ddtrace/appsec/_trace_utils.py                                          @DataDog/asm-python
tests/appsec/contrib_appsec/utils.py                                    @DataDog/asm-python
tests/tracer/test_processors.py                                         @DataDog/apm-sdk-capabilities-python @DataDog/apm-core-python
tests/tracer/test_sampler.py                                            @DataDog/apm-sdk-capabilities-python @DataDog/apm-core-python
tests/tracer/test_single_span_sampling_rules.py                         @DataDog/apm-sdk-capabilities-python @DataDog/apm-core-python

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b157a98c65

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

datadog-prod-us1-4 · 2026-07-09T17:01:39Z

Tests

✨ Fix all issues with BitsAI

⚠️ Warnings

🚦 9 Pipeline jobs failed

DataDog/apm-reliability/dd-trace-py | build linux serverless: [amd64, cp315-cp315, v113741238-d2b8243-manylinux2014_x86_64, 1]

DataDog/apm-reliability/dd-trace-py | build linux serverless: [arm64, cp315-cp315, v113741357-d2b8243-manylinux2014_aarch64, 1]

DataDog/apm-reliability/dd-trace-py | build linux serverless: [arm64, cp315-cp315, v113741589-d2b8243-musllinux_1_2_aarch64, 1]

View all 9 failed jobs.

ℹ️ Info

No other issues found (see more)

🧪 All tests passed
❄️ No new flaky tests detected

🔄 Datadog auto-retried 6 jobs - 4 passed on retry

Useful? React with 👍 / 👎

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: c423a5c | Docs | Datadog PR Page | Give us feedback!}

pr-commenter · 2026-07-10T16:59:00Z

Benchmarks

Benchmark execution time: 2026-07-11 00:07:08

Comparing candidate commit b1d7f04 in PR branch emmett.butler/move-internal-constants with baseline commit 857c18a in branch main.

Found 0 performance improvements and 1 performance regressions! Performance is the same for 621 metrics, 10 unstable metrics.

scenario:iastaspectsospath-ospathbasename_aspect

🟥 execution_time [+96.727µs; +107.236µs] or [+22.663%; +25.125%]

…ace/constants, or propagation/_constants depending on what units import them

datadog-prod-us1-4

More details

Static analysis and adversarial constant-value tests confirm all 70+ constants were correctly relocated — values unchanged, no stale imports from ddtrace.internal.constants, new constants files are import-free (eliminating any circular-import risk), and every consumer (production + tests) now points to the new module path. The removed SPAN_API_OPENTRACING was dead code with zero callers.

Was this helpful? React 👍 or 👎

_{📊 Validated against 12 scenarios · Open Bits AI session}

_{🤖 Datadog Autotest · Commit c423a5c · What is Autotest? · Any feedback? Reach out in #autotest}

KowalskiThomas

LGTM for Profiling.

move propagation constants to propagation module

b157a98

emmettbutler requested review from a team as code owners July 9, 2026 16:58

emmettbutler requested review from brettlangdon, rachelyangdog and rithikanarayan July 9, 2026 16:58

emmettbutler marked this pull request as draft July 9, 2026 16:58

emmettbutler added the changelog/no-changelog A changelog entry is not required for this PR. label Jul 9, 2026

brettlangdon reviewed Jul 9, 2026

View reviewed changes

Comment thread ddtrace/propagation/constants.py Outdated

chatgpt-codex-connector Bot reviewed Jul 9, 2026

View reviewed changes

Comment thread ddtrace/propagation/constants.py Outdated

emmettbutler added 7 commits July 9, 2026 10:08

move constants referencing trace tags to _trace

eae2e0f

private all propagation constants

e4c38aa

fix pyx import

526be5b

fmt

d090be9

fix local imports

71f21ef

relative import might be necessary

e6e7726

fix wrong import

e3ca575

emmettbutler commented Jul 10, 2026

View reviewed changes

Comment thread ddtrace/internal/runtime/tag_collectors.py Outdated

emmettbutler commented Jul 10, 2026

View reviewed changes

Comment thread ddtrace/internal/_encoding.pyx

emmettbutler added 2 commits July 10, 2026 09:22

try importing from a known-working file

efe7d1c

update import in ddup

9837963

P403n1x87 reviewed Jul 10, 2026

View reviewed changes

Comment thread ddtrace/_trace/constants.py Outdated

P403n1x87 reviewed Jul 10, 2026

View reviewed changes

Comment thread ddtrace/internal/utils/http.py

emmettbutler added 2 commits July 10, 2026 10:23

missed local import

a625ebc

move MESSAGING_* to _trace, their only dependent

a3dfdfc

emmettbutler added 9 commits July 10, 2026 10:44

move a bunch of constants from internal to either internal/utils, _tr…

60c7308

…ace/constants, or propagation/_constants depending on what units import them

move constants, many to new files belonging to smaller modules

3fb2ebd

update imports of DEFAULT_SERVICE_NAME

14b702f

update imports for constant moves

cb7a846

update imports for constant moves

eb4f64b

update imports for constant moves

1d3fc19

fmt

75892c5

fix imports

b1d0eaf

kafka imports

b1d7f04

emmettbutler requested review from P403n1x87 and brettlangdon July 11, 2026 00:00

more import updates

96a9c17

emmettbutler changed the title ~~refactor: move propagation constants to propagation module~~ refactor: move constants out of internal.constants Jul 11, 2026

Merge branch 'main' into emmett.butler/move-internal-constants

c423a5c

emmettbutler marked this pull request as ready for review July 11, 2026 00:53

emmettbutler requested review from a team as code owners July 11, 2026 00:53

emmettbutler requested review from gyuheon0h and wantsui July 11, 2026 00:53

datadog-prod-us1-4 Bot reviewed Jul 11, 2026

View reviewed changes

KowalskiThomas approved these changes Jul 12, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: move constants out of internal.constants#18964

refactor: move constants out of internal.constants#18964
emmettbutler wants to merge 23 commits into
mainfrom
emmett.butler/move-internal-constants

emmettbutler commented Jul 9, 2026 •

edited

Loading

Uh oh!

cit-pr-commenter-54b7da Bot commented Jul 9, 2026 •

edited

Loading

Uh oh!

cit-pr-commenter-54b7da Bot commented Jul 9, 2026 •

edited

Loading

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

datadog-prod-us1-4 Bot commented Jul 9, 2026 •

edited by datadog-datadog-us1-prod Bot

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pr-commenter Bot commented Jul 10, 2026 •

edited

Loading

Uh oh!

datadog-prod-us1-4 Bot left a comment

Uh oh!

KowalskiThomas left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

emmettbutler commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing

Uh oh!

cit-pr-commenter-54b7da Bot commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Circular import analysis

⚠️ Existing circular imports

Uh oh!

cit-pr-commenter-54b7da Bot commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codeowners resolved as

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

datadog-prod-us1-4 Bot commented Jul 9, 2026 • edited by datadog-datadog-us1-prod Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Warnings

ℹ️ Info

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pr-commenter Bot commented Jul 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Benchmarks

scenario:iastaspectsospath-ospathbasename_aspect

Uh oh!

datadog-prod-us1-4 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

KowalskiThomas left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

emmettbutler commented Jul 9, 2026 •

edited

Loading

cit-pr-commenter-54b7da Bot commented Jul 9, 2026 •

edited

Loading

cit-pr-commenter-54b7da Bot commented Jul 9, 2026 •

edited

Loading

datadog-prod-us1-4 Bot commented Jul 9, 2026 •

edited by datadog-datadog-us1-prod Bot

Loading

pr-commenter Bot commented Jul 10, 2026 •

edited

Loading