Skip to content

fix(di): remote re-enablement#17158

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 3 commits intomainfrom
fix/di-remote-enablement
Mar 30, 2026
Merged

fix(di): remote re-enablement#17158
gh-worker-dd-mergequeue-cf854d[bot] merged 3 commits intomainfrom
fix/di-remote-enablement

Conversation

@P403n1x87
Copy link
Copy Markdown
Contributor

Description

We fix the logic that controls remote enablement for Dynamic Instrumentation. Previously, if DI was enabled via environment variable and then disabled via the UI, any new attempts at re-enabling it remotely would be ignored. We fix the logic to look at the original parsed value from the environment variable instead of any potential runtime overrides instead.

We fix the logic that controls remote enablement for Dynamic
Instrumentation. Previously, if DI was enabled via environment variable
and then disabled via the UI, any new attempts at re-enabling it remotely
would be ignored. We fix the logic to look at the original parsed value
from the environment variable instead of any potential runtime overrides
instead.
@P403n1x87 P403n1x87 added changelog/no-changelog A changelog entry is not required for this PR. Dynamic Instrumentation Dynamic Instrumentation/Live Debugger and removed changelog/no-changelog A changelog entry is not required for this PR. labels Mar 27, 2026
@cit-pr-commenter-54b7da
Copy link
Copy Markdown

Codeowners resolved as

ddtrace/debugging/_products/dynamic_instrumentation.py                  @DataDog/debugger-python
releasenotes/notes/fix-di-remote-enablement-4ac0d37b55940191.yaml       @DataDog/apm-python

@P403n1x87 P403n1x87 marked this pull request as ready for review March 27, 2026 14:14
@P403n1x87 P403n1x87 requested review from a team as code owners March 27, 2026 14:14
Copy link
Copy Markdown
Member

@tylfin tylfin left a comment

Choose a reason for hiding this comment

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

Do we know when this broke? Do we need backports?

@github-actions
Copy link
Copy Markdown
Contributor

This change is marked for backport to 4.6, but it conflicts with that branch.
Attempting to cherrypick this change to 4.6 yielded the following error:

Auto-merging ddtrace/debugging/_products/dynamic_instrumentation.py
CONFLICT (content): Merge conflict in ddtrace/debugging/_products/dynamic_instrumentation.py
error: could not apply 74545f6c88... Merge 8407f86222db60e6242b27ca1f7b16ce06c55878 into 6b2a632a2b8fe8cbb0257f8be534035498d09fb1

The command used to test backporting was

git checkout 4.6 && git cherry-pick -x --mainline 1 74545f6c88b840dba6d6f994ed33d002bb286483

@P403n1x87
Copy link
Copy Markdown
Contributor Author

Do we know when this broke? Do we need backports?

I think this has been broken since the early remote enablement days 🤔

@P403n1x87
Copy link
Copy Markdown
Contributor Author

backport requires #17114

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot merged commit 97d4f14 into main Mar 30, 2026
395 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot deleted the fix/di-remote-enablement branch March 30, 2026 11:13
brettlangdon pushed a commit that referenced this pull request Mar 30, 2026
## Description

We fix the logic that controls remote enablement for Dynamic Instrumentation. Previously, if DI was enabled via environment variable and then disabled via the UI, any new attempts at re-enabling it remotely would be ignored. We fix the logic to look at the original parsed value from the environment variable instead of any potential runtime overrides instead.

Co-authored-by: gabriele.tornetta <gabriele.tornetta@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Dynamic Instrumentation Dynamic Instrumentation/Live Debugger

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants