Skip to content

Commit 69cd82e

Browse files
authored
Merge branch '0.24-dev' into celery-43
2 parents d866deb + 9f2f78a commit 69cd82e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

ddtrace/bootstrap/sitecustomize.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@
4646

4747

4848
def update_patched_modules():
49-
for patch in os.environ.get("DATADOG_PATCH_MODULES", '').split(','):
49+
modules_to_patch = os.environ.get("DATADOG_PATCH_MODULES")
50+
if not modules_to_patch:
51+
return
52+
for patch in modules_to_patch.split(','):
5053
if len(patch.split(':')) != 2:
5154
log.debug("skipping malformed patch instruction")
5255
continue

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ services:
9090
image: datadog/docker-library:ddtrace_py
9191
environment:
9292
- TOX_SKIP_DIST=True
93+
- TEST_DATADOG_INTEGRATION=1
9394
network_mode: host
9495
working_dir: /src
9596
volumes:

0 commit comments

Comments
 (0)