Skip to content

Commit cf7b327

Browse files
fix(tracer): add importlib._bootstrap to keep modules (#15131) [backport 3.17] (#15135)
backport of #15131 to 3.17 + version fix for System Tests
1 parent ba26a60 commit cf7b327

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.github/workflows/system-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
persist-credentials: false
4646
repository: 'DataDog/system-tests'
4747
# Automatically managed, use scripts/update-system-tests-version to update
48-
ref: 'd5152ebefb021a4273f8d189d798c5e302986f7b'
48+
ref: 'c9e23e92493253ae6dd314192a72068fe4505d12'
4949

5050
- name: Download wheels to binaries directory
5151
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -90,7 +90,7 @@ jobs:
9090
persist-credentials: false
9191
repository: 'DataDog/system-tests'
9292
# Automatically managed, use scripts/update-system-tests-version to update
93-
ref: 'd5152ebefb021a4273f8d189d798c5e302986f7b'
93+
ref: 'c9e23e92493253ae6dd314192a72068fe4505d12'
9494

9595
- name: Build runner
9696
uses: ./.github/actions/install_runner
@@ -275,7 +275,7 @@ jobs:
275275
persist-credentials: false
276276
repository: 'DataDog/system-tests'
277277
# Automatically managed, use scripts/update-system-tests-version to update
278-
ref: 'd5152ebefb021a4273f8d189d798c5e302986f7b'
278+
ref: 'c9e23e92493253ae6dd314192a72068fe4505d12'
279279
- name: Download wheels to binaries directory
280280
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
281281
with:

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variables:
1414
DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
1515
# CI_DEBUG_SERVICES: "true"
1616
# Automatically managed, use scripts/update-system-tests-version to update
17-
SYSTEM_TESTS_REF: "d5152ebefb021a4273f8d189d798c5e302986f7b"
17+
SYSTEM_TESTS_REF: "c9e23e92493253ae6dd314192a72068fe4505d12"
1818

1919
default:
2020
interruptible: true

ddtrace/bootstrap/sitecustomize.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def drop(module_name):
8686
"copyreg", # pickling issues for tracebacks with gevent
8787
"ddtrace",
8888
"concurrent",
89+
"importlib._bootstrap", # special import that must not be unloaded
8990
"typing",
9091
"_operator", # pickling issues with typing module
9192
"re", # referenced by the typing module

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Homepage = "https://github.com/DataDog/dd-trace-py"
8888
"Source Code" = "https://github.com/DataDog/dd-trace-py/"
8989

9090
[tool.setuptools_scm]
91-
version_scheme = "release-branch-semver" # Must be "release-branch-semver" for now in main, see https://github.com/DataDog/dd-trace-py/issues/8801
91+
version_scheme = "guess-next-dev"
9292
write_to = "ddtrace/_version.py"
9393

9494
[tool.cython-lint]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
tracer: This fix resolves an issue where an application instrumented by ddtrace could crash at start.
5+
Fix compatibility with zope.event==6.0

0 commit comments

Comments
 (0)