From 899b83bcc4abc0da4c38ac25de9aabbf0ca69b52 Mon Sep 17 00:00:00 2001
From: David Herberth <david.herberth@sentry.io>
Date: Thu, 8 Jan 2026 13:27:05 +0100
Subject: [PATCH 1/2] build(deps): Update rdkafka to 0.38 with librdkafka 2.10

---
 CHANGELOG.md |  4 ++++
 Cargo.lock   | 16 ++++++++--------
 Cargo.toml   |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a6ff1fddbb..55a277b51d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Return status code `413` if a request is rejected due to size limits. ([#5474](https://github.com/getsentry/relay/pull/5474))
 
+**Features**:
+
+- Updates `rdkafka` to 2.10 which fixes some protocol incompatibilities with Kafka 4. ([#5523](https://github.com/getsentry/relay/pull/5523))
+
 **Internal**:
 
 - Release Docker image to GHCR and DockerHub via Craft. ([#5509](https://github.com/getsentry/relay/pull/5509))
diff --git a/Cargo.lock b/Cargo.lock
index 2eb9d37aa90..dc5ff17ab5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2421,9 +2421,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.20"
+version = "1.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
+checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7"
 dependencies = [
  "cc",
  "libc",
@@ -3366,9 +3366,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plain"
@@ -3687,9 +3687,9 @@ dependencies = [
 
 [[package]]
 name = "rdkafka"
-version = "0.36.2"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1beea247b9a7600a81d4cc33f659ce1a77e1988323d7d2809c7ed1c21f4c316d"
+checksum = "5f1856d72dbbbea0d2a5b2eaf6af7fb3847ef2746e883b11781446a51dbc85c0"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -3706,9 +3706,9 @@ dependencies = [
 
 [[package]]
 name = "rdkafka-sys"
-version = "4.8.0+2.3.0"
+version = "4.9.0+2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced38182dc436b3d9df0c77976f37a67134df26b050df1f0006688e46fc4c8be"
+checksum = "5230dca48bc354d718269f3e4353280e188b610f7af7e2fcf54b7a79d5802872"
 dependencies = [
  "cmake",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 46136274535..6e956367744 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -164,8 +164,8 @@ psl = "2.1.148"
 quote = "1.0.41"
 rand = "0.9.2"
 rand_pcg = "0.9.0"
-rdkafka = "0.36.2"
-rdkafka-sys = "4.8.0"
+rdkafka = "0.38.0"
+rdkafka-sys = "4.9.0+2.10.0"
 redis = { version = "0.29.2", default-features = false }
 regex = "1.11.3"
 regex-lite = "0.1.7"

From cba6c5829ba769758b78b186e3c75d150c1b72ae Mon Sep 17 00:00:00 2001
From: David Herberth <david.herberth@sentry.io>
Date: Thu, 8 Jan 2026 13:51:02 +0100
Subject: [PATCH 2/2] remove cmake workaround

---
 .cargo/config.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 03260171fc4..bff29e6e175 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,6 +1,2 @@
 [build]
 rustflags = ["--cfg", "tokio_unstable"]
-
-[env]
-# Workaround for https://github.com/confluentinc/librdkafka/pull/5012
-CMAKE_POLICY_VERSION_MINIMUM = "3.10"