Skip to content

Commit b6f229a

Browse files
committed
revert kafka changes
1 parent 36938ad commit b6f229a

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
2121
LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \
2222
DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
2323
VERSION="${kafka_version}" \
24-
SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \
24+
SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \
2525
RELATIVE_PATH="librdkafka-{{version}}" \
2626
bash install-from-source.sh --enable-sasl --enable-curl
2727
always_build+=("confluent-kafka")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
1818
LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \
1919
DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
2020
VERSION="${kafka_version}" \
21-
SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \
21+
SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \
2222
RELATIVE_PATH="librdkafka-{{version}}" \
2323
bash install-from-source.sh --enable-sasl --enable-curl
2424
always_build+=("confluent-kafka")

.builders/images/macos-x86_64/extra_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
1313
LDFLAGS="${LDFLAGS} -L${DD_PREFIX_PATH}/lib -lgssapi_krb5 -llmdb" \
1414
DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
1515
VERSION="${kafka_version}" \
16-
SHA256="004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a" \
16+
SHA256="5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25" \
1717
RELATIVE_PATH="librdkafka-{{version}}" \
1818
bash install-from-source.sh --prefix="${DD_PREFIX_PATH}" --enable-sasl --enable-curl
1919

.builders/images/windows-x86_64/build_script.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Write-Host "Will build librdkafka $kafka_version"
1212
Get-RemoteFile `
1313
-Uri "https://github.com/confluentinc/librdkafka/archive/refs/tags/v${kafka_version}.tar.gz" `
1414
-Path "librdkafka-${kafka_version}.tar.gz" `
15-
-Hash '004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a'
15+
-Hash '5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25'
1616
7z x "librdkafka-${kafka_version}.tar.gz" -o"C:\"
1717
7z x "C:\librdkafka-${kafka_version}.tar" -o"C:\librdkafka"
1818
Remove-Item "librdkafka-${kafka_version}.tar.gz"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sudo apt install -y --no-install-recommends build-essential libkrb5-dev wget sof
88
# Install librdkafka from source since no binaries are available for the distribution we use on the CI:
99
git clone https://github.com/confluentinc/librdkafka
1010
cd librdkafka
11-
git checkout v2.10.0
11+
git checkout v2.8.0
1212
sudo ./configure --install-deps --prefix=/usr
1313
make
1414
sudo make install

agent_requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cachetools==5.5.2
99
clickhouse-cityhash==1.0.2.4
1010
clickhouse-driver==0.2.9
1111
cm-client==45.0.4
12-
confluent-kafka==2.10.0
12+
confluent-kafka==2.8.0
1313
cryptography==44.0.3
1414
ddtrace==2.21.4
1515
dnspython==2.7.0

kafka_consumer/changelog.d/20215.added

Lines changed: 0 additions & 1 deletion
This file was deleted.

kafka_consumer/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
3636

3737
[project.optional-dependencies]
3838
deps = [
39-
"confluent-kafka==2.10.0",
39+
"confluent-kafka==2.8.0",
4040
]
4141

4242
[project.urls]

0 commit comments

Comments
 (0)