diff --git a/.builders/images/linux-aarch64/build_script.sh b/.builders/images/linux-aarch64/build_script.sh index 7b916c2dfaa38..0e6b3bb805af0 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="a2c87186b081e2705bb7d5338d5a01bc88d43273619b372ccb7bb0d264d0ca9f" \ 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..79172312b7256 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="a2c87186b081e2705bb7d5338d5a01bc88d43273619b372ccb7bb0d264d0ca9f" \ RELATIVE_PATH="librdkafka-{{version}}" \ bash install-from-source.sh --enable-sasl --enable-curl always_build+=("confluent-kafka") diff --git a/.builders/images/macos/extra_build.sh b/.builders/images/macos/extra_build.sh index 6a44e330bba5d..09125fb78c429 100644 --- a/.builders/images/macos/extra_build.sh +++ b/.builders/images/macos/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="a2c87186b081e2705bb7d5338d5a01bc88d43273619b372ccb7bb0d264d0ca9f" \ 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 639d97dd223dd..6ed86086592dd 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 'a2c87186b081e2705bb7d5338d5a01bc88d43273619b372ccb7bb0d264d0ca9f' 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 a6565f0b6bca5..dd836ee59cb84 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.11.1 sudo ./configure --install-deps --prefix=/usr make sudo make install diff --git a/agent_requirements.in b/agent_requirements.in index 6f9f0b3e0c781..d51e09e4a428e 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -9,7 +9,7 @@ cachetools==6.2.0 clickhouse-cityhash==1.0.2.4 clickhouse-driver==0.2.9 cm-client==45.0.4 -confluent-kafka==2.8.0 +confluent-kafka==2.11.1 cryptography==45.0.6 ddtrace==3.12.3 dnspython==2.7.0 diff --git a/kafka_consumer/changelog.d/21259.added b/kafka_consumer/changelog.d/21259.added new file mode 100644 index 0000000000000..8db63da3ea10e --- /dev/null +++ b/kafka_consumer/changelog.d/21259.added @@ -0,0 +1 @@ +Bump `confluent-kafka` to 2.11.1 \ No newline at end of file diff --git a/kafka_consumer/hatch.toml b/kafka_consumer/hatch.toml index d23f68513405d..52fa092c58928 100644 --- a/kafka_consumer/hatch.toml +++ b/kafka_consumer/hatch.toml @@ -4,7 +4,7 @@ # If you bump the `confluent-kafka` version, also bump the `librdkafka` version in the `32_install_kerberos.sh` 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.11.1", ] [[envs.default.matrix]] diff --git a/kafka_consumer/pyproject.toml b/kafka_consumer/pyproject.toml index bd95fdab63fe3..3c1d8d7988382 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.11.1", "fastavro==1.12.0", "protobuf==6.32.0", ]