Upgrade confluent-kafka (DataDog#22829)

* Upgrade confluent-kafka

* Add changelog

* Remove patch

* Remove patch code

* add back a patch application loop to .builders/images/install-from-source.sh

Author: Kyle-Neale

.builders/images/linux-aarch64/build_script.sh

@@ -21,9 +21,8 @@ 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="3bd351601d8ebcbc99b9a1316cae1b83b00edbcf9411c34287edf1791c507600" \
+        SHA256="14972092e4115f6e99f798a7cb420cbf6daa0c73502b3c52ae42fb5b418eea8f" \
         RELATIVE_PATH="librdkafka-{{version}}" \
-        PATCHES="0001-Avoid-includes-intended-to-bring-getentropy-in-when-.patch" \
         bash install-from-source.sh --enable-sasl --enable-curl
     always_build+=("confluent-kafka")
 

.builders/images/linux-x86_64/build_script.sh

@@ -18,9 +18,8 @@ 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="3bd351601d8ebcbc99b9a1316cae1b83b00edbcf9411c34287edf1791c507600" \
+        SHA256="14972092e4115f6e99f798a7cb420cbf6daa0c73502b3c52ae42fb5b418eea8f" \
         RELATIVE_PATH="librdkafka-{{version}}" \
-        PATCHES="0001-Avoid-includes-intended-to-bring-getentropy-in-when-.patch" \
         bash install-from-source.sh --enable-sasl --enable-curl
     always_build+=("confluent-kafka")
 

.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="3bd351601d8ebcbc99b9a1316cae1b83b00edbcf9411c34287edf1791c507600" \
+      SHA256="14972092e4115f6e99f798a7cb420cbf6daa0c73502b3c52ae42fb5b418eea8f" \
       RELATIVE_PATH="librdkafka-{{version}}" \
       bash install-from-source.sh --prefix="${DD_PREFIX_PATH}" --enable-sasl --enable-curl
 

.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 '3bd351601d8ebcbc99b9a1316cae1b83b00edbcf9411c34287edf1791c507600'
+  -Hash '14972092e4115f6e99f798a7cb420cbf6daa0c73502b3c52ae42fb5b418eea8f'
 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"

.builders/patches/0001-Avoid-includes-intended-to-bring-getentropy-in-when-.patch

@@ -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.13.0
+git checkout v2.13.2
 sudo ./configure --install-deps --prefix=/usr
 make
 sudo make install

.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh

@@ -9,7 +9,7 @@ botocore==1.42.63
 cachetools==7.0.4
 clickhouse-connect==0.13.0
 cm-client==45.0.4
-confluent-kafka==2.13.0
+confluent-kafka==2.13.2
 cryptography==46.0.5
 ddtrace==4.5.1
 dnspython==2.8.0

agent_requirements.in

@@ -0,0 +1 @@
+Bump `confluent-kafka` to 2.13.2

kafka_actions/changelog.d/22829.added

@@ -37,7 +37,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "confluent-kafka==2.13.0",
+    "confluent-kafka==2.13.2",
     "fastavro==1.12.1",
     "protobuf==7.34.0",
     "pymongo[srv]==4.8.0; python_version >= '3.9'",

kafka_actions/pyproject.toml

@@ -0,0 +1 @@
+Bump `confluent-kafka` to 2.13.2