Merge branch 'master' and resolve conflict

.ddev/config.toml

@@ -68,8 +68,6 @@ only-py2 = true
 [overrides.dependencies.licenses]
 # https://github.com/aerospike/aerospike-client-python/blob/master/LICENSE
 aerospike = ['Apache-2.0']
-# https://github.com/baztian/jaydebeapi/blob/master/COPYING
-JayDeBeApi = ['LGPL-3.0-only']
 # https://github.com/pyca/cryptography/blob/main/LICENSE
 cryptography = ['Apache-2.0', 'BSD-3-Clause', 'PSF']
 # https://github.com/rthalley/dnspython/blob/master/LICENSE
@@ -84,8 +82,6 @@ oauthlib = ['BSD-3-Clause']
 mmh3 = ['CC0-1.0']
 # https://github.com/paramiko/paramiko/blob/master/LICENSE
 paramiko = ['LGPL-2.1-only']
-# https://github.com/oracle/python-oracledb/blob/main/LICENSE.txt
-oracledb = ['Apache-2.0']
 # https://github.com/psycopg/psycopg2/blob/master/LICENSE
 # https://github.com/psycopg/psycopg2/blob/master/doc/COPYING.LESSER
 psycopg2-binary = ['LGPL-3.0-only', 'BSD-3-Clause']
@@ -119,7 +115,6 @@ dnspython = 'https://github.com/rthalley/dnspython'
 foundationdb = 'https://github.com/apple/foundationdb'
 in-toto = 'https://github.com/in-toto/in-toto'
 lxml = 'https://github.com/lxml/lxml'
-oracledb = 'https://github.com/oracle/python-oracledb'
 packaging = 'https://github.com/pypa/packaging'
 paramiko = 'https://github.com/paramiko/paramiko'
 protobuf = 'https://github.com/protocolbuffers/protobuf'
@@ -176,10 +171,6 @@ exclude = [
     'aerospike',  # v8+ breaks agent build.
     # https://github.com/DataDog/integrations-core/pull/16080
     'lxml',
-    # We need to keep an `oracledb` version that uses the same version of odpi that is used in godror in the agent repo.
-    # Somehow we do not load the right version. Until we find out how and why, we need to keep both
-    # libs in sync with the same version of odpi.
-    'oracledb',
     # We're not ready to switch to v3 of the postgres library, see:
     # https://github.com/DataDog/integrations-core/pull/15859
     'psycopg2-binary',

.deps/metadata.json

@@ -1,3 +1,3 @@
 {
-  "sha256": "cae1b2a1783683d24c7e83c9ce72f2296ce24eaf3934f4e26297522a340c14fd"
+  "sha256": "ad2cb185c29169c975eb82a18c1d1282339561e3667ba85b5b8d74b9f93be96e"
 }

.deps/resolved/linux-aarch64_py2.txt

@@ -31,7 +31,7 @@ ipaddress @ https://agent-int-packages.datadoghq.com/external/ipaddress/ipaddres
 jmespath @ https://agent-int-packages.datadoghq.com/external/jmespath/jmespath-0.10.0-py2.py3-none-any.whl#sha256=cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f
 kubernetes @ https://agent-int-packages.datadoghq.com/external/kubernetes/kubernetes-18.20.0-py2.py3-none-any.whl#sha256=ff31ec17437293e7d4e1459f1228c42d27c7724dfb56b4868aba7a901a5b72c9
 ldap3 @ https://agent-int-packages.datadoghq.com/external/ldap3/ldap3-2.9.1-py2.py3-none-any.whl#sha256=5869596fc4948797020d3f03b7939da938778a0f9e2009f7a072ccf92b8e8d70
-lxml @ https://agent-int-packages.datadoghq.com/built/lxml/lxml-4.9.4-20240827232234-cp27-cp27mu-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=12b5225d00f406e17d5d72a40325335b86ecc7fbe1b488f5f2b342f0d25ef41a
+lxml @ https://agent-int-packages.datadoghq.com/built/lxml/lxml-4.9.4-20240828124958-cp27-cp27mu-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=12b5225d00f406e17d5d72a40325335b86ecc7fbe1b488f5f2b342f0d25ef41a
 lz4 @ https://agent-int-packages.datadoghq.com/built/lz4/lz4-2.2.1-20240806143215-cp27-cp27mu-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=4433dd9be47ad60f1a1b71c61d73226a8300af76d9e70ce2d2e0ac3a8f5acfe6
 mmh3 @ https://agent-int-packages.datadoghq.com/built/mmh3/mmh3-2.5.1-20240806143215-cp27-cp27mu-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=dc1a52fc33a01714f1ec7f72a180c3935c5e06d41e2c55a683aaa6f08b16e906
 monotonic @ https://agent-int-packages.datadoghq.com/external/monotonic/monotonic-1.6-py2.py3-none-any.whl#sha256=68687e19a14f11f26d140dd5c86f3dba4bf5df58003000ed467e0e2a69bca96c
@@ -85,7 +85,7 @@ tenacity @ https://agent-int-packages.datadoghq.com/external/tenacity/tenacity-7
 typing @ https://agent-int-packages.datadoghq.com/external/typing/typing-3.10.0.0-py2-none-any.whl#sha256=c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308
 tzlocal @ https://agent-int-packages.datadoghq.com/external/tzlocal/tzlocal-2.1-py2.py3-none-any.whl#sha256=e2cb6c6b5b604af38597403e9852872d7f534962ae2954c7f35efcb1ccacf4a4
 uptime @ https://agent-int-packages.datadoghq.com/built/uptime/uptime-3.0.1-20240806143217-cp27-cp27mu-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=ca0f6e9fd0b501f9b89cb6cff72d6cd950b831aac21b2f6625ab8966114df319
-urllib3 @ https://agent-int-packages.datadoghq.com/external/urllib3/urllib3-1.26.19-py2.py3-none-any.whl#sha256=37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3
+urllib3 @ https://agent-int-packages.datadoghq.com/external/urllib3/urllib3-1.26.20-py2.py3-none-any.whl#sha256=0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e
 vertica-python @ https://agent-int-packages.datadoghq.com/external/vertica-python/vertica_python-1.2.0-py2.py3-none-any.whl#sha256=4c6bc271e871e4935874cc4556832ff9a2330894e2e9516eddd6a7344b9f514b
 websocket-client @ https://agent-int-packages.datadoghq.com/external/websocket-client/websocket_client-0.59.0-py2.py3-none-any.whl#sha256=2e50d26ca593f70aba7b13a489435ef88b8fc3b5c5643c1ce8808ff9b40f0b32
 wrapt @ https://agent-int-packages.datadoghq.com/built/wrapt/wrapt-1.15.0-20240806143217-cp27-cp27mu-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=b4f34a5aebca209debb2425543be1fd381d286c44e8f9d9b0efd7e34b2d156bb

.deps/resolved/linux-aarch64_py3.txt

@@ -13,17 +13,17 @@ boto3 @ https://agent-int-packages.datadoghq.com/external/boto3/boto3-1.34.153-p
 botocore @ https://agent-int-packages.datadoghq.com/external/botocore/botocore-1.34.153-py3-none-any.whl#sha256=9fc2ad40be8c103ab9bfcb48b97b117d299d0b3a542cdd30134ee2935bee827a
 bytecode @ https://agent-int-packages.datadoghq.com/external/bytecode/bytecode-0.15.1-py3-none-any.whl#sha256=0a1dc340cac823cff605609b8b214f7f9bf80418c6b9e0fc8c6db1793c27137d
 cachetools @ https://agent-int-packages.datadoghq.com/external/cachetools/cachetools-5.4.0-py3-none-any.whl#sha256=3ae3b49a3d5e28a77a0be2b37dbcb89005058959cb2323858c2657c4a8cab474
-cattrs @ https://agent-int-packages.datadoghq.com/external/cattrs/cattrs-23.2.3-py3-none-any.whl#sha256=0341994d94971052e9ee70662542699a3162ea1e0c62f7ce1b4a57f563685108
-certifi @ https://agent-int-packages.datadoghq.com/external/certifi/certifi-2024.7.4-py3-none-any.whl#sha256=c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+cattrs @ https://agent-int-packages.datadoghq.com/external/cattrs/cattrs-24.1.0-py3-none-any.whl#sha256=043bb8af72596432a7df63abcff0055ac0f198a4d2e95af8db5a936a7074a761
+certifi @ https://agent-int-packages.datadoghq.com/external/certifi/certifi-2024.8.30-py3-none-any.whl#sha256=922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8
 cffi @ https://agent-int-packages.datadoghq.com/external/cffi/cffi-1.17.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424
 charset-normalizer @ https://agent-int-packages.datadoghq.com/external/charset-normalizer/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f
 clickhouse-cityhash @ https://agent-int-packages.datadoghq.com/external/clickhouse-cityhash/clickhouse_cityhash-1.0.2.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=daae6e5108e618f3fb64eab8c9dbf74e05fae5ba4b4d785fc7548a1c2573444b
 clickhouse-driver @ https://agent-int-packages.datadoghq.com/external/clickhouse-driver/clickhouse_driver-0.2.8-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=85f628b4bf6db0fe8fe13da8576a9b95c23b463dff59f4c7aa58cedf529d7d97
 cm-client @ https://agent-int-packages.datadoghq.com/built/cm-client/cm_client-45.0.4-20240402155018-py3-none-manylinux2014_aarch64.whl#sha256=aba3c1683ef1b2099933e030464d29b3ad1c206784ebd15d8a7147ecd6ba24e1
-confluent-kafka @ https://agent-int-packages.datadoghq.com/built/confluent-kafka/confluent_kafka-2.5.0-20240826142116-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=2a5dcdb93a3bf32ccfa01bb1a572a029d4e36ef377426994ebb1742052da57d3
+confluent-kafka @ https://agent-int-packages.datadoghq.com/built/confluent-kafka/confluent_kafka-2.5.0-20240829143126-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=2a5dcdb93a3bf32ccfa01bb1a572a029d4e36ef377426994ebb1742052da57d3
 cryptography @ https://agent-int-packages.datadoghq.com/external/cryptography/cryptography-42.0.8-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e
 ddsketch @ https://agent-int-packages.datadoghq.com/external/ddsketch/ddsketch-3.0.1-py3-none-any.whl#sha256=6d047b455fe2837c43d366ff1ae6ba0c3166e15499de8688437a75cea914224e
-ddtrace @ https://agent-int-packages.datadoghq.com/external/ddtrace/ddtrace-2.10.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=6db1854b941515b1fde2fd7d280666206b728ab15e8f682cc49019ec203dc9e5
+ddtrace @ https://agent-int-packages.datadoghq.com/external/ddtrace/ddtrace-2.10.6-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=1f4de09300cd24101e5209a542372e06aff84280cb1036218bfda41e2110f3d3
 decorator @ https://agent-int-packages.datadoghq.com/external/decorator/decorator-5.1.1-py3-none-any.whl#sha256=b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
 deprecated @ https://agent-int-packages.datadoghq.com/external/deprecated/Deprecated-1.2.14-py2.py3-none-any.whl#sha256=6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c
 dnspython @ https://agent-int-packages.datadoghq.com/external/dnspython/dnspython-2.6.1-py3-none-any.whl#sha256=5ef3b9680161f6fa89daf8ad451b5f1a33b18ae8a1c6778cdf4b43f08c0a6e50
@@ -34,14 +34,12 @@ foundationdb @ https://agent-int-packages.datadoghq.com/built/foundationdb/found
 google-auth @ https://agent-int-packages.datadoghq.com/external/google-auth/google_auth-2.34.0-py2.py3-none-any.whl#sha256=72fd4733b80b6d777dcde515628a9eb4a577339437012874ea286bca7261ee65
 gssapi @ https://agent-int-packages.datadoghq.com/built/gssapi/gssapi-1.8.3-20240806143204-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=525784d61eca167b04319a7fc4467aefe9c772ca193b7352fcb7f395938f24d2
 idna @ https://agent-int-packages.datadoghq.com/external/idna/idna-3.8-py3-none-any.whl#sha256=050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac
-importlib-metadata @ https://agent-int-packages.datadoghq.com/external/importlib-metadata/importlib_metadata-8.0.0-py3-none-any.whl#sha256=15584cf2b1bf449d98ff8a6ff1abef57bf20f3ac6454f431736cd3e660921b2f
+importlib-metadata @ https://agent-int-packages.datadoghq.com/external/importlib-metadata/importlib_metadata-8.4.0-py3-none-any.whl#sha256=66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1
 in-toto @ https://agent-int-packages.datadoghq.com/external/in-toto/in_toto-2.0.0-py3-none-any.whl#sha256=eaf71733cdd5b2309b58b24169c13c24701da72baa43b7432d1dffc308e7bf32
 iso8601 @ https://agent-int-packages.datadoghq.com/external/iso8601/iso8601-2.1.0-py3-none-any.whl#sha256=aac4145c4dcb66ad8b648a02830f5e2ff6c24af20f4f482689be402db2429242
-jaydebeapi @ https://agent-int-packages.datadoghq.com/external/jaydebeapi/JayDeBeApi-1.2.3-py3-none-any.whl#sha256=d6256bdad1e14414225fbc839f7d56922ea3abc06153f3a57490fee909fecd64
 jellyfish @ https://agent-int-packages.datadoghq.com/external/jellyfish/jellyfish-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=0a4b526ed2080b97431454075c46c19baddc944e95cc605248e32a2a07be231e
 jinja2 @ https://agent-int-packages.datadoghq.com/external/jinja2/jinja2-3.1.4-py3-none-any.whl#sha256=bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d
 jmespath @ https://agent-int-packages.datadoghq.com/external/jmespath/jmespath-1.0.1-py3-none-any.whl#sha256=02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980
-jpype1 @ https://agent-int-packages.datadoghq.com/built/jpype1/JPype1-1.5.0-20240806143204-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=b5da3e13dbc92b3e68b4b9dd916fb0523faad179778eb2b8d7ffee252e7ded16
 jsonpatch @ https://agent-int-packages.datadoghq.com/external/jsonpatch/jsonpatch-1.33-py2.py3-none-any.whl#sha256=0ae28c0cd062bbd8b8ecc26d7d164fbbea9652a1a3693f3b956c1eae5145dade
 jsonpointer @ https://agent-int-packages.datadoghq.com/external/jsonpointer/jsonpointer-3.0.0-py2.py3-none-any.whl#sha256=13e088adc14fca8b6aa8177c044e12701e6ad4b28ff10e65f2267a90109c9942
 keystoneauth1 @ https://agent-int-packages.datadoghq.com/external/keystoneauth1/keystoneauth1-5.8.0-py3-none-any.whl#sha256=e69dff80c509ab64d4de4494658d914e81f26af720828dc584ceee74ecd666d9
@@ -57,8 +55,7 @@ msal-extensions @ https://agent-int-packages.datadoghq.com/external/msal-extensi
 netifaces @ https://agent-int-packages.datadoghq.com/built/netifaces/netifaces-0.11.0-20240806143205-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=b284385abbafd396a272e1e28e61e33db37178dfcc2dce20a2d391e1ad6d5be8
 oauthlib @ https://agent-int-packages.datadoghq.com/external/oauthlib/oauthlib-3.2.2-py3-none-any.whl#sha256=8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca
 openstacksdk @ https://agent-int-packages.datadoghq.com/external/openstacksdk/openstacksdk-3.3.0-py3-none-any.whl#sha256=e6d4121b87354984caf0e3c032e2ebf4d4440374f86c81c27ec52ca5df359157
-opentelemetry-api @ https://agent-int-packages.datadoghq.com/external/opentelemetry-api/opentelemetry_api-1.26.0-py3-none-any.whl#sha256=7d7ea33adf2ceda2dd680b18b1677e4152000b37ca76e679da71ff103b943064
-oracledb @ https://agent-int-packages.datadoghq.com/external/oracledb/oracledb-1.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=138904100c5218c33005ec5b07688ce68f40ea20c28b3b840738401ae2a862a1
+opentelemetry-api @ https://agent-int-packages.datadoghq.com/external/opentelemetry-api/opentelemetry_api-1.27.0-py3-none-any.whl#sha256=953d5871815e7c30c81b56d910c707588000fff7a3ca1c73e6531911d53065e7
 orjson @ https://agent-int-packages.datadoghq.com/external/orjson/orjson-3.10.6-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=55d43d3feb8f19d07e9f01e5b9be4f28801cf7c60d0fa0d279951b18fae1932b
 os-service-types @ https://agent-int-packages.datadoghq.com/external/os-service-types/os_service_types-1.7.0-py2.py3-none-any.whl#sha256=0505c72205690910077fb72b88f2a1f07533c8d39f2fe75b29583481764965d6
 packaging @ https://agent-int-packages.datadoghq.com/external/packaging/packaging-24.1-py3-none-any.whl#sha256=5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124

.deps/resolved/linux-x86_64_py2.txt

@@ -86,7 +86,7 @@ tenacity @ https://agent-int-packages.datadoghq.com/external/tenacity/tenacity-7
 typing @ https://agent-int-packages.datadoghq.com/external/typing/typing-3.10.0.0-py2-none-any.whl#sha256=c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308
 tzlocal @ https://agent-int-packages.datadoghq.com/external/tzlocal/tzlocal-2.1-py2.py3-none-any.whl#sha256=e2cb6c6b5b604af38597403e9852872d7f534962ae2954c7f35efcb1ccacf4a4
 uptime @ https://agent-int-packages.datadoghq.com/built/uptime/uptime-3.0.1-20240806143201-cp27-cp27mu-manylinux2014_x86_64.manylinux_2_17_x86_64.whl#sha256=8d0e3b94c499aa1906417bae3d5378be114aa41a24dbefd0d9d982b21a0a6f40
-urllib3 @ https://agent-int-packages.datadoghq.com/external/urllib3/urllib3-1.26.19-py2.py3-none-any.whl#sha256=37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3
+urllib3 @ https://agent-int-packages.datadoghq.com/external/urllib3/urllib3-1.26.20-py2.py3-none-any.whl#sha256=0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e
 vertica-python @ https://agent-int-packages.datadoghq.com/external/vertica-python/vertica_python-1.2.0-py2.py3-none-any.whl#sha256=4c6bc271e871e4935874cc4556832ff9a2330894e2e9516eddd6a7344b9f514b
 websocket-client @ https://agent-int-packages.datadoghq.com/external/websocket-client/websocket_client-0.59.0-py2.py3-none-any.whl#sha256=2e50d26ca593f70aba7b13a489435ef88b8fc3b5c5643c1ce8808ff9b40f0b32
 wrapt @ https://agent-int-packages.datadoghq.com/external/wrapt/wrapt-1.15.0-cp27-cp27mu-manylinux2010_x86_64.whl#sha256=58d7a75d731e8c63614222bcb21dd992b4ab01a399f1f09dd82af17bbfc2368a