Skip to content

Sarah/test kafka upgrade #20263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .builders/images/linux-aarch64/build_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion .builders/images/linux-x86_64/build_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion .builders/images/macos-x86_64/extra_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .builders/images/windows-x86_64/build_script.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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 <allan@saddi.com> All rights reserved."
foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB
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
Expand All @@ -41,21 +41,21 @@ orjson,PyPI,Apache-2.0,Copyright ijl <ijl@mailbox.org>
orjson,PyPI,MIT,Copyright (c) ijl <ijl@mailbox.org>
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 <etingof@gmail.com>"
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 <etingof@gmail.com>
pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2020 Ilya Etingof <etingof@gmail.com>
pysnmp,PyPI,BSD-2-Clause,"Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>"
Expand All @@ -74,8 +74,8 @@ 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
rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB.
requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2025 thelab
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
Expand All @@ -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"
32 changes: 16 additions & 16 deletions agent_requirements.in
Original file line number Diff line number Diff line change
@@ -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==6.3.25
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
Expand All @@ -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'
Expand All @@ -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
1 change: 1 addition & 0 deletions amazon_msk/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion amazon_msk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"boto3==1.37.23",
"boto3==1.38.8",
]

[project.urls]
Expand Down
1 change: 1 addition & 0 deletions cisco_aci/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion cisco_aci/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"cryptography==44.0.2",
"cryptography==44.0.3",
]

[project.urls]
Expand Down
1 change: 1 addition & 0 deletions clickhouse/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion clickhouse/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions datadog_checks_base/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
16 changes: 7 additions & 9 deletions datadog_checks_base/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -67,7 +65,7 @@ http = [
"requests-oauthlib==2.0.0",
]
json = [
"orjson==3.10.16",
"orjson==3.10.18",
]
kube = [
"kubernetes==32.0.1",
Expand Down
1 change: 1 addition & 0 deletions datadog_checks_downloader/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion datadog_checks_downloader/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
1 change: 1 addition & 0 deletions foundationdb/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion foundationdb/hatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[envs.default]
dependencies = [
"foundationdb==6.3.24",
"foundationdb==6.3.25",
]
e2e-env = false

Expand Down
2 changes: 1 addition & 1 deletion foundationdb/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"foundationdb==6.3.24",
"foundationdb==6.3.25",
]

[project.urls]
Expand Down
6 changes: 3 additions & 3 deletions foundationdb/tests/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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_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),
Expand Down
1 change: 1 addition & 0 deletions http_check/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion http_check/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
1 change: 1 addition & 0 deletions kafka_consumer/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
6 changes: 3 additions & 3 deletions kafka_consumer/hatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -14,7 +14,7 @@ AUTHENTICATION = "noauth"

[[envs.default.matrix]]
python = ["3.12"]
version = ["2.6", "3.3"]
version = ["2.10", "3.3"]

[[envs.default.matrix]]
python = ["3.12"]
Expand All @@ -23,7 +23,7 @@ auth = ["ssl", "kerberos"]

[envs.default.overrides]
matrix.version.env-vars = [
{ key = "KAFKA_VERSION", value = "2.6.0", if = ["2.6"] },
{ key = "KAFKA_VERSION", value = "2.10.0", if = ["2.10"] },
{ key = "KAFKA_VERSION", value = "3.3.2-debian-11-r175", if = ["3.3"] },
]
matrix.auth.env-vars = "AUTHENTICATION"
Expand Down
2 changes: 1 addition & 1 deletion kafka_consumer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"confluent-kafka==2.8.0",
"confluent-kafka==2.10.0",
]

[project.urls]
Expand Down
1 change: 1 addition & 0 deletions mysql/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
4 changes: 2 additions & 2 deletions mysql/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"boto3==1.37.23",
"boto3==1.38.8",
"cachetools==5.5.2",
"cryptography==44.0.2",
"cryptography==44.0.3",
"pymysql==1.1.1",
]

Expand Down
1 change: 1 addition & 0 deletions openstack_controller/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion openstack_controller/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"openstacksdk==4.4.0",
"openstacksdk==4.5.0",
]

[project.urls]
Expand Down
1 change: 1 addition & 0 deletions postgres/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion postgres/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions redisdb/changelog.d/20215.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
Loading
Loading