From 2e77dd45d60ffb8110cd0676679a9cd80c1785a9 Mon Sep 17 00:00:00 2001 From: Ella Soccoli Date: Thu, 3 Apr 2025 19:22:06 -0400 Subject: [PATCH 1/2] Removed ddtrace call from dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3148d47..33d17db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,4 +29,4 @@ RUN rm -rf node_modules && \ RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime -CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"] +CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"] From df7c8d70e5a1665d36f3bebb5c68ad176f482550 Mon Sep 17 00:00:00 2001 From: Ella Soccoli Date: Thu, 3 Apr 2025 20:56:16 -0400 Subject: [PATCH 2/2] Updated wrapt, downgraded ddtrace, fixed the ddtrace problems --- Dockerfile | 2 +- requirements.in | 4 ++-- requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6c23e2..5fa9b20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,4 +29,4 @@ RUN rm -rf node_modules && \ RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime -CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"] +CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"] diff --git a/requirements.in b/requirements.in index 7ba4ae4..49cd221 100644 --- a/requirements.in +++ b/requirements.in @@ -5,7 +5,7 @@ boto3==1.35.13 botocore==1.35.13 click~=8.1.8 csh_ldap>=2.3.1 -ddtrace~=3.3.0 +ddtrace~=3.2.1 Flask~=3.1.0 Flask-Migrate~=2.1.1 Flask-Gzip~=0.2 @@ -30,4 +30,4 @@ six~=1.17.0 SQLAlchemy~=2.0.40 structlog~=18.1.0 Werkzeug~=3.1.3 -wrapt~=1.11.0 +wrapt~=1.17.2 diff --git a/requirements.txt b/requirements.txt index ba5d4ba..4422543 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ cryptography==37.0.2 # via oic csh-ldap==2.3.1 # via -r requirements.in -ddtrace==3.3.0 +ddtrace==3.2.2 # via -r requirements.in defusedxml==0.7.1 # via oic @@ -224,7 +224,7 @@ werkzeug==3.1.3 # flask wheel==0.37.1 # via pip-tools -wrapt==1.11.2 +wrapt==1.17.2 # via # -r requirements.in # ddtrace