Skip to content

fix(di): prevent exception when removing unresolved probe #13357

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.

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
merged 1 commit into from
May 12, 2025

Conversation

P403n1x87
Copy link
Contributor

@P403n1x87 P403n1x87 commented May 8, 2025

We prevent an exception from occurring when trying to remove a probe that did not resolve to a valid source code location.

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

We prevent an exception from occurring when trying to remove a probe
that did not resolve to a valid source code location.
@P403n1x87 P403n1x87 requested a review from a team as a code owner May 8, 2025 09:13
@P403n1x87 P403n1x87 added the Dynamic Instrumentation Dynamic Instrumentation/Live Debugger label May 8, 2025
@P403n1x87 P403n1x87 requested a review from a team as a code owner May 8, 2025 09:13
@P403n1x87 P403n1x87 requested review from Yun-Kim and lievan May 8, 2025 09:13
@P403n1x87 P403n1x87 enabled auto-merge (squash) May 8, 2025 09:13
Copy link
Contributor

github-actions bot commented May 8, 2025

CODEOWNERS have been resolved as:

releasenotes/notes/fix-unresolved-pending-probe-removal-80fbf85a9c068122.yaml  @DataDog/apm-python
ddtrace/debugging/_probe/registry.py                                    @DataDog/debugger-python
tests/debugging/probe/test_registry.py                                  @DataDog/debugger-python

Copy link
Contributor

github-actions bot commented May 8, 2025

Bootstrap import analysis

Comparison of import times between this PR and base.

Summary

The average import time from this PR is: 232 ± 4 ms.

The average import time from base is: 234 ± 4 ms.

The import time difference between this PR and base is: -1.6 ± 0.2 ms.

Import time breakdown

The following import paths have shrunk:

ddtrace.auto 1.959 ms (0.84%)
ddtrace.bootstrap.sitecustomize 1.292 ms (0.56%)
ddtrace.bootstrap.preload 1.292 ms (0.56%)
ddtrace.internal.products 1.292 ms (0.56%)
ddtrace.internal.remoteconfig.client 0.626 ms (0.27%)
ddtrace 0.667 ms (0.29%)

@pr-commenter
Copy link

pr-commenter bot commented May 8, 2025

Benchmarks

Benchmark execution time: 2025-05-08 10:01:43

Comparing candidate commit 16674f1 in PR branch fix/unresolved-pending-probe-removal with baseline commit 0ee168f in branch main.

Found 0 performance improvements and 6 performance regressions! Performance is the same for 523 metrics, 7 unstable metrics.

scenario:iast_aspects-modulo_aspect_for_bytes

  • 🟥 execution_time [+59.132ns; +77.922ns] or [+7.447%; +9.813%]

scenario:iast_aspects-modulo_aspect_for_bytes_bytearray

  • 🟥 execution_time [+93.669ns; +111.927ns] or [+9.195%; +10.988%]

scenario:iast_aspects-replace_aspect

  • 🟥 execution_time [+607.782ns; +714.813ns] or [+12.918%; +15.193%]

scenario:iast_aspects-rstrip_aspect

  • 🟥 execution_time [+1.060µs; +1.367µs] or [+8.185%; +10.556%]

scenario:iast_aspects-strip_aspect

  • 🟥 execution_time [+1.336µs; +1.474µs] or [+10.137%; +11.189%]

scenario:iast_aspects-swapcase_aspect

  • 🟥 execution_time [+217.933ns; +256.519ns] or [+8.960%; +10.546%]

@P403n1x87 P403n1x87 requested a review from tylfin May 8, 2025 14:57
@P403n1x87 P403n1x87 merged commit ebc7e4d into main May 12, 2025
282 of 283 checks passed
@P403n1x87 P403n1x87 deleted the fix/unresolved-pending-probe-removal branch May 12, 2025 13:55
github-actions bot pushed a commit that referenced this pull request May 12, 2025
We prevent an exception from occurring when trying to remove a probe
that did not resolve to a valid source code location.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [ ] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit ebc7e4d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.21 Dynamic Instrumentation Dynamic Instrumentation/Live Debugger
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants