From ba8fe6b5986590a77067ac76d938403842371dbe Mon Sep 17 00:00:00 2001 From: FlorentClarret <1266346+FlorentClarret@users.noreply.github.com> Date: Mon, 5 May 2025 02:31:37 +0000 Subject: [PATCH 01/16] Update dependencies --- LICENSE-3rdparty.csv | 4 +-- agent_requirements.in | 32 +++++++++---------- amazon_msk/changelog.d/20208.added | 1 + amazon_msk/pyproject.toml | 2 +- cisco_aci/changelog.d/20208.added | 1 + cisco_aci/pyproject.toml | 2 +- clickhouse/changelog.d/20208.added | 1 + clickhouse/pyproject.toml | 2 +- datadog_checks_base/changelog.d/20208.added | 1 + datadog_checks_base/pyproject.toml | 16 ++++------ .../changelog.d/20208.added | 1 + datadog_checks_downloader/pyproject.toml | 2 +- foundationdb/changelog.d/20208.added | 1 + foundationdb/pyproject.toml | 2 +- http_check/changelog.d/20208.added | 1 + http_check/pyproject.toml | 2 +- kafka_consumer/changelog.d/20208.added | 1 + kafka_consumer/pyproject.toml | 2 +- mysql/changelog.d/20208.added | 1 + mysql/pyproject.toml | 2 +- openstack_controller/changelog.d/20208.added | 1 + openstack_controller/pyproject.toml | 2 +- postgres/changelog.d/20208.added | 1 + postgres/pyproject.toml | 2 +- redisdb/changelog.d/20208.added | 1 + redisdb/pyproject.toml | 2 +- riakcs/changelog.d/20208.added | 1 + riakcs/pyproject.toml | 2 +- snowflake/changelog.d/20208.added | 1 + snowflake/pyproject.toml | 2 +- spark/changelog.d/20208.added | 1 + spark/pyproject.toml | 2 +- tls/changelog.d/20208.added | 1 + tls/pyproject.toml | 2 +- 34 files changed, 56 insertions(+), 42 deletions(-) create mode 100644 amazon_msk/changelog.d/20208.added create mode 100644 cisco_aci/changelog.d/20208.added create mode 100644 clickhouse/changelog.d/20208.added create mode 100644 datadog_checks_base/changelog.d/20208.added create mode 100644 datadog_checks_downloader/changelog.d/20208.added create mode 100644 foundationdb/changelog.d/20208.added create mode 100644 http_check/changelog.d/20208.added create mode 100644 kafka_consumer/changelog.d/20208.added create mode 100644 mysql/changelog.d/20208.added create mode 100644 openstack_controller/changelog.d/20208.added create mode 100644 postgres/changelog.d/20208.added create mode 100644 redisdb/changelog.d/20208.added create mode 100644 riakcs/changelog.d/20208.added create mode 100644 snowflake/changelog.d/20208.added create mode 100644 spark/changelog.d/20208.added create mode 100644 tls/changelog.d/20208.added diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 2f09870386eda..314e2676685d3 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -24,7 +24,7 @@ ddtrace,PyPI,BSD-3-Clause,"Copyright 2016 Datadog, Inc." dnspython,PyPI,ISC,Copyright (C) Dnspython Contributors flup,Vendor,BSD-3-Clause,Copyright (c) 2005 Allan Saddi. All Rights Reserved. flup-py3,Vendor,BSD-3-Clause,"Copyright (c) 2005, 2006 Allan Saddi All rights reserved." -foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB +foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB Team hazelcast-python-client,PyPI,Apache-2.0,"Copyright (c) 2008-2023, Hazelcast, Inc. All Rights Reserved." in-toto,PyPI,Apache-2.0,Copyright 2018 New York University jellyfish,PyPI,MIT,Copyright (c) 2015 James Turk @@ -74,7 +74,7 @@ requests-ntlm,PyPI,ISC,Copyright (c) 2013 Ben Toews requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz. requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz. requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield" -requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2024 thelab +requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2025 thelab rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB. securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres semver,PyPI,BSD-3-Clause,"Copyright (c) 2013, Konstantine Rybnikov" diff --git a/agent_requirements.in b/agent_requirements.in index d97ac1e843c12..d7763ce08b76b 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -1,32 +1,32 @@ aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' aws-requests-auth==0.4.3 azure-identity==1.21.0 -beautifulsoup4==4.13.3 +beautifulsoup4==4.13.4 binary==1.0.1 -boto3==1.37.23 -botocore==1.37.23 +boto3==1.38.8 +botocore==1.38.8 cachetools==5.5.2 clickhouse-cityhash==1.0.2.4 clickhouse-driver==0.2.9 cm-client==45.0.4 -confluent-kafka==2.8.0 -cryptography==44.0.2 +confluent-kafka==2.10.0 +cryptography==44.0.3 ddtrace==2.21.4 dnspython==2.7.0 -foundationdb==6.3.24 +foundationdb==7.4.1 hazelcast-python-client==5.5.0 in-toto==2.0.0 -jellyfish==1.1.3 +jellyfish==1.2.0 kubernetes==32.0.1 lazy-loader==0.4 ldap3==2.9.1 lxml==5.1.1 -lz4==4.4.3 +lz4==4.4.4 mmh3==5.1.0 oauthlib==3.2.2 -openstacksdk==4.4.0 -orjson==3.10.16 -packaging==24.2 +openstacksdk==4.5.0 +orjson==3.10.18 +packaging==25.0 paramiko==3.5.1 ply==3.11 prometheus-client==0.21.1 @@ -35,7 +35,7 @@ psutil==6.0.0 psycopg2-binary==2.9.9 pyasn1==0.4.8 pycryptodomex==3.22.0 -pydantic==2.11.1 +pydantic==2.11.4 pyjwt==2.10.1 pymongo[srv]==4.8.0; python_version >= '3.9' pymqi==1.12.11; sys_platform != 'darwin' or platform_machine != 'arm64' @@ -52,21 +52,21 @@ python3-gearman==0.1.0; sys_platform != 'win32' pyvmomi==8.0.3.0.1 pywin32==310; sys_platform == 'win32' pyyaml==6.0.2 -redis==5.2.1 +redis==6.0.0 requests-kerberos==0.15.0 requests-ntlm==1.3.0 requests-oauthlib==2.0.0 requests-toolbelt==1.0.0 -requests-unixsocket2==0.4.2 +requests-unixsocket2==1.0.0 requests==2.32.3 rethinkdb==2.4.10.post1 securesystemslib[crypto,pynacl]==0.28.0 semver==3.0.4 service-identity[idna]==24.2.0 simplejson==3.20.1 -snowflake-connector-python==3.14.0 +snowflake-connector-python==3.15.0 supervisor==4.2.5 tuf==4.0.0 -urllib3==2.3.0 +urllib3==2.4.0 vertica-python==1.4.0 wrapt==1.17.2 diff --git a/amazon_msk/changelog.d/20208.added b/amazon_msk/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/amazon_msk/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml index ce57d324e6ae3..d4675b87f0bba 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "boto3==1.37.23", + "boto3==1.38.8", ] [project.urls] diff --git a/cisco_aci/changelog.d/20208.added b/cisco_aci/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/cisco_aci/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/cisco_aci/pyproject.toml b/cisco_aci/pyproject.toml index ea047f6cbb08f..4cd36a9cf169d 100644 --- a/cisco_aci/pyproject.toml +++ b/cisco_aci/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==44.0.2", + "cryptography==44.0.3", ] [project.urls] diff --git a/clickhouse/changelog.d/20208.added b/clickhouse/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/clickhouse/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/clickhouse/pyproject.toml b/clickhouse/pyproject.toml index 6663988455760..3a844b3040cf5 100644 --- a/clickhouse/pyproject.toml +++ b/clickhouse/pyproject.toml @@ -38,7 +38,7 @@ license = "BSD-3-Clause" deps = [ "clickhouse-cityhash==1.0.2.4", "clickhouse-driver==0.2.9", - "lz4==4.4.3", + "lz4==4.4.4", ] [project.urls] diff --git a/datadog_checks_base/changelog.d/20208.added b/datadog_checks_base/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/datadog_checks_base/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 3480c8afa2982..2bffdf73f5ca6 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -36,28 +36,26 @@ db = [ deps = [ "binary==1.0.1", "cachetools==5.5.2", - "cryptography==44.0.2", + "cryptography==44.0.3", "ddtrace==2.21.4", - "jellyfish==1.1.3", + "jellyfish==1.2.0", "lazy-loader==0.4", "prometheus-client==0.21.1", "protobuf==6.30.2", - "pydantic==2.11.1", + "pydantic==2.11.4", "python-dateutil==2.9.0.post0", "pywin32==310; sys_platform == 'win32'", "pyyaml==6.0.2", "requests-toolbelt==1.0.0", - "requests-unixsocket2==0.4.2", + "requests-unixsocket2==1.0.0", "requests==2.32.3", "simplejson==3.20.1", - # urllib3 is a dependency of requests that we explicitly - # make use of in a few places - "urllib3==2.3.0", + "urllib3==2.4.0", "wrapt==1.17.2", ] http = [ "aws-requests-auth==0.4.3", - "botocore==1.37.23", + "botocore==1.38.8", "oauthlib==3.2.2", "pyjwt==2.10.1", "pyopenssl==25.0.0", @@ -67,7 +65,7 @@ http = [ "requests-oauthlib==2.0.0", ] json = [ - "orjson==3.10.16", + "orjson==3.10.18", ] kube = [ "kubernetes==32.0.1", diff --git a/datadog_checks_downloader/changelog.d/20208.added b/datadog_checks_downloader/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/datadog_checks_downloader/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/datadog_checks_downloader/pyproject.toml b/datadog_checks_downloader/pyproject.toml index 8a9ef38ca7343..9160c419bda4e 100644 --- a/datadog_checks_downloader/pyproject.toml +++ b/datadog_checks_downloader/pyproject.toml @@ -34,7 +34,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "in-toto==2.0.0", - "packaging==24.2", + "packaging==25.0", "securesystemslib[crypto,pynacl]==0.28.0", "tuf==4.0.0", ] diff --git a/foundationdb/changelog.d/20208.added b/foundationdb/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/foundationdb/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/foundationdb/pyproject.toml b/foundationdb/pyproject.toml index f75f1aba57ac3..5af6b6c31da05 100644 --- a/foundationdb/pyproject.toml +++ b/foundationdb/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "foundationdb==6.3.24", + "foundationdb==7.4.1", ] [project.urls] diff --git a/http_check/changelog.d/20208.added b/http_check/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/http_check/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/http_check/pyproject.toml b/http_check/pyproject.toml index 5463da9ae27b2..5979b517efc0f 100644 --- a/http_check/pyproject.toml +++ b/http_check/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==44.0.2", + "cryptography==44.0.3", "requests-ntlm==1.3.0", ] diff --git a/kafka_consumer/changelog.d/20208.added b/kafka_consumer/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/kafka_consumer/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/kafka_consumer/pyproject.toml b/kafka_consumer/pyproject.toml index 9deb6648e5a87..3294bac3f09b3 100644 --- a/kafka_consumer/pyproject.toml +++ b/kafka_consumer/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "confluent-kafka==2.8.0", + "confluent-kafka==2.10.0", ] [project.urls] diff --git a/mysql/changelog.d/20208.added b/mysql/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/mysql/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index f55bdafc3f4a4..e1668fbfd49b6 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "cachetools==5.5.2", - "cryptography==44.0.2", + "cryptography==44.0.3", "pymysql==1.1.1", ] diff --git a/openstack_controller/changelog.d/20208.added b/openstack_controller/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/openstack_controller/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml index 67639e2596f51..d5d208cbc8a78 100644 --- a/openstack_controller/pyproject.toml +++ b/openstack_controller/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "openstacksdk==4.4.0", + "openstacksdk==4.5.0", ] [project.urls] diff --git a/postgres/changelog.d/20208.added b/postgres/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/postgres/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml index 8ded221081695..49b35d74dfaa0 100644 --- a/postgres/pyproject.toml +++ b/postgres/pyproject.toml @@ -38,7 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ "azure-identity==1.21.0", - "boto3==1.37.23", + "boto3==1.38.8", "cachetools==5.5.2", "psycopg2-binary==2.9.9", "semver==3.0.4", diff --git a/redisdb/changelog.d/20208.added b/redisdb/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/redisdb/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/redisdb/pyproject.toml b/redisdb/pyproject.toml index 922f21eff2a49..755bf897e527c 100644 --- a/redisdb/pyproject.toml +++ b/redisdb/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "redis==5.2.1", + "redis==6.0.0", ] [project.urls] diff --git a/riakcs/changelog.d/20208.added b/riakcs/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/riakcs/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/riakcs/pyproject.toml b/riakcs/pyproject.toml index dd0384bd49df5..86b5f9e09314d 100644 --- a/riakcs/pyproject.toml +++ b/riakcs/pyproject.toml @@ -36,7 +36,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "boto3==1.37.23", + "boto3==1.38.8", ] [project.urls] diff --git a/snowflake/changelog.d/20208.added b/snowflake/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/snowflake/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/snowflake/pyproject.toml b/snowflake/pyproject.toml index 3e6a10d6f838f..4de288bd3b2bb 100644 --- a/snowflake/pyproject.toml +++ b/snowflake/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "snowflake-connector-python==3.14.0", + "snowflake-connector-python==3.15.0", ] [project.urls] diff --git a/spark/changelog.d/20208.added b/spark/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/spark/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/spark/pyproject.toml b/spark/pyproject.toml index f783611e2fb0d..f76112a6287e9 100644 --- a/spark/pyproject.toml +++ b/spark/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "beautifulsoup4==4.13.3", + "beautifulsoup4==4.13.4", ] [project.urls] diff --git a/tls/changelog.d/20208.added b/tls/changelog.d/20208.added new file mode 100644 index 0000000000000..af47fee9d6a90 --- /dev/null +++ b/tls/changelog.d/20208.added @@ -0,0 +1 @@ +Update dependencies \ No newline at end of file diff --git a/tls/pyproject.toml b/tls/pyproject.toml index f0157098ec14a..a9d56847132c5 100644 --- a/tls/pyproject.toml +++ b/tls/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==44.0.2", + "cryptography==44.0.3", "service-identity[idna]==24.2.0", ] From 27338ef66d269aec474045be6a1e3efa840e0426 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 13:58:16 -0400 Subject: [PATCH 02/16] update fdb in ci --- foundationdb/hatch.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundationdb/hatch.toml b/foundationdb/hatch.toml index 1b77eb6d500f1..5ff168d865e22 100644 --- a/foundationdb/hatch.toml +++ b/foundationdb/hatch.toml @@ -2,7 +2,7 @@ [envs.default] dependencies = [ - "foundationdb==6.3.24", + "foundationdb==7.4.1", ] e2e-env = false From 0e9f2bb5c15c248b659e44bd6baaffd95660abd1 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 14:06:23 -0400 Subject: [PATCH 03/16] test fdb --- foundationdb/tests/common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/foundationdb/tests/common.py b/foundationdb/tests/common.py index dbdf3aa09f459..9a9295fc224f5 100644 --- a/foundationdb/tests/common.py +++ b/foundationdb/tests/common.py @@ -50,9 +50,9 @@ E2E_METADATA = { 'start_commands': [ - 'curl -o foundationdb-clients_6.3.23-1_amd64.deb ' - '-L https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb', - 'dpkg -i foundationdb-clients_6.3.23-1_amd64.deb', + 'curl -o foundationdb-clients_7.4.1-1_amd64.deb ' + '-L https://github.com/apple/foundationdb/releases/download/7.4.1/foundationdb-clients_7.4.1-1_amd64.deb', + 'dpkg -i foundationdb-clients_7.4.1-1_amd64.deb', ], 'docker_volumes': [ '{}:/fdb/fdb.cluster'.format(CLUSTER_FILE), From 50c7a0f334c6b8caf522f67b2db11144788d7de7 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 14:43:50 -0400 Subject: [PATCH 04/16] update docker image --- foundationdb/tests/docker/Dockerfile.fdb-tls | 2 +- foundationdb/tests/docker/docker-compose.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/foundationdb/tests/docker/Dockerfile.fdb-tls b/foundationdb/tests/docker/Dockerfile.fdb-tls index 0045dcafbfd68..bb90b91e91b6e 100644 --- a/foundationdb/tests/docker/Dockerfile.fdb-tls +++ b/foundationdb/tests/docker/Dockerfile.fdb-tls @@ -1,4 +1,4 @@ -FROM foundationdb/foundationdb:6.3.13 +FROM foundationdb/foundationdb:7.4.1 WORKDIR /var/fdb/tmp COPY fdb.bash /var/fdb/scripts/fdb-new.bash COPY tls/cert.crt /var/fdb/cert.crt diff --git a/foundationdb/tests/docker/docker-compose.yaml b/foundationdb/tests/docker/docker-compose.yaml index 3f2b1c6460ad7..90984587dd2b0 100644 --- a/foundationdb/tests/docker/docker-compose.yaml +++ b/foundationdb/tests/docker/docker-compose.yaml @@ -1,6 +1,6 @@ services: fdb-coordinator: - image: foundationdb/foundationdb:6.3.13 + image: foundationdb/foundationdb:7.4.1 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container @@ -11,7 +11,7 @@ services: container_name: fdb-0 depends_on: - fdb-coordinator - image: foundationdb/foundationdb:6.3.13 + image: foundationdb/foundationdb:7.4.1 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container @@ -20,7 +20,7 @@ services: container_name: fdb-1 depends_on: - fdb-coordinator - image: foundationdb/foundationdb:6.3.13 + image: foundationdb/foundationdb:7.4.1 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container From 1c8c6100debd63d4fe34146610cbc6b02fb5a17d Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 14:49:34 -0400 Subject: [PATCH 05/16] update kafka --- .builders/images/linux-aarch64/build_script.sh | 2 +- .builders/images/linux-x86_64/build_script.sh | 2 +- .builders/images/macos-x86_64/extra_build.sh | 2 +- .builders/images/windows-x86_64/build_script.ps1 | 2 +- kafka_consumer/hatch.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.builders/images/linux-aarch64/build_script.sh b/.builders/images/linux-aarch64/build_script.sh index 7b916c2dfaa38..2efc419bb23a2 100644 --- a/.builders/images/linux-aarch64/build_script.sh +++ b/.builders/images/linux-aarch64/build_script.sh @@ -21,7 +21,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \ DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \ VERSION="${kafka_version}" \ - SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \ + SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --enable-sasl --enable-curl always_build+=("confluent-kafka") diff --git a/.builders/images/linux-x86_64/build_script.sh b/.builders/images/linux-x86_64/build_script.sh index 45f1441c4f019..2189052381cd9 100644 --- a/.builders/images/linux-x86_64/build_script.sh +++ b/.builders/images/linux-x86_64/build_script.sh @@ -18,7 +18,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \ DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \ VERSION="${kafka_version}" \ - SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \ + SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --enable-sasl --enable-curl always_build+=("confluent-kafka") diff --git a/.builders/images/macos-x86_64/extra_build.sh b/.builders/images/macos-x86_64/extra_build.sh index 6a44e330bba5d..33bc8074206e7 100644 --- a/.builders/images/macos-x86_64/extra_build.sh +++ b/.builders/images/macos-x86_64/extra_build.sh @@ -13,7 +13,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then LDFLAGS="${LDFLAGS} -L${DD_PREFIX_PATH}/lib -lgssapi_krb5 -llmdb" \ DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \ VERSION="${kafka_version}" \ - SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \ + SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --prefix="${DD_PREFIX_PATH}" --enable-sasl --enable-curl diff --git a/.builders/images/windows-x86_64/build_script.ps1 b/.builders/images/windows-x86_64/build_script.ps1 index 9f0f0cb1c00ed..e043ff14922b0 100644 --- a/.builders/images/windows-x86_64/build_script.ps1 +++ b/.builders/images/windows-x86_64/build_script.ps1 @@ -12,7 +12,7 @@ Write-Host "Will build librdkafka $kafka_version" Get-RemoteFile ` -Uri "https://github.com/confluentinc/librdkafka/archive/refs/tags/v${kafka_version}.tar.gz" ` -Path "librdkafka-${kafka_version}.tar.gz" ` - -Hash '5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25' + -Hash '004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a' 7z x "librdkafka-${kafka_version}.tar.gz" -o"C:\" 7z x "C:\librdkafka-${kafka_version}.tar" -o"C:\librdkafka" Remove-Item "librdkafka-${kafka_version}.tar.gz" diff --git a/kafka_consumer/hatch.toml b/kafka_consumer/hatch.toml index 274d596b3fed6..da321d4cd8942 100644 --- a/kafka_consumer/hatch.toml +++ b/kafka_consumer/hatch.toml @@ -5,7 +5,7 @@ # Also bump the LIBRDKAFKA_VERSION version in this file post-install-commands = [ "python -m pip uninstall -y confluent-kafka", - "python -m pip install --no-binary confluent-kafka confluent-kafka==2.8.0", + "python -m pip install --no-binary confluent-kafka confluent-kafka==2.10.0", ] [envs.default.env-vars] From bb67deafdeceb08e206685ef75ac4bf6105849de Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 14:57:52 -0400 Subject: [PATCH 06/16] revert to patch version --- agent_requirements.in | 2 +- foundationdb/datadog_checks/foundationdb/check.py | 2 +- foundationdb/pyproject.toml | 2 +- foundationdb/tests/common.py | 6 +++--- foundationdb/tests/docker/Dockerfile.fdb-tls | 2 +- foundationdb/tests/docker/docker-compose.yaml | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agent_requirements.in b/agent_requirements.in index d7763ce08b76b..533d8409b6d62 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -13,7 +13,7 @@ confluent-kafka==2.10.0 cryptography==44.0.3 ddtrace==2.21.4 dnspython==2.7.0 -foundationdb==7.4.1 +foundationdb==6.3.25 hazelcast-python-client==5.5.0 in-toto==2.0.0 jellyfish==1.2.0 diff --git a/foundationdb/datadog_checks/foundationdb/check.py b/foundationdb/datadog_checks/foundationdb/check.py index 881f045166d57..5b13d7b9813b6 100644 --- a/foundationdb/datadog_checks/foundationdb/check.py +++ b/foundationdb/datadog_checks/foundationdb/check.py @@ -8,7 +8,7 @@ from datadog_checks.base import AgentCheck -fdb.api_version(600) +fdb.api_version(700) class FoundationdbCheck(AgentCheck): diff --git a/foundationdb/pyproject.toml b/foundationdb/pyproject.toml index 5af6b6c31da05..2434d26a1b567 100644 --- a/foundationdb/pyproject.toml +++ b/foundationdb/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "foundationdb==7.4.1", + "foundationdb==6.3.25", ] [project.urls] diff --git a/foundationdb/tests/common.py b/foundationdb/tests/common.py index 9a9295fc224f5..6443588e561e0 100644 --- a/foundationdb/tests/common.py +++ b/foundationdb/tests/common.py @@ -50,9 +50,9 @@ E2E_METADATA = { 'start_commands': [ - 'curl -o foundationdb-clients_7.4.1-1_amd64.deb ' - '-L https://github.com/apple/foundationdb/releases/download/7.4.1/foundationdb-clients_7.4.1-1_amd64.deb', - 'dpkg -i foundationdb-clients_7.4.1-1_amd64.deb', + 'curl -o foundationdb-clients_6.3.25-1_amd64.deb ' + '-L https://github.com/apple/foundationdb/releases/download/6.3.25/foundationdb-clients_6.3.25-1_amd64.deb', + 'dpkg -i foundationdb-clients_6.3.25-1_amd64.deb', ], 'docker_volumes': [ '{}:/fdb/fdb.cluster'.format(CLUSTER_FILE), diff --git a/foundationdb/tests/docker/Dockerfile.fdb-tls b/foundationdb/tests/docker/Dockerfile.fdb-tls index bb90b91e91b6e..da4766ec4400d 100644 --- a/foundationdb/tests/docker/Dockerfile.fdb-tls +++ b/foundationdb/tests/docker/Dockerfile.fdb-tls @@ -1,4 +1,4 @@ -FROM foundationdb/foundationdb:7.4.1 +FROM foundationdb/foundationdb:6.3.25 WORKDIR /var/fdb/tmp COPY fdb.bash /var/fdb/scripts/fdb-new.bash COPY tls/cert.crt /var/fdb/cert.crt diff --git a/foundationdb/tests/docker/docker-compose.yaml b/foundationdb/tests/docker/docker-compose.yaml index 90984587dd2b0..7c40959ae52a5 100644 --- a/foundationdb/tests/docker/docker-compose.yaml +++ b/foundationdb/tests/docker/docker-compose.yaml @@ -1,6 +1,6 @@ services: fdb-coordinator: - image: foundationdb/foundationdb:7.4.1 + image: foundationdb/foundationdb:6.3.25 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container @@ -11,7 +11,7 @@ services: container_name: fdb-0 depends_on: - fdb-coordinator - image: foundationdb/foundationdb:7.4.1 + image: foundationdb/foundationdb:6.3.25 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container @@ -20,7 +20,7 @@ services: container_name: fdb-1 depends_on: - fdb-coordinator - image: foundationdb/foundationdb:7.4.1 + image: foundationdb/foundationdb:6.3.25 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container From af1b7535717afa4d3f0e0a804630374b0af815e4 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 15:01:20 -0400 Subject: [PATCH 07/16] update install kerberos --- .ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh index a6565f0b6bca5..29838d0814c3d 100755 --- a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh +++ b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh @@ -8,7 +8,7 @@ sudo apt install -y --no-install-recommends build-essential libkrb5-dev wget sof # Install librdkafka from source since no binaries are available for the distribution we use on the CI: git clone https://github.com/confluentinc/librdkafka cd librdkafka -git checkout v2.8.0 +git checkout v2.10.0 sudo ./configure --install-deps --prefix=/usr make sudo make install From 79a82b0bc449c8bb04c02536143aacfd34085a7a Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 15:06:49 -0400 Subject: [PATCH 08/16] fix fdb --- foundationdb/datadog_checks/foundationdb/check.py | 2 +- foundationdb/hatch.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/foundationdb/datadog_checks/foundationdb/check.py b/foundationdb/datadog_checks/foundationdb/check.py index 5b13d7b9813b6..881f045166d57 100644 --- a/foundationdb/datadog_checks/foundationdb/check.py +++ b/foundationdb/datadog_checks/foundationdb/check.py @@ -8,7 +8,7 @@ from datadog_checks.base import AgentCheck -fdb.api_version(700) +fdb.api_version(600) class FoundationdbCheck(AgentCheck): diff --git a/foundationdb/hatch.toml b/foundationdb/hatch.toml index 5ff168d865e22..8e633fc71673c 100644 --- a/foundationdb/hatch.toml +++ b/foundationdb/hatch.toml @@ -2,7 +2,7 @@ [envs.default] dependencies = [ - "foundationdb==7.4.1", + "foundationdb==6.3.25", ] e2e-env = false From 41fc362518957bd1445c8082b8c4b0979462f1e7 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 15:21:43 -0400 Subject: [PATCH 09/16] update changelog numbers --- amazon_msk/changelog.d/{20208.added => 20215.added} | 0 cisco_aci/changelog.d/{20208.added => 20215.added} | 0 clickhouse/changelog.d/{20208.added => 20215.added} | 0 datadog_checks_base/changelog.d/{20208.added => 20215.added} | 0 .../changelog.d/{20208.added => 20215.added} | 0 foundationdb/changelog.d/{20208.added => 20215.added} | 0 http_check/changelog.d/{20208.added => 20215.added} | 0 kafka_consumer/changelog.d/{20208.added => 20215.added} | 0 mysql/changelog.d/{20208.added => 20215.added} | 0 openstack_controller/changelog.d/{20208.added => 20215.added} | 0 postgres/changelog.d/{20208.added => 20215.added} | 0 redisdb/changelog.d/{20208.added => 20215.added} | 0 riakcs/changelog.d/{20208.added => 20215.added} | 0 snowflake/changelog.d/{20208.added => 20215.added} | 0 spark/changelog.d/{20208.added => 20215.added} | 0 tls/changelog.d/{20208.added => 20215.added} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename amazon_msk/changelog.d/{20208.added => 20215.added} (100%) rename cisco_aci/changelog.d/{20208.added => 20215.added} (100%) rename clickhouse/changelog.d/{20208.added => 20215.added} (100%) rename datadog_checks_base/changelog.d/{20208.added => 20215.added} (100%) rename datadog_checks_downloader/changelog.d/{20208.added => 20215.added} (100%) rename foundationdb/changelog.d/{20208.added => 20215.added} (100%) rename http_check/changelog.d/{20208.added => 20215.added} (100%) rename kafka_consumer/changelog.d/{20208.added => 20215.added} (100%) rename mysql/changelog.d/{20208.added => 20215.added} (100%) rename openstack_controller/changelog.d/{20208.added => 20215.added} (100%) rename postgres/changelog.d/{20208.added => 20215.added} (100%) rename redisdb/changelog.d/{20208.added => 20215.added} (100%) rename riakcs/changelog.d/{20208.added => 20215.added} (100%) rename snowflake/changelog.d/{20208.added => 20215.added} (100%) rename spark/changelog.d/{20208.added => 20215.added} (100%) rename tls/changelog.d/{20208.added => 20215.added} (100%) diff --git a/amazon_msk/changelog.d/20208.added b/amazon_msk/changelog.d/20215.added similarity index 100% rename from amazon_msk/changelog.d/20208.added rename to amazon_msk/changelog.d/20215.added diff --git a/cisco_aci/changelog.d/20208.added b/cisco_aci/changelog.d/20215.added similarity index 100% rename from cisco_aci/changelog.d/20208.added rename to cisco_aci/changelog.d/20215.added diff --git a/clickhouse/changelog.d/20208.added b/clickhouse/changelog.d/20215.added similarity index 100% rename from clickhouse/changelog.d/20208.added rename to clickhouse/changelog.d/20215.added diff --git a/datadog_checks_base/changelog.d/20208.added b/datadog_checks_base/changelog.d/20215.added similarity index 100% rename from datadog_checks_base/changelog.d/20208.added rename to datadog_checks_base/changelog.d/20215.added diff --git a/datadog_checks_downloader/changelog.d/20208.added b/datadog_checks_downloader/changelog.d/20215.added similarity index 100% rename from datadog_checks_downloader/changelog.d/20208.added rename to datadog_checks_downloader/changelog.d/20215.added diff --git a/foundationdb/changelog.d/20208.added b/foundationdb/changelog.d/20215.added similarity index 100% rename from foundationdb/changelog.d/20208.added rename to foundationdb/changelog.d/20215.added diff --git a/http_check/changelog.d/20208.added b/http_check/changelog.d/20215.added similarity index 100% rename from http_check/changelog.d/20208.added rename to http_check/changelog.d/20215.added diff --git a/kafka_consumer/changelog.d/20208.added b/kafka_consumer/changelog.d/20215.added similarity index 100% rename from kafka_consumer/changelog.d/20208.added rename to kafka_consumer/changelog.d/20215.added diff --git a/mysql/changelog.d/20208.added b/mysql/changelog.d/20215.added similarity index 100% rename from mysql/changelog.d/20208.added rename to mysql/changelog.d/20215.added diff --git a/openstack_controller/changelog.d/20208.added b/openstack_controller/changelog.d/20215.added similarity index 100% rename from openstack_controller/changelog.d/20208.added rename to openstack_controller/changelog.d/20215.added diff --git a/postgres/changelog.d/20208.added b/postgres/changelog.d/20215.added similarity index 100% rename from postgres/changelog.d/20208.added rename to postgres/changelog.d/20215.added diff --git a/redisdb/changelog.d/20208.added b/redisdb/changelog.d/20215.added similarity index 100% rename from redisdb/changelog.d/20208.added rename to redisdb/changelog.d/20215.added diff --git a/riakcs/changelog.d/20208.added b/riakcs/changelog.d/20215.added similarity index 100% rename from riakcs/changelog.d/20208.added rename to riakcs/changelog.d/20215.added diff --git a/snowflake/changelog.d/20208.added b/snowflake/changelog.d/20215.added similarity index 100% rename from snowflake/changelog.d/20208.added rename to snowflake/changelog.d/20215.added diff --git a/spark/changelog.d/20208.added b/spark/changelog.d/20215.added similarity index 100% rename from spark/changelog.d/20208.added rename to spark/changelog.d/20215.added diff --git a/tls/changelog.d/20208.added b/tls/changelog.d/20215.added similarity index 100% rename from tls/changelog.d/20208.added rename to tls/changelog.d/20215.added From a6d451e33a29d898c01624c3d3b60ef0a2a34cc4 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 15:31:27 -0400 Subject: [PATCH 10/16] revert docker image update --- foundationdb/tests/docker/Dockerfile.fdb-tls | 2 +- foundationdb/tests/docker/docker-compose.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/foundationdb/tests/docker/Dockerfile.fdb-tls b/foundationdb/tests/docker/Dockerfile.fdb-tls index da4766ec4400d..0045dcafbfd68 100644 --- a/foundationdb/tests/docker/Dockerfile.fdb-tls +++ b/foundationdb/tests/docker/Dockerfile.fdb-tls @@ -1,4 +1,4 @@ -FROM foundationdb/foundationdb:6.3.25 +FROM foundationdb/foundationdb:6.3.13 WORKDIR /var/fdb/tmp COPY fdb.bash /var/fdb/scripts/fdb-new.bash COPY tls/cert.crt /var/fdb/cert.crt diff --git a/foundationdb/tests/docker/docker-compose.yaml b/foundationdb/tests/docker/docker-compose.yaml index 7c40959ae52a5..3f2b1c6460ad7 100644 --- a/foundationdb/tests/docker/docker-compose.yaml +++ b/foundationdb/tests/docker/docker-compose.yaml @@ -1,6 +1,6 @@ services: fdb-coordinator: - image: foundationdb/foundationdb:6.3.25 + image: foundationdb/foundationdb:6.3.13 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container @@ -11,7 +11,7 @@ services: container_name: fdb-0 depends_on: - fdb-coordinator - image: foundationdb/foundationdb:6.3.25 + image: foundationdb/foundationdb:6.3.13 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container @@ -20,7 +20,7 @@ services: container_name: fdb-1 depends_on: - fdb-coordinator - image: foundationdb/foundationdb:6.3.25 + image: foundationdb/foundationdb:6.3.13 environment: FDB_COORDINATOR: fdb-coordinator FDB_NETWORKING_MODE: container From 5f4ac23f33b7d4bea218dc351126b110169e71df Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 15:39:28 -0400 Subject: [PATCH 11/16] bump mysql --- mysql/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index 28e743d956928..e288e02a987bc 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "boto3==1.37.23", + "boto3==1.38.8", "cachetools==5.5.2", "cryptography==44.0.3", "pymysql==1.1.1", From 36938ad55f0e1586b65ba1cb68e0d1eda18eab10 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 9 May 2025 15:43:37 -0400 Subject: [PATCH 12/16] validate license --- LICENSE-3rdparty.csv | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 314e2676685d3..cf442016b2b4c 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -24,7 +24,7 @@ ddtrace,PyPI,BSD-3-Clause,"Copyright 2016 Datadog, Inc." dnspython,PyPI,ISC,Copyright (C) Dnspython Contributors flup,Vendor,BSD-3-Clause,Copyright (c) 2005 Allan Saddi. All Rights Reserved. flup-py3,Vendor,BSD-3-Clause,"Copyright (c) 2005, 2006 Allan Saddi All rights reserved." -foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB Team +foundationdb,PyPI,Apache-2.0,Copyright FoundationDB hazelcast-python-client,PyPI,Apache-2.0,"Copyright (c) 2008-2023, Hazelcast, Inc. All Rights Reserved." in-toto,PyPI,Apache-2.0,Copyright 2018 New York University jellyfish,PyPI,MIT,Copyright (c) 2015 James Turk @@ -41,21 +41,21 @@ orjson,PyPI,Apache-2.0,Copyright ijl orjson,PyPI,MIT,Copyright (c) ijl packaging,PyPI,Apache-2.0,Copyright (c) Donald Stufft and individual contributors. packaging,PyPI,BSD-3-Clause,Copyright (c) Donald Stufft and individual contributors. -paramiko,PyPI,LGPL-2.1-only,Copyright (C) 2009 Jeff Forcier +paramiko,PyPI,LGPL-2.1-only,Copyright (C) Jeff Forcier ply,PyPI,BSD-3-Clause,Copyright (C) 2001-2018 prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. All rights reserved. psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola" -psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio -psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio +psycopg2-binary,PyPI,BSD-3-Clause,Copyright Federico Di Gregorio +psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) Federico Di Gregorio pyOpenSSL,PyPI,Apache-2.0,Copyright The pyOpenSSL developers pyasn1,PyPI,BSD-3-Clause,"Copyright (c) 2005-2019, Ilya Etingof " -pycryptodomex,PyPI,BSD-2-Clause,Copyright 2014 Helder Eijs +pycryptodomex,PyPI,BSD-2-Clause,Copyright Helder Eijs pycryptodomex,PyPI,Unlicense,Helder Eijs. pycryptodomex is dedicated to the public domain under Unlicense. pydantic,PyPI,MIT,Copyright (c) 2017 to present Pydantic Services Inc. and individual contributors. pymongo,PyPI,Apache-2.0,Copyright The MongoDB Python Team pymqi,PyPI,PSF,Copyright (c) Zato Source s.r.o. -pyodbc,PyPI,MIT-0,Copyright 2008 Michael Kleehammer +pyodbc,PyPI,MIT-0,Copyright Michael Kleehammer pysmi,PyPI,BSD-2-Clause,Copyright (c) 2015-2020 Ilya Etingof pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2020 Ilya Etingof pysnmp,PyPI,BSD-2-Clause,"Copyright (c) 2005-2019, Ilya Etingof " @@ -75,7 +75,7 @@ requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz. requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz. requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield" requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2025 thelab -rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB. +rethinkdb,PyPI,Apache-2.0,Copyright RethinkDB. securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres semver,PyPI,BSD-3-Clause,"Copyright (c) 2013, Konstantine Rybnikov" service-identity,PyPI,MIT,Copyright (c) 2014 Hynek Schlawack and the service-identity contributors @@ -85,5 +85,5 @@ supervisor,PyPI,BSD-3-Clause-Modification,"Copyright (c) 2002-2005, Daniel Krech tuf,PyPI,Apache-2.0,Copyright (c) 2010 New York University tuf,PyPI,MIT,Copyright (c) 2010 New York University urllib3,PyPI,MIT,Copyright (c) 2008-2020 Andrey Petrov and contributors. -vertica-python,PyPI,Apache-2.0,"Copyright 2013 Justin Berka, Alex Kim, Siting Ren" +vertica-python,PyPI,Apache-2.0,"Copyright Justin Berka, Alex Kim, Siting Ren" wrapt,PyPI,BSD-3-Clause,"Copyright (c) 2013-2023, Graham Dumpleton" From b6f229a4b1644dedf2f27f5da4ded58f1f602b00 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Mon, 12 May 2025 14:32:55 -0400 Subject: [PATCH 13/16] revert kafka changes --- .builders/images/linux-aarch64/build_script.sh | 2 +- .builders/images/linux-x86_64/build_script.sh | 2 +- .builders/images/macos-x86_64/extra_build.sh | 2 +- .builders/images/windows-x86_64/build_script.ps1 | 2 +- .ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh | 2 +- agent_requirements.in | 2 +- kafka_consumer/changelog.d/20215.added | 1 - kafka_consumer/pyproject.toml | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 kafka_consumer/changelog.d/20215.added diff --git a/.builders/images/linux-aarch64/build_script.sh b/.builders/images/linux-aarch64/build_script.sh index 2efc419bb23a2..7b916c2dfaa38 100644 --- a/.builders/images/linux-aarch64/build_script.sh +++ b/.builders/images/linux-aarch64/build_script.sh @@ -21,7 +21,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \ DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \ VERSION="${kafka_version}" \ - SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \ + SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --enable-sasl --enable-curl always_build+=("confluent-kafka") diff --git a/.builders/images/linux-x86_64/build_script.sh b/.builders/images/linux-x86_64/build_script.sh index 2189052381cd9..45f1441c4f019 100644 --- a/.builders/images/linux-x86_64/build_script.sh +++ b/.builders/images/linux-x86_64/build_script.sh @@ -18,7 +18,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \ DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \ VERSION="${kafka_version}" \ - SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \ + SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --enable-sasl --enable-curl always_build+=("confluent-kafka") diff --git a/.builders/images/macos-x86_64/extra_build.sh b/.builders/images/macos-x86_64/extra_build.sh index 33bc8074206e7..6a44e330bba5d 100644 --- a/.builders/images/macos-x86_64/extra_build.sh +++ b/.builders/images/macos-x86_64/extra_build.sh @@ -13,7 +13,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then LDFLAGS="${LDFLAGS} -L${DD_PREFIX_PATH}/lib -lgssapi_krb5 -llmdb" \ DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \ VERSION="${kafka_version}" \ - SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \ + SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --prefix="${DD_PREFIX_PATH}" --enable-sasl --enable-curl diff --git a/.builders/images/windows-x86_64/build_script.ps1 b/.builders/images/windows-x86_64/build_script.ps1 index e043ff14922b0..9f0f0cb1c00ed 100644 --- a/.builders/images/windows-x86_64/build_script.ps1 +++ b/.builders/images/windows-x86_64/build_script.ps1 @@ -12,7 +12,7 @@ Write-Host "Will build librdkafka $kafka_version" Get-RemoteFile ` -Uri "https://github.com/confluentinc/librdkafka/archive/refs/tags/v${kafka_version}.tar.gz" ` -Path "librdkafka-${kafka_version}.tar.gz" ` - -Hash '004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a' + -Hash '5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25' 7z x "librdkafka-${kafka_version}.tar.gz" -o"C:\" 7z x "C:\librdkafka-${kafka_version}.tar" -o"C:\librdkafka" Remove-Item "librdkafka-${kafka_version}.tar.gz" diff --git a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh index 29838d0814c3d..a6565f0b6bca5 100755 --- a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh +++ b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh @@ -8,7 +8,7 @@ sudo apt install -y --no-install-recommends build-essential libkrb5-dev wget sof # Install librdkafka from source since no binaries are available for the distribution we use on the CI: git clone https://github.com/confluentinc/librdkafka cd librdkafka -git checkout v2.10.0 +git checkout v2.8.0 sudo ./configure --install-deps --prefix=/usr make sudo make install diff --git a/agent_requirements.in b/agent_requirements.in index 533d8409b6d62..25d4b826b0f61 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -9,7 +9,7 @@ cachetools==5.5.2 clickhouse-cityhash==1.0.2.4 clickhouse-driver==0.2.9 cm-client==45.0.4 -confluent-kafka==2.10.0 +confluent-kafka==2.8.0 cryptography==44.0.3 ddtrace==2.21.4 dnspython==2.7.0 diff --git a/kafka_consumer/changelog.d/20215.added b/kafka_consumer/changelog.d/20215.added deleted file mode 100644 index af47fee9d6a90..0000000000000 --- a/kafka_consumer/changelog.d/20215.added +++ /dev/null @@ -1 +0,0 @@ -Update dependencies \ No newline at end of file diff --git a/kafka_consumer/pyproject.toml b/kafka_consumer/pyproject.toml index 3294bac3f09b3..9deb6648e5a87 100644 --- a/kafka_consumer/pyproject.toml +++ b/kafka_consumer/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "confluent-kafka==2.10.0", + "confluent-kafka==2.8.0", ] [project.urls] From cc9eee5cfa518af76f1e14726b66321d6b336b85 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Mon, 12 May 2025 14:41:19 -0400 Subject: [PATCH 14/16] fix kafka and move urllib3 comment --- datadog_checks_base/pyproject.toml | 2 ++ kafka_consumer/hatch.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 2bffdf73f5ca6..2eb1cb8e69c86 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -33,6 +33,8 @@ license = "BSD-3-Clause" db = [ "mmh3==5.1.0", ] +# urllib3 is a dependency of requests that we explicitly +# make use of in a few places deps = [ "binary==1.0.1", "cachetools==5.5.2", diff --git a/kafka_consumer/hatch.toml b/kafka_consumer/hatch.toml index da321d4cd8942..274d596b3fed6 100644 --- a/kafka_consumer/hatch.toml +++ b/kafka_consumer/hatch.toml @@ -5,7 +5,7 @@ # Also bump the LIBRDKAFKA_VERSION version in this file post-install-commands = [ "python -m pip uninstall -y confluent-kafka", - "python -m pip install --no-binary confluent-kafka confluent-kafka==2.10.0", + "python -m pip install --no-binary confluent-kafka confluent-kafka==2.8.0", ] [envs.default.env-vars] From 53938f6a68c62667e8d776ce749d65ac324280bc Mon Sep 17 00:00:00 2001 From: steveny91 Date: Mon, 12 May 2025 15:14:14 -0400 Subject: [PATCH 15/16] test --sync --- LICENSE-3rdparty.csv | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index cf442016b2b4c..3719dcbcae4d1 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -24,7 +24,7 @@ ddtrace,PyPI,BSD-3-Clause,"Copyright 2016 Datadog, Inc." dnspython,PyPI,ISC,Copyright (C) Dnspython Contributors flup,Vendor,BSD-3-Clause,Copyright (c) 2005 Allan Saddi. All Rights Reserved. flup-py3,Vendor,BSD-3-Clause,"Copyright (c) 2005, 2006 Allan Saddi All rights reserved." -foundationdb,PyPI,Apache-2.0,Copyright FoundationDB +foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB hazelcast-python-client,PyPI,Apache-2.0,"Copyright (c) 2008-2023, Hazelcast, Inc. All Rights Reserved." in-toto,PyPI,Apache-2.0,Copyright 2018 New York University jellyfish,PyPI,MIT,Copyright (c) 2015 James Turk @@ -41,21 +41,21 @@ orjson,PyPI,Apache-2.0,Copyright ijl orjson,PyPI,MIT,Copyright (c) ijl packaging,PyPI,Apache-2.0,Copyright (c) Donald Stufft and individual contributors. packaging,PyPI,BSD-3-Clause,Copyright (c) Donald Stufft and individual contributors. -paramiko,PyPI,LGPL-2.1-only,Copyright (C) Jeff Forcier +paramiko,PyPI,LGPL-2.1-only,Copyright (C) 2009 Jeff Forcier ply,PyPI,BSD-3-Clause,Copyright (C) 2001-2018 prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. All rights reserved. psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola" -psycopg2-binary,PyPI,BSD-3-Clause,Copyright Federico Di Gregorio -psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) Federico Di Gregorio +psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio +psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio pyOpenSSL,PyPI,Apache-2.0,Copyright The pyOpenSSL developers pyasn1,PyPI,BSD-3-Clause,"Copyright (c) 2005-2019, Ilya Etingof " -pycryptodomex,PyPI,BSD-2-Clause,Copyright Helder Eijs +pycryptodomex,PyPI,BSD-2-Clause,Copyright 2014 Helder Eijs pycryptodomex,PyPI,Unlicense,Helder Eijs. pycryptodomex is dedicated to the public domain under Unlicense. pydantic,PyPI,MIT,Copyright (c) 2017 to present Pydantic Services Inc. and individual contributors. pymongo,PyPI,Apache-2.0,Copyright The MongoDB Python Team pymqi,PyPI,PSF,Copyright (c) Zato Source s.r.o. -pyodbc,PyPI,MIT-0,Copyright Michael Kleehammer +pyodbc,PyPI,MIT-0,Copyright 2008 Michael Kleehammer pysmi,PyPI,BSD-2-Clause,Copyright (c) 2015-2020 Ilya Etingof pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2020 Ilya Etingof pysnmp,PyPI,BSD-2-Clause,"Copyright (c) 2005-2019, Ilya Etingof " @@ -75,7 +75,7 @@ requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz. requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz. requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield" requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2025 thelab -rethinkdb,PyPI,Apache-2.0,Copyright RethinkDB. +rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB. securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres semver,PyPI,BSD-3-Clause,"Copyright (c) 2013, Konstantine Rybnikov" service-identity,PyPI,MIT,Copyright (c) 2014 Hynek Schlawack and the service-identity contributors @@ -85,5 +85,5 @@ supervisor,PyPI,BSD-3-Clause-Modification,"Copyright (c) 2002-2005, Daniel Krech tuf,PyPI,Apache-2.0,Copyright (c) 2010 New York University tuf,PyPI,MIT,Copyright (c) 2010 New York University urllib3,PyPI,MIT,Copyright (c) 2008-2020 Andrey Petrov and contributors. -vertica-python,PyPI,Apache-2.0,"Copyright Justin Berka, Alex Kim, Siting Ren" +vertica-python,PyPI,Apache-2.0,"Copyright 2013 Justin Berka, Alex Kim, Siting Ren" wrapt,PyPI,BSD-3-Clause,"Copyright (c) 2013-2023, Graham Dumpleton" From 8a32968e3e97d0c54c5b6d0862809331faa33efa Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Mon, 12 May 2025 16:33:56 -0400 Subject: [PATCH 16/16] revert redis upgrade --- agent_requirements.in | 2 +- redisdb/changelog.d/20215.added | 1 - redisdb/pyproject.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 redisdb/changelog.d/20215.added diff --git a/agent_requirements.in b/agent_requirements.in index 25d4b826b0f61..9246f6d5511d2 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -52,7 +52,7 @@ python3-gearman==0.1.0; sys_platform != 'win32' pyvmomi==8.0.3.0.1 pywin32==310; sys_platform == 'win32' pyyaml==6.0.2 -redis==6.0.0 +redis==5.2.1 requests-kerberos==0.15.0 requests-ntlm==1.3.0 requests-oauthlib==2.0.0 diff --git a/redisdb/changelog.d/20215.added b/redisdb/changelog.d/20215.added deleted file mode 100644 index af47fee9d6a90..0000000000000 --- a/redisdb/changelog.d/20215.added +++ /dev/null @@ -1 +0,0 @@ -Update dependencies \ No newline at end of file diff --git a/redisdb/pyproject.toml b/redisdb/pyproject.toml index 755bf897e527c..922f21eff2a49 100644 --- a/redisdb/pyproject.toml +++ b/redisdb/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "redis==6.0.0", + "redis==5.2.1", ] [project.urls]