diff --git a/api/Pipfile b/api/Pipfile index 9991ea905..6835112e4 100644 --- a/api/Pipfile +++ b/api/Pipfile @@ -53,6 +53,7 @@ gunicorn = "*" sentry-sdk = "*" django-tqdm = "*" limit = "*" +django-log-request-id = "*" [requires] python_version = "3.10" diff --git a/api/Pipfile.lock b/api/Pipfile.lock index a34b78cb4..d11015e8d 100644 --- a/api/Pipfile.lock +++ b/api/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3a33a449d3290cd9a234b38fbfc906b289607f5aae969908d235640e9f43c01e" + "sha256": "9208862163a7689acdd62d9268a347227d02a32707fb86bb3984899d28ba40e0" }, "pipfile-spec": 6, "requires": { @@ -42,27 +42,27 @@ }, "boto3": { "hashes": [ - "sha256:9d8ddfefe0c4a993423e2c40831034c78fcb7b3425bf3610cf0087301dd9098b", - "sha256:c06b9b29f80da8cf6d9fac8f41d74a74d0f5347927acf11b15428b295fcbdd31" + "sha256:882091279f4520bf6b8b535e02dbef4fe14280404035a93ea5396821f10b4f4b", + "sha256:cc01e513a54914b2a8b5515cade3bc359f9001b108416664053f02882f85050f" ], "index": "pypi", - "version": "==1.21.33" + "version": "==1.24.19" }, "botocore": { "hashes": [ - "sha256:663d8f02b98641846eb959c54c840cc33264d5f2dee5b8fc09ee8adbef0f8dcf", - "sha256:89a203bba3c8f2299287e48a9e112e2dbe478cf67eaac26716f0e7f176446146" + "sha256:850bec9363e10c56b2678c3742a48150f6201d7184695326a380fe7341075484", + "sha256:e52c77fb349ae5d2a36ba0c2d1dc1416d963f987139dc2e036d2d8d697e4b4c7" ], - "markers": "python_version >= '3.6'", - "version": "==1.24.46" + "markers": "python_version >= '3.7'", + "version": "==1.27.19" }, "certifi": { "hashes": [ - "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7", - "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a" + "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d", + "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412" ], "markers": "python_version >= '3.6'", - "version": "==2022.5.18.1" + "version": "==2022.6.15" }, "cffi": { "hashes": [ @@ -124,7 +124,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==2.0.12" }, "coreapi": { @@ -209,12 +209,6 @@ "index": "pypi", "version": "==1.15.0" }, - "django-common-helpers": { - "hashes": [ - "sha256:2d56be6fa261d829a6a224f189bf276267b9082a17d613fe5f015dd4d65c17b4" - ], - "version": "==0.9.2" - }, "django-cors-headers": { "hashes": [ "sha256:37e42883b5f1f2295df6b4bba96eb2417a14a03270cb24b2a07f021cd4487cf4", @@ -225,10 +219,19 @@ }, "django-cron": { "hashes": [ - "sha256:08d22708c8b2ecab8cda989019a66c7e1e2424c59d822796fd45abf7731d261d" + "sha256:016203554748512b7f19d7363b4fde8741c6ff63fe8a15051f3031f4a0506a41", + "sha256:dc3c0d3433a2e4e7012f77f6d8415ad90367ba068649db2674325bc36f935841" ], "index": "pypi", - "version": "==0.5.1" + "version": "==0.6.0" + }, + "django-log-request-id": { + "hashes": [ + "sha256:8efb8a850fb631b59924cf6fcc8aefe707b0a7dcad42de55284ce807c31b7bc1", + "sha256:bccdabcdf536345e7ae40562d4b0fcdc230e0ebe1a8b65ab4a1ed9d3083cf870" + ], + "index": "pypi", + "version": "==2.0.0" }, "django-oauth-toolkit": { "hashes": [ @@ -263,10 +266,10 @@ }, "django-tqdm": { "hashes": [ - "sha256:30a7e241bb7df570a65179f9d328b904237a492448ac64b824ff0a97f3dac79d" + "sha256:571a68d50050667d6b8e0c1f284542d372801a0ac3e3e9f817f1b854e043c3f4" ], "index": "pypi", - "version": "==1.2.0" + "version": "==1.3.1" }, "django-uuslug": { "hashes": [ @@ -452,7 +455,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.3" }, "inflection": { @@ -488,11 +491,11 @@ }, "jmespath": { "hashes": [ - "sha256:a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e", - "sha256:e8dcd576ed616f14ec02eed0005c85973b5890083313860136657e24784e4c04" + "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980", + "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe" ], "markers": "python_version >= '3.7'", - "version": "==1.0.0" + "version": "==1.0.1" }, "jwcrypto": { "hashes": [ @@ -718,11 +721,11 @@ }, "redis": { "hashes": [ - "sha256:2f7a57cf4af15cd543c4394bcbe2b9148db2606a37edba755368836e3a1d053e", - "sha256:f57f8df5d238a8ecf92f499b6b21467bfee6c13d89953c27edf1e2bc673622e7" + "sha256:a52d5694c9eb4292770084fa8c863f79367ca19884b329ab574d5cb2036b3e54", + "sha256:ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880" ], "markers": "python_version >= '3.6'", - "version": "==4.3.3" + "version": "==4.3.4" }, "redlock-py": { "hashes": [ @@ -733,11 +736,11 @@ }, "requests": { "hashes": [ - "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", - "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f", + "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==2.27.1" + "markers": "python_version >= '3.7' and python_version < '4'", + "version": "==2.28.0" }, "requests-oauthlib": { "hashes": [ @@ -788,27 +791,27 @@ }, "s3transfer": { "hashes": [ - "sha256:7a6f4c4d1fdb9a2b640244008e142cbc2cd3ae34b386584ef044dd0f27101971", - "sha256:95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed" + "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd", + "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947" ], - "markers": "python_version >= '3.6'", - "version": "==0.5.2" + "markers": "python_version >= '3.7'", + "version": "==0.6.0" }, "sentry-sdk": { "hashes": [ - "sha256:0a9eb20a84f4c17c08c57488d59fdad18669db71ebecb28fb0721423a33535f9", - "sha256:972c8fe9318a415b5cf35f687f568321472ef94b36806407c370ce9c88a67f2e" + "sha256:b82ad57306d5546713f15d5d70daea0408cf7f998c7566db16e0e6257e51e561", + "sha256:ddbd191b6f4e696b7845b4d87389898ae1207981faf114f968a57363aa6be03c" ], "index": "pypi", - "version": "==1.5.10" + "version": "==1.6.0" }, "setuptools": { "hashes": [ - "sha256:d1746e7fd520e83bbe210d02fff1aa1a425ad671c7a9da7d246ec2401a087198", - "sha256:e7d11f3db616cda0751372244c2ba798e8e56a28e096ec4529010b803485f3fe" + "sha256:990a4f7861b31532871ab72331e755b5f14efbe52d336ea7f6118144dd478741", + "sha256:c1848f654aea2e3526d17fc3ce6aeaa5e7e24e66e645b5be2171f3f6b4e5a178" ], "markers": "python_version >= '3.7'", - "version": "==62.3.3" + "version": "==62.6.0" }, "six": { "hashes": [ @@ -1023,6 +1026,14 @@ ], "version": "==2.0.5" }, + "async-timeout": { + "hashes": [ + "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15", + "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" + ], + "markers": "python_version >= '3.6'", + "version": "==4.0.2" + }, "attrs": { "hashes": [ "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4", @@ -1033,11 +1044,11 @@ }, "babel": { "hashes": [ - "sha256:3f349e85ad3154559ac4930c3918247d319f21910d5ce4b25d439ed8693b98d2", - "sha256:98aeaca086133efb3e1e2aad0396987490c8425929ddbcfe0550184fdc54cd13" + "sha256:7614553711ee97490f732126dc077f8d0ae084ebc6a96e23db1482afabdb2c51", + "sha256:ff56f4892c1c4bf0d814575ea23471c230d544203c7748e8c68f0089478d48eb" ], "markers": "python_version >= '3.6'", - "version": "==2.10.1" + "version": "==2.10.3" }, "backcall": { "hashes": [ @@ -1123,11 +1134,11 @@ }, "certifi": { "hashes": [ - "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7", - "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a" + "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d", + "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412" ], "markers": "python_version >= '3.6'", - "version": "==2022.5.18.1" + "version": "==2022.6.15" }, "cfgv": { "hashes": [ @@ -1142,7 +1153,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==2.0.12" }, "click": { @@ -1155,11 +1166,11 @@ }, "colorama": { "hashes": [ - "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", - "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da", + "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.4.4" + "version": "==0.4.5" }, "configargparse": { "hashes": [ @@ -1194,11 +1205,11 @@ }, "docutils": { "hashes": [ - "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125", - "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61" + "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c", + "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.17.1" + "version": "==0.18.1" }, "executing": { "hashes": [ @@ -1217,19 +1228,19 @@ }, "faker": { "hashes": [ - "sha256:0122b75e7960cbb1e2bbbf10ef9b8c183377878e38466854953539c6d822e7c0", - "sha256:fb95f956bac59c90f54543919d5c5ef41625e12a0773e5aa08c9b9c62ba58fb3" + "sha256:0297b7fc0f2458dfff8d5a92335c62fa25fb059f8cbaf7db580a0dd7177aff2e", + "sha256:b9f93ec97a70da79d43f497aa7b2b7d2bcd5d0c6d3ab7c102dde4193d0a38351" ], "markers": "python_version >= '3.6'", - "version": "==13.12.1" + "version": "==13.14.0" }, "fakeredis": { "hashes": [ - "sha256:7c2c4ba1b42e0a75337c54b777bf0671056b4569650e3ff927e4b9b385afc8ec", - "sha256:be3668e50f6b57d5fc4abfd27f9f655bed07a2c5aecfc8b15d0aad59f997c1ba" + "sha256:4a0f8fe0d5c18147864db50ae2e86f667420ea06653bec08b3a5fccfd3fbde6f", + "sha256:ca516f86181f85615cd8210854b43acbe7b1f37ed8a082c5557749c73f2f0dd3" ], "index": "pypi", - "version": "==1.7.1" + "version": "==1.8.1" }, "filelock": { "hashes": [ @@ -1262,11 +1273,11 @@ }, "furo": { "hashes": [ - "sha256:7f3e3d2fb977483590f8ecb2c2cd511bd82661b79c18efb24de9558bc9cdf2d7", - "sha256:96204ab7cd047e4b6c523996e0279c4c629a8fc31f4f109b2efd470c17f49c80" + "sha256:061b68e323345e27fcba024cf33a1e77f3dfd8d9987410be822749a706e2add6", + "sha256:9aa983b7488a4601d13113884bfb7254502c8729942e073a0acb87a5512af223" ], "index": "pypi", - "version": "==2022.4.7" + "version": "==2022.6.21" }, "gevent": { "hashes": [ @@ -1309,50 +1320,50 @@ }, "geventhttpclient": { "hashes": [ - "sha256:01c9f59dc508a82378ca132e4a6fd1717e869aa590dbc8e7e492986a085a72b8", - "sha256:073fa8bef9745b3287979148bc5ca688780198b6bbb04d6fade18a1c54544ccc", - "sha256:0b934a7f30f71fca5c3a0a52b258a49d1d0efb9b195a0c0568ebbed891c91d7e", - "sha256:182c0c0e5c00d1ebf780ce1710de558afa4cdf043868238c7a22e136359ff103", - "sha256:1b0c15e4da83b724c812e76e79eb85f230a194c1fc88d1f4d47ded32b31a84bb", - "sha256:2bb160ca3a6d53f9ea9bfd1aa901c5a03d39a6f9a3a802de734a8447ca29df9c", - "sha256:31a650e38c9bc9d96b66d574af7cca4206244ab5e2daad6209420c63fbdc2f83", - "sha256:32401a3d018e2e71a05a6427cc3b44fa9361678c6d6162c50ebe03e3af974aa0", - "sha256:33d414082ff1f8e00a5396c17a6e8876c7f85ca50c08cb61df305a13757d7bd9", - "sha256:3c67a1800ba975e8a1c3778c01d53b62e87c50a6a88345a2675d0ccdebf16d61", - "sha256:3ca71445decdc90f28f2e43212da51acb6129139bb465324737a5779c9fbada1", - "sha256:3d14aac14c46a4c9b1cc938aaefefa1eef4d9eb0b70ac32869354cff085295b6", - "sha256:3dbc316d0e9367626f108d86d14b5e882ef9783c381a684682dc849a8e0c2c9f", - "sha256:3f975acefdd2e6ed531cc851e9f86bbad0f4216ac1926c4cdb5a8223a20538f4", - "sha256:421a17dab9d17d6357250a8689f8a2b9c3d46177b2b04b26a6f19dc8df134c12", - "sha256:43dde1d98a194dc27bd9e38df62371d0f5d25a8e5f1dfb09dc1cd2fae5b492fb", - "sha256:49a42d0043840436d742fb227fae5135eb3535b740187c55d9cefa13508d15b5", - "sha256:4e001608847d06cc0e5c3c0a619c5c5313bb1f9c6e6e4bccd3e78572f8fb9ebb", - "sha256:6a32a11a3ee1e475957d15da0fff93d7cf135b54a5ea92307236a6ac2ac0d863", - "sha256:6f0c9a31cc52cf2730527875bc06bde65b983c45f14d7692afeebad18456adc9", - "sha256:7153bf3ead545cbc220cd032038bb543073496f8c41c18ec021fad47f8eda164", - "sha256:7237c2ab19e1952598e1a75c01b69595440728bb570dbe528f9805c89b1d3970", - "sha256:727640fca6ede582aacb528ebceacb7b2bf66ab9686fb9900ea7db2c951a747e", - "sha256:76069c60cf24719fc1395ed2c1b8b8b2b041080fea2501aca24fa2a3625e6bf6", - "sha256:845800cb2f544ca835e764dfbaade57eba35a35a57e3fbc6676932d6f3996b9c", - "sha256:8527f715d71d6ac743072f2674d2286517577b712dbda153b0f15c3b0be58d2b", - "sha256:86057e189cafa5a28dfb02b05702930fa5767b265103c34dad38721f9100d76c", - "sha256:8bc0e28d1cc5d9c10909e4c646f8e652594cadb94fa475af5f3e4d8499ed5bb9", - "sha256:943dba14695c6ee2b223453681409d7145a252f4e5728b4084d46cf5a0818bc3", - "sha256:9dbb29de564deb0d76464b9fd16c853f19f4210bf9e162f6f38c712e83d1f8cb", - "sha256:b0dd0c06f8e22f369b35b5f572b7053c3ee5f0f70843fa2137c387d5c07cca29", - "sha256:c2dcb26b92a296dff6c5cc2446b66ac7361ea058b9f0a14dcdf080a5215dc412", - "sha256:c4f3e3c7bff985ed157388c33f170f19599235b8019e583670f9d9edb8ba6e67", - "sha256:cdc2164ca08f170d996c8862b43787b31950496f9a58da167679c332d231d8ea", - "sha256:d241e0ea4a1cc27547021ef7b93e7899734343d25f9b1912599af180336b3289", - "sha256:d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780", - "sha256:f0734dae0672a1d6b0bc4117d68c7d043e182583d1437bcdf229dd44f7d038ce", - "sha256:f0cb141fdeae74f2e078e06eea456809f289f34c1cfb471dae0b3e0afd01b77b", - "sha256:f1562957ddf70691c737c8fc6b44aa6720882a74feae3e0108a985a04139bb41", - "sha256:f5cef10107fed1fa6d802c4dea4cfc7fb604ff1c9edbe747084b4089a4d1db3a", - "sha256:fa290a202446630cc71593712bea548f296b89cb8a4161002c2e03afc3b2ffed", - "sha256:fbeb1ed7228fc406229c8693f8a02b8e064f7a9979665ac0181c983667cc383c" - ], - "version": "==1.5.3" + "sha256:0123ba90c778dff2c89a659bce700ffec4d49e8bf1c8af53de0657435aa4536a", + "sha256:02cd47c3f36b7057864478805a725d9b3f574709cf7730f291753bebfd5711ba", + "sha256:0d5435ad466a4d226d0cc89c69c298c644bbd0af65898a2c1433599189c0a9d3", + "sha256:0f46912f78d68ef31aa2c86e67a70a079c1418ebd9b04cbb8c097d88ceff721f", + "sha256:128e379f23e45f1133b630b708bb830d99488b2b39384f04b8262e875190d3e9", + "sha256:151425e44805c5c396dcedfcba0a164c20065c3eeb5dfb22fb809bf301c98739", + "sha256:15d6150e9ac9e71edb57341910d4a3740909591d75f885d460045cd1f0fdb8d2", + "sha256:1f4f973fb9f6afe4ceec139d5d5d8199b5733371a6d2ecc065e257c81020539b", + "sha256:22a0853d809e846d93b2ca06821c897633a6bfe14bc4b0250fb1a38ee83b2030", + "sha256:273cc4c3b8ed164e117b6b66fae97da047fea8810dc6b5ef4e9a7481b2eb3f57", + "sha256:2f011343a5b4e7799e375c0be8d760405bcaff185dba996c359ef9d541dbc855", + "sha256:3248eeaecdf54d733b33eb358d76a06728232bd7ea05c71f8950034264e8baa4", + "sha256:383949f8d403e30e339cbebe9781c745929d769a8a0470756668fc16156b5605", + "sha256:3e0daa4819fa32fba8688e54f8e67ece08491595a79cc336f84aca43def2af73", + "sha256:47807a61886bbefbe04cd387570a4cfb952d415f8a5f61217ddfa6fb7ba6a4d4", + "sha256:4929134821c1c74c6b0798e5ff93ea326a3d5e325b6dc3b752f3310d23ae358e", + "sha256:527efcdeb07c9fc1eb8a85759d7c6696e361e684c22c7ccba3b7b7e6eb9d8aaa", + "sha256:5bd4df4b4d57e167e8959fa2126612607c6d4fd5023759d0ecf9820d16c06662", + "sha256:5d8d8728f87cf56ef351d1315530f31ae8617d0bce45eb4b6e677610ef78a688", + "sha256:5f8f077d4165f44eafc6d9a0ec6c0fbf01905d9b4d5132918f6034d53edf7781", + "sha256:61ee04540346ee99afeac9d905cf47398f1b1a368c54dd5415ebb1dc86c796e0", + "sha256:63b31eec5840b83571801e3c4880744336e4c048ed8cfcf7019d8dd35c2dd8e1", + "sha256:641e726eb8ca602f09a1b4588db642d2ddcab589789b7b12ba98d5f058b2ec17", + "sha256:731bf4f00b3b8c47e7e28b8478501420caf91ca899040c0b9687681272d238ef", + "sha256:750dfe6a29078e85ee7fb4fc39df147da5bc80c8a129ed5ac446c288f24fa3f1", + "sha256:793caf5dfbda63406115cc637814ce8242fd1ba53342da4f89d95bbfc1759d0b", + "sha256:7d94850a97ba8eefa4a369c3d9607816eb519022eae267d6288d09701691b8d0", + "sha256:86b27b36e87e7bc4419df681ffd2267984cd3ba29558555ae79fdc9609392953", + "sha256:9629b5ce015b8856659bb57193d1e5cf2c0de73ab2e6f7d2a630bcc8d5f211b9", + "sha256:96361a47228f148f5c4465e8e70ffa4ce2062111ba3fb9f8b47215ae3e7f474d", + "sha256:96d020ffa5cbcd611ee1438925ddf357afded162c3604e867f2b7da16420d589", + "sha256:a9f10a0c10cb8a1ecdfe5f034cf4c027c5683edd6f2ee19f83e8d8d4850ccc2a", + "sha256:ad19c5b939cb6075aaaeec2dee2aa42aa29414077f9b3720d659f92ca6ca9889", + "sha256:b01b1092e8ee989f5d21bb84da5ee61c179e795ce024c897676f87e438847ce7", + "sha256:b224d8f34714e2bb2225916271b414e3ebf2f7e1c294c7d63ef400091dccc5eb", + "sha256:ba7f33dd13fa037bd8f8106bf921d48f0d82308355d5572b29873393f33b9511", + "sha256:cfa0b1eee6ac345328b2ce381613a85ef9791e5afd829ef41cf123caa04f3602", + "sha256:da832b164f64e6b97b1eb9198c1cd57225a0ec9608289748cda9e151c6722c2d", + "sha256:e28310becf764f3523e13b1a11f530854d77b628e64667246b05dc9e6771e8ab", + "sha256:ee7bd2c0eea881cf247f12c4362ef0d61623df79768f5ef1c0298e97a1f0c6bf", + "sha256:f05d70d27dd11315e02735337e7d6de318a73f389a85395d3423d91fb55fa3b9", + "sha256:fd59e9054aea1f36b55b187e87a352ed5bace91326de7323b2975254f51b55fa" + ], + "version": "==1.5.5" }, "greenlet": { "hashes": [ @@ -1428,7 +1439,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.3" }, "imagesize": { @@ -1448,11 +1459,11 @@ }, "ipython": { "hashes": [ - "sha256:341456643a764c28f670409bbd5d2518f9b82c013441084ff2c2fc999698f83b", - "sha256:807ae3cf43b84693c9272f70368440a9a7eaa2e7e6882dad943c32fbf7e51402" + "sha256:7ca74052a38fa25fe9bedf52da0be7d3fdd2fb027c3b778ea78dfe8c212937d1", + "sha256:f2db3a10254241d9b447232cec8b424847f338d9d36f9a577a6192c332a46abd" ], "index": "pypi", - "version": "==8.3.0" + "version": "==8.4.0" }, "itsdangerous": { "hashes": [ @@ -1486,11 +1497,11 @@ }, "locust": { "hashes": [ - "sha256:6e7fe3f907fc5e11a6bfa0d0f8dc9ab8d9ce0ee414d86ce14f6bbd1f7baebccd", - "sha256:6fb3f0dac38fdad6e877f47ad32979c3397d5e0948b831374200484a6f96082b" + "sha256:3fab41217ca6677345bfe3fb222e646bda408f072c302b77164ccd77daf2a35b", + "sha256:4c6844f50f7b50b5328f310431375ad62dfb1c786a83641357838aa02e1f2382" ], "index": "pypi", - "version": "==2.8.5" + "version": "==2.10.1" }, "markdown-it-py": { "hashes": [ @@ -1629,18 +1640,19 @@ }, "myst-parser": { "hashes": [ - "sha256:1635ce3c18965a528d6de980f989ff64d6a1effb482e1f611b1bfb79e38f3d98", - "sha256:4c076d649e066f9f5c7c661bae2658be1ca06e76b002bb97f02a09398707686c" + "sha256:4965e51918837c13bf1c6f6fe2c6bddddf193148360fbdaefe743a4981358f6a", + "sha256:739a4d96773a8e55a2cacd3941ce46a446ee23dcd6b37e06f73f551ad7821d86" ], "index": "pypi", - "version": "==0.17.2" + "version": "==0.18.0" }, "nodeenv": { "hashes": [ - "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b", - "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7" + "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e", + "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b" ], - "version": "==1.6.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", + "version": "==1.7.0" }, "packaging": { "hashes": [ @@ -1691,19 +1703,19 @@ }, "pre-commit": { "hashes": [ - "sha256:02226e69564ebca1a070bd1f046af866aa1c318dbc430027c50ab832ed2b73f2", - "sha256:5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10" + "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10", + "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615" ], "index": "pypi", - "version": "==2.18.1" + "version": "==2.19.0" }, "prompt-toolkit": { "hashes": [ - "sha256:62291dad495e665fca0bda814e342c69952086afb0f4094d0893d357e5c78752", - "sha256:bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7" + "sha256:859b283c50bde45f5f97829f77a4674d1c1fcd88539364f1b28a37805cfd89c0", + "sha256:d8916d3f62a7b67ab353a952ce4ced6a1d2587dfe9ef8ebc30dd7c386751f289" ], "markers": "python_full_version >= '3.6.2'", - "version": "==3.0.29" + "version": "==3.0.30" }, "psutil": { "hashes": [ @@ -1861,74 +1873,64 @@ }, "pyzmq": { "hashes": [ - "sha256:057176dd3f5ccf5aad4abd662d76b6a39bbf799baaf2f39cd4fdaf2eab326e43", - "sha256:05ec90a8da618f2398f9d1aa20b18a9ef332992c6ac23e8c866099faad6ef0d6", - "sha256:154de02b15422af28b53d29a02de72121ba503634955017255573fc1f995143d", - "sha256:16b832adb5d8716f46051da5533c480250bf126984ce86804db6137a3a7f931b", - "sha256:1df26aa854bdd3a8341bf199064dd6aa6e240f2eaa3c9fa8d217e5d8b868c73e", - "sha256:28f9164fb2658b7b414fa0894c75b1a9c61375774cdc1bdb7298beb042a2cd87", - "sha256:2951c29b8649f3672af9dca8ff61d86310d3664d9629788b1c66422fb13b1239", - "sha256:2b08774057ae7ce8a2eb4e7d54db05358234440706ce43a85814500c5d7bd22e", - "sha256:2e2ac40f7a91c740ec68d6db07ae19ea9259c959333c68bee56ab2c799a67d66", - "sha256:312e56799410c34797417a4060a8bd37d4db1f06d1ec0c54f7c8fd81e0d90376", - "sha256:38f778a74e3889392e949326cfd0e9b2eb37dcbb2980d98fad2c51703d523db2", - "sha256:3955dd5bbbe02f454655296ee36a66c334c7102a29b8458223d168c0380edfd5", - "sha256:425ba851a6f9892bde1da2024d82e2fe6796bd77e3391fb96665c50fe9d4c6a5", - "sha256:48bbc2db041ab28eeee4a3e8ada0ed336640946dd5a8e53dbd3805f9dbdcf0dc", - "sha256:4fbcd657cda75574fd1315a4c44bd322bc2e219039fb09f146bbe6f8aef039e9", - "sha256:523ba7fd4d8fe75ad09c1e574a648892b75a97d0cfc8005727681053ac19555b", - "sha256:53b2c1326c2e484d450932d2be739f064b7cb572faabec38386098a28516a529", - "sha256:540d7146c3cdc9bbffab039ea067f494eba24d1abe5bd33eb9f963c01e3305d4", - "sha256:563d4281c4dbdf647d93114420151d33f895afc4c46b7115a67a0aa5347e6624", - "sha256:67a049bcf967a39993858beed873ed3405536019820922d4efacfe35ab3da51a", - "sha256:67ec63ae3c9c1fa2e077fcb42e77035e2121a04f987464bdf9945a28535d30ad", - "sha256:68e22c5d3be451e87d47f956b397a7823bfbde2176341bc902fba30f96831d7e", - "sha256:6ab4b6108e69f63c917cd7ef7217c5727955b1ac90600e44a13ed5312019a014", - "sha256:6bd7f18bd4cf51ea8d7e54825902cf36f9d2f35cc51ef618373988d5398b8dd0", - "sha256:6cd53e861bccc0bdc4620f68fb4a91d5bcfe9f4213cf8e200fa498044d33a6dc", - "sha256:6d346e551fa64b89d57a4ac74b9bc66703413f02f50093e089e861999ec5cccc", - "sha256:6ff8708fabc9f9bc2949f457d39b4088c9656c4c9ac15fbbbbaafce8f6d07833", - "sha256:7626e8384275a7dea6f3d1f749fb5e00299042e9c895fc3dbe24cb154909c242", - "sha256:7e7346b2b33dcd4a2171dd8a9870ae283eec8f6231dcbcf237a0f41e74751a50", - "sha256:81623c67cb71b93b5f7e06c9107f3781738ae86866db830c950223d87af2a235", - "sha256:83f1c76068faf62c32a36dd62dc4db642c2027bbbd960f8f6345b59e9d4dc472", - "sha256:8679bb1dd723ecbea03b1f96c98972815775fd8ec756c440a14f289c436c472e", - "sha256:86fb683cb9a9c0bb7476988b7957393ecdd22777d87d804442c66e62c99197f9", - "sha256:8757c62f7960cd26122f7aaaf86eda1e016fa85734c3777b8054dd334d7dea4d", - "sha256:894be7d17228e7328cc188096c0162697211ec91761f6812fff12790cbe11c66", - "sha256:8a0f240bf43c29be1bd82d77e602a61c798e9de02e5f8bb7bb414cb814f43236", - "sha256:8c3abf7eab5b76ae162c4fbb16d514a947fc57fd995b64e5ea8ef8ba3b888a69", - "sha256:93332c6972e4c91522c4810e907f3aea067424338071161b39cacded022559df", - "sha256:97d6c676dc97d593625d9fc48154f2ffeabb619a1e6fe8d2a5b53f97e3e9bdee", - "sha256:99dd85f0ca1db8d17a01a25c2bbb7784d25a2d39497c6beddbe96bff74194e04", - "sha256:9c7fb691fb07ec7ab99fd173bb0e7e0248d31bf83d484a87b917a342f63812c9", - "sha256:b3bc3cf200aab74f3d758586ac50295214eda496ac6a6636e0c881c5958d9123", - "sha256:bba54f97578943f48f621b4a7afb8eb022370da26a88b88ccc9fee9f3ef7ce45", - "sha256:bd2a13a0f8367e50347cbac87ae230ae1953935443240238f956bf10668bead6", - "sha256:cbc1184349ca6e5112898aa7fc3efa1b1bbae24ab1edc774cfd09cbfd3b091d7", - "sha256:cd82cca9c489e441574804dbda2dd8e114cf3be7935b03de11dade2c9478aea6", - "sha256:ce8ba5ed8b0a7a203922d61cff45ee6001a41a9359f04f00d055a4e988755569", - "sha256:cfee22e072a382b92ee0709dbb8203dabd52d54258051e770d9d2a81b162530b", - "sha256:d977df6f7c4109ed1d96ffb6795f6af77114be606ae4556efbfc9cac725db65d", - "sha256:da72a384a1d7e87490ca71182f3ab469ed21d847adc16b70c34faac5a3b12801", - "sha256:ddf4ad1d651e6c9234945061e1a31fe27a4be0dea21c498b87b186fadf8f5919", - "sha256:eb0ae5dfda83bbce660179d7b41c1c38fd833a54d2e6d9b258c644f3b75ef94d", - "sha256:f4c7d370badc60ac94a554bc571a46d03e39d8aacfba8006b334512e184aed59", - "sha256:f6c378b435a26fda8996579c0e324b108d2ca0d01b4661503a75634e5155559f", - "sha256:f6c9d30888503f2f5f87d6d41f016301352dd98da4a861bd10663c3a2d99d3b5", - "sha256:fab8a7877275060f7b303e1f91c218069a2814a616b6a5ee2d8a3737deb15915", - "sha256:fc32e7d7f98cac3d8d5153ed2cb583158ae3d446a6efb8e28ccb1c54a09f4169" + "sha256:08c4e315a76ef26eb833511ebf3fa87d182152adf43dedee8d79f998a2162a0b", + "sha256:0ca6cd58f62a2751728016d40082008d3b3412a7f28ddfb4a2f0d3c130f69e74", + "sha256:1621e7a2af72cced1f6ec8ca8ca91d0f76ac236ab2e8828ac8fe909512d566cb", + "sha256:18cd854b423fce44951c3a4d3e686bac8f1243d954f579e120a1714096637cc0", + "sha256:2841997a0d85b998cbafecb4183caf51fd19c4357075dfd33eb7efea57e4c149", + "sha256:2b97502c16a5ec611cd52410bdfaab264997c627a46b0f98d3f666227fd1ea2d", + "sha256:3a4c9886d61d386b2b493377d980f502186cd71d501fffdba52bd2a0880cef4f", + "sha256:3c1895c95be92600233e476fe283f042e71cf8f0b938aabf21b7aafa62a8dac9", + "sha256:42abddebe2c6a35180ca549fadc7228d23c1e1f76167c5ebc8a936b5804ea2df", + "sha256:468bd59a588e276961a918a3060948ae68f6ff5a7fa10bb2f9160c18fe341067", + "sha256:480b9931bfb08bf8b094edd4836271d4d6b44150da051547d8c7113bf947a8b0", + "sha256:53f4fd13976789ffafedd4d46f954c7bb01146121812b72b4ddca286034df966", + "sha256:62bcade20813796c426409a3e7423862d50ff0639f5a2a95be4b85b09a618666", + "sha256:67db33bea0a29d03e6eeec55a8190e033318cee3cbc732ba8fd939617cbf762d", + "sha256:6b217b8f9dfb6628f74b94bdaf9f7408708cb02167d644edca33f38746ca12dd", + "sha256:7661fc1d5cb73481cf710a1418a4e1e301ed7d5d924f91c67ba84b2a1b89defd", + "sha256:76c532fd68b93998aab92356be280deec5de8f8fe59cd28763d2cc8a58747b7f", + "sha256:79244b9e97948eaf38695f4b8e6fc63b14b78cc37f403c6642ba555517ac1268", + "sha256:7c58f598d9fcc52772b89a92d72bf8829c12d09746a6d2c724c5b30076c1f11d", + "sha256:7dc09198e4073e6015d9a8ea093fc348d4e59de49382476940c3dd9ae156fba8", + "sha256:80e043a89c6cadefd3a0712f8a1322038e819ebe9dbac7eca3bce1721bcb63bf", + "sha256:851977788b9caa8ed011f5f643d3ee8653af02c5fc723fa350db5125abf2be7b", + "sha256:8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c", + "sha256:902319cfe23366595d3fa769b5b751e6ee6750a0a64c5d9f757d624b2ac3519e", + "sha256:954e73c9cd4d6ae319f1c936ad159072b6d356a92dcbbabfd6e6204b9a79d356", + "sha256:ab888624ed68930442a3f3b0b921ad7439c51ba122dbc8c386e6487a658e4a4e", + "sha256:acebba1a23fb9d72b42471c3771b6f2f18dcd46df77482612054bd45c07dfa36", + "sha256:b4ebed0977f92320f6686c96e9e8dd29eed199eb8d066936bac991afc37cbb70", + "sha256:badb868fff14cfd0e200eaa845887b1011146a7d26d579aaa7f966c203736b92", + "sha256:be4e0f229cf3a71f9ecd633566bd6f80d9fa6afaaff5489492be63fe459ef98c", + "sha256:c0f84360dcca3481e8674393bdf931f9f10470988f87311b19d23cda869bb6b7", + "sha256:c1e41b32d6f7f9c26bc731a8b529ff592f31fc8b6ef2be9fa74abd05c8a342d7", + "sha256:c88fa7410e9fc471e0858638f403739ee869924dd8e4ae26748496466e27ac59", + "sha256:cf98fd7a6c8aaa08dbc699ffae33fd71175696d78028281bc7b832b26f00ca57", + "sha256:d072f7dfbdb184f0786d63bda26e8a0882041b1e393fbe98940395f7fab4c5e2", + "sha256:d1b5d457acbadcf8b27561deeaa386b0217f47626b29672fa7bd31deb6e91e1b", + "sha256:d3dcb5548ead4f1123851a5ced467791f6986d68c656bc63bfff1bf9e36671e2", + "sha256:d6157793719de168b199194f6b6173f0ccd3bf3499e6870fac17086072e39115", + "sha256:d728b08448e5ac3e4d886b165385a262883c34b84a7fe1166277fe675e1c197a", + "sha256:de8df0684398bd74ad160afdc2a118ca28384ac6f5e234eb0508858d8d2d9364", + "sha256:e6a02cf7271ee94674a44f4e62aa061d2d049001c844657740e156596298b70b", + "sha256:ea12133df25e3a6918718fbb9a510c6ee5d3fdd5a346320421aac3882f4feeea", + "sha256:ea5a79e808baef98c48c884effce05c31a0698c1057de8fc1c688891043c1ce1", + "sha256:f43b4a2e6218371dd4f41e547bd919ceeb6ebf4abf31a7a0669cd11cd91ea973", + "sha256:f762442bab706fd874064ca218b33a1d8e40d4938e96c24dafd9b12e28017f45", + "sha256:f89468059ebc519a7acde1ee50b779019535db8dcf9b8c162ef669257fef7a93", + "sha256:f907c7359ce8bf7f7e63c82f75ad0223384105f5126f313400b7e8004d9b33c3" ], "markers": "python_version >= '3.6'", - "version": "==23.1.0" + "version": "==22.3.0" }, "redis": { "hashes": [ - "sha256:2f7a57cf4af15cd543c4394bcbe2b9148db2606a37edba755368836e3a1d053e", - "sha256:f57f8df5d238a8ecf92f499b6b21467bfee6c13d89953c27edf1e2bc673622e7" + "sha256:a52d5694c9eb4292770084fa8c863f79367ca19884b329ab574d5cb2036b3e54", + "sha256:ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880" ], "markers": "python_version >= '3.6'", - "version": "==4.3.3" + "version": "==4.3.4" }, "remote-pdb": { "hashes": [ @@ -1940,11 +1942,11 @@ }, "requests": { "hashes": [ - "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", - "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f", + "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==2.27.1" + "markers": "python_version >= '3.7' and python_version < '4'", + "version": "==2.28.0" }, "roundrobin": { "hashes": [ @@ -1954,11 +1956,11 @@ }, "setuptools": { "hashes": [ - "sha256:d1746e7fd520e83bbe210d02fff1aa1a425ad671c7a9da7d246ec2401a087198", - "sha256:e7d11f3db616cda0751372244c2ba798e8e56a28e096ec4529010b803485f3fe" + "sha256:990a4f7861b31532871ab72331e755b5f14efbe52d336ea7f6118144dd478741", + "sha256:c1848f654aea2e3526d17fc3ce6aeaa5e7e24e66e645b5be2171f3f6b4e5a178" ], "markers": "python_version >= '3.7'", - "version": "==62.3.3" + "version": "==62.6.0" }, "six": { "hashes": [ @@ -1992,11 +1994,11 @@ }, "sphinx": { "hashes": [ - "sha256:7bf8ca9637a4ee15af412d1a1d9689fec70523a68ca9bb9127c2f3eeb344e2e6", - "sha256:ebf612653238bcc8f4359627a9b7ce44ede6fdd75d9d30f68255c7383d3a6226" + "sha256:b18e978ea7565720f26019c702cd85c84376e948370f1cd43d60265010e1c7b0", + "sha256:d3e57663eed1d7c5c50895d191fdeda0b54ded6f44d5621b50709466c338d1e8" ], "index": "pypi", - "version": "==4.5.0" + "version": "==5.0.2" }, "sphinx-autobuild": { "hashes": [ @@ -2006,6 +2008,14 @@ "index": "pypi", "version": "==2021.3.14" }, + "sphinx-basic-ng": { + "hashes": [ + "sha256:cffffb14914ddd26c94b1330df1d72dab5a42e220aaeb5953076a40b9c50e801", + "sha256:e8b6efd2c5ece014156de76065eda01ddfca0fee465aa020b1e3c12f84570bbe" + ], + "markers": "python_version >= '3.7'", + "version": "==0.0.1a12" + }, "sphinxcontrib-applehelp": { "hashes": [ "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a", @@ -2056,10 +2066,10 @@ }, "stack-data": { "hashes": [ - "sha256:45692d41bd633a9503a5195552df22b583caf16f0b27c4e58c98d88c8b648e12", - "sha256:999762f9c3132308789affa03e9271bbbe947bf78311851f4d485d8402ed858e" + "sha256:77bec1402dcd0987e9022326473fdbcc767304892a533ed8c29888dacb7dddbc", + "sha256:aa1d52d14d09c7a9a12bb740e6bdfffe0f5e8f4f9218d85e7c73a8c37f7ae38d" ], - "version": "==0.2.0" + "version": "==0.3.0" }, "toml": { "hashes": [ @@ -2126,11 +2136,11 @@ }, "traitlets": { "hashes": [ - "sha256:1530d04badddc6a73d50b7ee34667d4b96914da352109117b4280cb56523a51b", - "sha256:74803a1baa59af70f023671d86d5c7a834c931186df26d50d362ee6a1ff021fd" + "sha256:0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2", + "sha256:65fa18961659635933100db8ca120ef6220555286949774b9cfc106f941d1c7a" ], "markers": "python_version >= '3.7'", - "version": "==5.2.2.post1" + "version": "==5.3.0" }, "typing-extensions": { "hashes": [ @@ -2150,11 +2160,11 @@ }, "virtualenv": { "hashes": [ - "sha256:e617f16e25b42eb4f6e74096b9c9e37713cf10bf30168fb4a739f3fa8f898a3a", - "sha256:ef589a79795589aada0c1c5b319486797c03b67ac3984c48c669c0e4f50df3a5" + "sha256:4c44b1d77ca81f8368e2d7414f9b20c428ad16b343ac6d226206c5b84e2b4fcc", + "sha256:804cce4de5b8a322f099897e308eecc8f6e2951f1a8e7e2b3598dff865f01336" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==20.14.1" + "version": "==20.15.0" }, "wcwidth": { "hashes": [ diff --git a/api/catalog/logger.py b/api/catalog/logger.py index 0d7405b25..c6651db65 100644 --- a/api/catalog/logger.py +++ b/api/catalog/logger.py @@ -12,6 +12,7 @@ def health_check_filter(record: LogRecord) -> bool: "version": 1, "disable_existing_loggers": False, "filters": { + "request_id": {"()": "log_request_id.filters.RequestIDFilter"}, "require_debug_false": {"()": "django.utils.log.RequireDebugFalse"}, "require_debug_true": {"()": "django.utils.log.RequireDebugTrue"}, "health_check": { @@ -26,40 +27,42 @@ def health_check_filter(record: LogRecord) -> bool: "style": "{", }, "console": { - "format": "[%(asctime)s - %(name)s - %(lineno)3d][%(levelname)s] %(message)s", # noqa: E501 + "format": "[%(asctime)s - %(name)s - %(lineno)3d][%(levelname)s] [%(request_id)s] %(message)s", # noqa: E501 }, }, "handlers": { # Default console logger "console": { "level": "INFO", - "filters": ["require_debug_true"], + "filters": ["require_debug_true", "request_id"], "class": "logging.StreamHandler", "formatter": "console", }, # Add a clause to log error messages to the console in production "console_prod": { "level": "WARNING", - "filters": ["require_debug_false"], + "filters": ["require_debug_false", "request_id"], "class": "logging.StreamHandler", "formatter": "console", }, # Handler for all other logging "general_console": { "level": "INFO", + "filters": ["request_id"], "class": "logging.StreamHandler", "formatter": "console", }, # Default server logger "django.server": { "level": "INFO", + "filters": ["request_id"], "class": "logging.StreamHandler", "formatter": "django.server", }, # Default mailing logger "mail_admins": { "level": "ERROR", - "filters": ["require_debug_false"], + "filters": ["request_id", "require_debug_false"], "class": "django.utils.log.AdminEmailHandler", }, }, @@ -72,11 +75,15 @@ def health_check_filter(record: LogRecord) -> bool: "django.server": { "handlers": ["django.server"], # Filter health check logs - "filters": ["health_check"], + "filters": ["health_check", "request_id"], "level": "INFO", "propagate": False, }, # Default handler for all other loggers - "": {"handlers": ["general_console"], "level": "INFO"}, + "": { + "handlers": ["general_console"], + "filters": ["request_id"], + "level": "INFO", + }, }, } diff --git a/api/catalog/settings.py b/api/catalog/settings.py index 4c915d5fa..8c169c385 100644 --- a/api/catalog/settings.py +++ b/api/catalog/settings.py @@ -95,7 +95,14 @@ AWS_S3_SIGNATURE_VERSION = "s3v4" INSTALLED_APPS.append("storages") +# https://github.com/dabapps/django-log-request-id#logging-all-requests +LOG_REQUESTS = True +# https://github.com/dabapps/django-log-request-id#installation-and-usage +REQUEST_ID_RESPONSE_HEADER = "X-Request-Id" + MIDDLEWARE = [ + # https://github.com/dabapps/django-log-request-id + "log_request_id.middleware.RequestIDMiddleware", "django.middleware.security.SecurityMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "corsheaders.middleware.CorsMiddleware",