add necessary bits to run our web processes under datadog apm (pypi#1…

…1743) we are trying to diagnose a memory consumption error that is difficult to reproduce in dev. this adds the ddtrace-run wrapper around our web processes to try to pin it down. the necessary agent and configuration are already live and ready but disabled via env var for now.
CarlosDomingues · Jul 1, 2022 · a0c5d2a · a0c5d2a
1 parent 0c96df8
commit a0c5d2a
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 3 deletions.
diff --git a/Procfile b/Procfile
@@ -1,6 +1,6 @@
 release: bin/release
-web: bin/start-web python -m gunicorn.app.wsgiapp -c gunicorn-prod.conf.py warehouse.wsgi:application
-web-uploads: bin/start-web python -m gunicorn.app.wsgiapp -c gunicorn-uploads.conf.py warehouse.wsgi:application
+web: bin/start-web ddtrace-run python -m gunicorn.app.wsgiapp -c gunicorn-prod.conf.py warehouse.wsgi:application
+web-uploads: bin/start-web ddtrace-run python -m gunicorn.app.wsgiapp -c gunicorn-uploads.conf.py warehouse.wsgi:application
 worker: bin/start-worker celery -A warehouse worker -Q default -l info --max-tasks-per-child 32
 worker-malware: bin/start-worker celery -A warehouse worker -Q malware -l info --max-tasks-per-child 32
 worker-beat: bin/start-worker celery -A warehouse beat -S redbeat.RedBeatScheduler -l info
diff --git a/requirements/deploy.in b/requirements/deploy.in
@@ -1 +1,2 @@
 gunicorn==20.1.0
+ddtrace==1.2.1
diff --git a/requirements/deploy.txt b/requirements/deploy.txt
@@ -1,13 +1,122 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=requirements/deploy.txt requirements/deploy.in
 #
+attrs==21.4.0 \
+    --hash=sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4 \
+    --hash=sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd
+    # via ddtrace
+bytecode==0.13.0 \
+    --hash=sha256:6af3c2f0a31ce05dce41f7eea5cc380e33f5e8fbb7dcee3b52467a00acd52fcd \
+    --hash=sha256:e69f92e7d27f99d5d7d76e6a824bd3d9ff857c72b59927aaf87e1a620f67fe50
+    # via ddtrace
+ddsketch==2.0.3 \
+    --hash=sha256:464469f53380aa878eb1dd4dc644086341e0d2a54b19dfca7d7a4645c8353ac6 \
+    --hash=sha256:a5fd40785aa70ae45c240c769aab9158c2046da91ddb44ac0c42e4d4930ce302
+    # via ddtrace
+ddtrace==1.2.1 \
+    --hash=sha256:0bda7417db3baea5e7b63d6596c26821391376a86a76e1828d771b3a14c3ff39 \
+    --hash=sha256:0c5ae39e3da5535f3b9dadca2ef0fde734688e64eba6bf961ba669c4b7578fea \
+    --hash=sha256:0c6b26e66a8d9387973f42440b57c3cff76243388aa38a65d21ab9b23a8d1446 \
+    --hash=sha256:0f02b1ac848b42d901cc88a39bc86d1182073e449f0ef10a2a86a36b70474591 \
+    --hash=sha256:12c5424b42fc8a605e90fd55243313636704fb9675d49898fe0f76b5bf269619 \
+    --hash=sha256:16ac9d507176700a4cef9714708e276275fae39da32f118fb8e0e18d39a3c15f \
+    --hash=sha256:1a0c6e7d17bc44f0c54282e94146299e0e8bd7ccc277795d5ebde9818cbbbad2 \
+    --hash=sha256:1cae4ec2c8ac91b09e169742629ff4598a9fb09ca4e380904f110b533c0ac758 \
+    --hash=sha256:1efd71b73e399237ba14bd54f31d5b37ca817d337f0715a602d2eb0c3af51052 \
+    --hash=sha256:241d63c31ab48155e56855f7f55639ae41980efc3a8e53f4bcce9b9034e8f535 \
+    --hash=sha256:255c3cb9b5d0adde9d608cb91428051d1cf1f94ada5b86b0a4cc8bd498258997 \
+    --hash=sha256:283ce85e6de396103944fff15eafcabe262f8fce467110bdd118e76bdceb356d \
+    --hash=sha256:29bdd28c657e0e7f539863a84307feb96f3fabdb72e184c3e2fcbfaef1b56ba6 \
+    --hash=sha256:2a7eda27bfbc27ddc632b93c6239bcfd155c4e83586a216bb8896003b8ca9822 \
+    --hash=sha256:2b266f362bd0f4499cc01015de5aa1d1e73e51764727cbadee4f6669b49ff1d5 \
+    --hash=sha256:31b6661ebbf886b599ed0612b8d22f722f6b02e7b0d6c09a8e9997702f792e4b \
+    --hash=sha256:33554dc3444e6c9739a69ed4fb6093c63766abb81320d6a5aa74d0faaf12a12c \
+    --hash=sha256:34aea3fee9ba3f9fbad5fc43289d4b6028826652a5136d1fb6613c463dedbdca \
+    --hash=sha256:3b35bdbc2c8afd91b1d2013777274eb0346f0a34bab456e3f3ed4f8432c19151 \
+    --hash=sha256:409e2f790bddfe7980728694b99893e42c484392376668a6862be325dbbd6839 \
+    --hash=sha256:420aae88a6c2bb0ccdb46e4e3d9434c9b1552cfa9228943ab4cdf706ac06a69a \
+    --hash=sha256:4417f001cdc03370fe3b5d26695a68df82db68214d3a51df3fb6ea56b56c3f46 \
+    --hash=sha256:4741a9002b90b42a9e59666c89d52656a69eb53b29f9e2c7f4057d721a97d928 \
+    --hash=sha256:4f01ebae47a54eb2a10b5bd5dac9bbc052f28f6b8c2d23c91314fa427cae6fd0 \
+    --hash=sha256:6031a208dc3bb817e2237a08d60baa1f09de3b7457e52f0fa950060925bb661b \
+    --hash=sha256:67d8a2de42b2b2bf8effd1d1903a57ba58c07ed814a603f4ba2f422ee48d15e6 \
+    --hash=sha256:6e4da69cf3d114f1b26627360bd1a202d46a8b27e66c37835dc9c43d9d011ba6 \
+    --hash=sha256:71560d0259064b4ca646cf8a035bdac347b3f17f353152bb68acd40b0224b2a1 \
+    --hash=sha256:71bf0f042dab6ff660092afd89e016c34b46019ee6730f3f420b724dd2c5498f \
+    --hash=sha256:7259f54f3fc4b4d43fa5dd61f2be242316f5df49d7a016a3ac28dd2db6e4d17f \
+    --hash=sha256:7b048c756e75559604e9cb21d0d7a972da701854c94ac9a4bc827e2bd2d965fe \
+    --hash=sha256:7b68aebf717b1e611d6aadd0f8023fa354d0042b80c40949348408df25633b33 \
+    --hash=sha256:7d292271cfb432111fc9c12b9e6a00e95c3ca134ac6b13e4a77be8e97491aab3 \
+    --hash=sha256:81dd6535ab7d3a7a311e40778cbcae978073a6a48fc572268086a7c803a441e6 \
+    --hash=sha256:8ab92abb93b4d8e70b68b0894d3be2f93b96411429dee1df30ee0c3f1aecbe2f \
+    --hash=sha256:8f8c7ab254ebd147cb74cd41971d7194ceb68892302b9c427dfd8543682c2204 \
+    --hash=sha256:979c2932db900fb08a7080f7d9dde117a6435c9d648bafbad0d7d5eb1af830ee \
+    --hash=sha256:a0754c09e8f00cc2b7c29c086c7b9989546e1dc2bc9b30a471796f5cae7d3852 \
+    --hash=sha256:a346355261be37e8eda7a295abd006d8feed9c2cd18dec885edef885c61de2ce \
+    --hash=sha256:b3c856bfe71bb3e8932e48b80c8c8f48eb4c966a4ecbeb507d067b7aa0e1506a \
+    --hash=sha256:b3d9e3ad04dd26136862456da9e16595cd9b6326c78e94220d990e9852af3d57 \
+    --hash=sha256:b94cf79c72228090290550b502576e08cf0ff01a8e3e5c596ee67c8a45a3211e \
+    --hash=sha256:baa7250e48c9987c7062c5683f5af239e52507f5b3b8f7635f78f51571f6003c \
+    --hash=sha256:bd51aa6824bd84847410bf85a4543ed3d29a4039f9d9f793c10ea89f56907b70 \
+    --hash=sha256:c06f80931f8cc69674e15e083ef97f41a9185051d49339b0477ce5e9a7381538 \
+    --hash=sha256:ca1d91abd9afd6c266f81da57b279ceae16991da1eabc2d90ef3212a69177d59 \
+    --hash=sha256:d11e204b2d95e173873742facdd3fb4276f35de51411adb965421147a57bcdfc \
+    --hash=sha256:d344fac2a732c76ac3a0963c5bde869b73dde633f3c0cc7e4ea1e0ba01e2207f \
+    --hash=sha256:da3715742b02c4093530ffb7b15944d526ac29d4acde596fda471dc965ae5961 \
+    --hash=sha256:dbf6252efabd070aa97b55bfd55da2a5939849dc201c7fa5c67c4bf0a953fb5d \
+    --hash=sha256:e04fead25d7e75e669662255fcfee048a5ea5d8b1155020b690d8ced5ec2b59d \
+    --hash=sha256:e419d279d1f25ab360423e0c86632e7f869e783f2950de245c8764b1094f0b1b \
+    --hash=sha256:e8e1d94cc99dd3e9f49cce6f2a78f429f408613bd2c80386c2481390d9645b19 \
+    --hash=sha256:f0989b70185b00b1bf692f832e0aaea5b693994c54002faa65b6cd60cf146cb5 \
+    --hash=sha256:f3dc8e84000018d8d6d50371e55cfa4ba94c5002414ce4f6b60bf21d2f768409 \
+    --hash=sha256:f83d21f67ab2be5537c719f9316f8f6b174976bde03726d97aea2468d7bd01d0 \
+    --hash=sha256:fa7bef80eff996c192493746c19cfe4cc0fb709edf4cfc6b95b1ae6cea957a23 \
+    --hash=sha256:fcbedab36e39070e55e5e5fa1c3a2049b24fdb929ee7e93217c8d9ac6f0321c7 \
+    --hash=sha256:fcf3d2407a64278d3df581f3bf52d3947ee60df08bf419c5855990df0fb32643
+    # via -r requirements/deploy.in
 gunicorn==20.1.0 \
     --hash=sha256:9dcc4547dbb1cb284accfb15ab5667a0e5d1881cc443e0677b4882a4067a807e \
     --hash=sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8
     # via -r requirements/deploy.in
+packaging==21.3 \
+    --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
+    --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
+    # via ddtrace
+protobuf==4.21.2 \
+    --hash=sha256:095fda15fe04a79c9f0edab09b424be46dd057b15986d235b84c8cea91659df7 \
+    --hash=sha256:29eaf8e9db33bc3bae14576ad61370aa2b64ea5d6e6cd705042692e5e0404b10 \
+    --hash=sha256:4758b9c22ad0486639a68cea58d38571f233019a73212d78476ec648f68a49a3 \
+    --hash=sha256:57a593e40257ab4f164fe6e171651b1386c98f8ec5f5a8643642889c50d4f3c4 \
+    --hash=sha256:5f8c7488e74024fa12b46aab4258f707d7d6e94c8d322d7c45cc13770f66ab59 \
+    --hash=sha256:7b2dcca25d88ec77358eed3d031c8260b5bf3023fff03a31c9584591c5910833 \
+    --hash=sha256:853708afc3a7eed4df28a8d4bd4812f829f8d736c104dd8d584ccff27969e311 \
+    --hash=sha256:863f65e137d9de4a76cac39ae731a19bea1c30997f512ecf0dc9348112313401 \
+    --hash=sha256:9b42afb67e19010cdda057e439574ccd944902ea14b0d52ba0bfba2aad50858d \
+    --hash=sha256:b82ac05b0651a4d2b9d56f5aeef3d711f5858eb4b71c13d77553739e5930a74a \
+    --hash=sha256:d622dc75e289e8b3031dd8b4e87df508f11a6b3d86a49fb50256af7ce030d35b \
+    --hash=sha256:e3d3df3292ab4bae85213b9ebef566b5aedb45f97425a92fac5b2e431d31e71c \
+    --hash=sha256:ef0768a609a02b2b412fa0f59f1242f1597e9bb15188d043f3fde09115ca6c69 \
+    --hash=sha256:f2f43ae8dff452aee3026b59ea0a09245ab2529a55a0984992e76bcf848610e1
+    # via
+    #   ddsketch
+    #   ddtrace
+pyparsing==3.0.9 \
+    --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
+    --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
+    # via packaging
+six==1.16.0 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+    # via
+    #   ddsketch
+    #   ddtrace
+tenacity==8.0.1 \
+    --hash=sha256:43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f \
+    --hash=sha256:f78f4ea81b0fabc06728c11dc2a8c01277bfc5181b321a4770471902e3eb844a
+    # via ddtrace
 
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==62.6.0 \