Merge remote-tracking branch 'origin/master' into dev_kip-932_share_consumer_poll

Author: k-raina

.semaphore/semaphore.yml

@@ -8,7 +8,7 @@ execution_time_limit:
 global_job_config:
   env_vars:
     - name: LIBRDKAFKA_VERSION
-      value: v2.13.2
+      value: v2.14.0
     # TODO KIP-932: Remove LIBRDKAFKA_BRANCH once LIBRDKAFKA_VERSION includes share consumer support
     - name: LIBRDKAFKA_BRANCH
       value: dev_kip-932_queues-for-kafka
@@ -29,11 +29,10 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: osx
-        - name: ARCH
-          value: x64
       jobs:
         - name: Build
           commands:
+            - export ARCH=x64
             - sem-version python 3.11
             - pip install uv
             # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
@@ -52,15 +51,14 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: osx
-        - name: ARCH
-          value: x64
         - name: CIBW_SKIP
           value: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*
         - name: CIBW_ENVIRONMENT_MACOS
           value: MACOSX_DEPLOYMENT_TARGET=13
       jobs:
         - name: Build
           commands:
+            - export ARCH=x64
             - sem-version python 3.13
             - pip install uv
             # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
@@ -81,11 +79,10 @@ blocks:
           value: osx
         - name: CIBW_ARCHS
           value: arm64
-        - name: ARCH
-          value: arm64
       jobs:
         - name: Build
           commands:
+            - export ARCH=arm64
             - sem-version python 3.11
             - pip install uv
             # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
@@ -106,15 +103,14 @@ blocks:
           value: osx
         - name: CIBW_ARCHS
           value: arm64
-        - name: ARCH
-          value: arm64
         - name: CIBW_SKIP
           value: cp38-* cp39-* cp310-* cp311-* cp312-*
         - name: CIBW_ENVIRONMENT_MACOS
           value: MACOSX_DEPLOYMENT_TARGET=13
       jobs:
         - name: Build
           commands:
+            - export ARCH=arm64
             - sem-version python 3.13
             - pip install uv
             # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
@@ -133,11 +129,10 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: arm64
       jobs:
         - name: Build
           commands:
+            - export ARCH=arm64
             - sem-version python 3.13
             - pip install uv
             # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
@@ -156,11 +151,10 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: x64
       jobs:
         - name: Build
           commands:
+            - export ARCH=x64
             - sem-version python 3.11
             - pip install uv
             # TODO KIP-932: Add LIBRDKAFKA_BRANCH fallback for share consumer support
@@ -210,10 +204,9 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: x64
       prologue:
         commands:
+          - export ARCH=x64
           - '[[ -z $DOCKERHUB_APIKEY ]] || docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY'
           - sudo apt-get update -qq && sudo apt-get install -y -qq clang-format
       jobs:
@@ -222,7 +215,7 @@ blocks:
             - sem-version python 3.11
             - pip install uv
             # use a virtualenv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
             - chmod u+r+x tools/source-package-verification.sh
             - tools/source-package-verification.sh
         - name: Build and Tests with 'consumer' group protocol
@@ -231,7 +224,7 @@ blocks:
             - sem-version java 17
             - pip install uv
             # use a virtualenv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
             - chmod u+r+x tools/source-package-verification.sh
             - export TEST_CONSUMER_GROUP_PROTOCOL=consumer
             - tools/source-package-verification.sh
@@ -240,7 +233,7 @@ blocks:
             - sem-version python 3.11
             - pip install uv
             # use a virtualenv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
             - chmod u+r+x tools/source-package-verification.sh
             - export RUN_COVERAGE=true
             - tools/source-package-verification.sh
@@ -257,15 +250,14 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: arm64
       jobs:
         - name: Build
           commands:
+            - export ARCH=arm64
             - sem-version python 3.11
             - pip install uv
             # use a virtualenv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
             - chmod u+r+x tools/source-package-verification.sh
             - tools/source-package-verification.sh
   - name: "Source package verification with Python 3 (OSX x64) +docs"
@@ -277,15 +269,14 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: osx
-        - name: ARCH
-          value: x64
       jobs:
         - name: Build
           commands:
+            - export ARCH=x64
             - sem-version python 3.11
             - pip install uv
             # use a virtualenv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
             - chmod u+r+x tools/source-package-verification.sh
             - tools/source-package-verification.sh
   - name: "Source package verification with Python 3 (OSX arm64) +docs"
@@ -297,15 +288,14 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: osx
-        - name: ARCH
-          value: arm64
       jobs:
         - name: Build
           commands:
+            - export ARCH=arm64
             - sem-version python 3.11
             - pip install uv
             # use a virtualenv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
             - chmod u+r+x tools/source-package-verification.sh
             - tools/source-package-verification.sh
   - name: "Ducktape Performance Tests (Linux x64)"
@@ -317,8 +307,6 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: x64
         - name: BENCHMARK_BOUNDS_CONFIG
           value: tests/ducktape/producer_benchmark_bounds.json
         - name: BENCHMARK_ENVIRONMENT
@@ -330,9 +318,10 @@ blocks:
         - name: Build and Tests
           commands:
             # Setup Python environment
+            - export ARCH=x64
             - sem-version python 3.11
             - pip install uv
-            - uv venv _venv && source _venv/bin/activate
+            - uv venv _venv --python "$(command -v python)" && source _venv/bin/activate
 
             # Install ducktape framework and additional dependencies
             - uv pip install ducktape psutil
@@ -427,11 +416,10 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: x64
       jobs:
         - name: Verify
           commands:
+            - export ARCH=x64
             - sem-version python 3.9
             - artifact pull workflow artifacts
             - cd artifacts && ls *.tgz |xargs -n1 tar -xvf && cd ..
@@ -448,11 +436,10 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: linux
-        - name: ARCH
-          value: arm64
       jobs:
         - name: Verify
           commands:
+            - export ARCH=arm64
             - sem-version python 3.9
             - artifact pull workflow artifacts
             - cd artifacts && ls *.tgz |xargs -n1 tar -xvf && cd ..
@@ -470,11 +457,10 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: osx
-        - name: ARCH
-          value: x64
       jobs:
         - name: Verify
           commands:
+            - export ARCH=x64
             - checkout
             - sem-version python 3.11
             - pip install uv
@@ -503,13 +489,12 @@ blocks:
       env_vars:
         - name: OS_NAME
           value: osx
-        - name: ARCH
-          value: arm64
       jobs:
         - name: Verify
           commands:
             - checkout
             - sem-version python 3.11
+            - export ARCH=arm64
             - pip install uv
             - uv pip install --system pytest
             - uv pip install --system -r requirements/requirements-tests-install.txt

CHANGELOG.md

@@ -4,7 +4,30 @@
 
 ### Fixes
 
+- Fix URL joining in Python client (#2228)
+
+
+## v2.14.0 - 2026-04-01
+
+v2.14.0 is a feature release with the following features, fixes and enhancements:
+
+### Enhancements
+
+- Implement async context manager protocol for AIOProducer and AIOConsumer (#2180)
+- Add AssociatedNameStrategy (#2194)
+- Add enableAt to RuleSet (#2218)
+
+### Fixes
+
 - Ensure normalize.schemas config is passed during Protobuf ref lookup #2214
+- Fix type annotations for context manager hooks so that they are correct for subclasses (#2181)
+- Fix OAuth callback handling for Async IO clients to prevent initialization failures (#2219)
+
+
+confluent-kafka-python v2.14.0 is based on librdkafka v2.14.0, see the
+[librdkafka release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.14.0)
+for a complete list of changes, enhancements, fixes and upgrade considerations.
+
 
 
 ## v2.13.2 - 2026-03-02

examples/docker/Dockerfile.alpine

@@ -30,7 +30,7 @@ FROM alpine:3.12
 
 COPY . /usr/src/confluent-kafka-python
 
-ENV LIBRDKAFKA_VERSION="v2.13.2"
+ENV LIBRDKAFKA_VERSION="v2.14.0"
 ENV KCAT_VERSION="master"
 ENV CKP_VERSION="master"
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "confluent-kafka"
-version = "2.13.2"
+version = "2.14.0"
 description = "Confluent's Python client for Apache Kafka"
 classifiers = [
     "Development Status :: 5 - Production/Stable",

requirements/requirements.txt

@@ -0,0 +1 @@
+typing-extensions; python_version < "3.11"

src/confluent_kafka/admin/__init__.py

@@ -325,7 +325,7 @@ def _make_futures(
     ) -> Tuple[concurrent.futures.Future, Dict[Any, concurrent.futures.Future]]:
         """
         Create futures and a futuremap for the keys in futmap_keys,
-        and create a request-level future to be bassed to the C API.
+        and create a request-level future to be passed to the C API.
 
         FIXME: use _make_futures_v2 with TypeError in next major release.
         """
@@ -349,7 +349,7 @@ def _make_futures_v2(
     ) -> Tuple[concurrent.futures.Future, Dict[Any, concurrent.futures.Future]]:
         """
         Create futures and a futuremap for the keys in futmap_keys,
-        and create a request-level future to be bassed to the C API.
+        and create a request-level future to be passed to the C API.
         """
         futmap = {}
         for key in futmap_keys:

src/confluent_kafka/aio/_AIOConsumer.py

@@ -16,6 +16,9 @@
 import concurrent.futures
 from typing import Any, Callable, Dict, Optional, Tuple
 
+# FIXME: import from typing once we depend on Python >= 3.11
+from typing_extensions import Self
+
 import confluent_kafka
 
 from . import _common as _common
@@ -46,6 +49,12 @@ def __init__(
 
         self._consumer: confluent_kafka.Consumer = confluent_kafka.Consumer(consumer_conf)
 
+    async def __aenter__(self) -> Self:
+        return self
+
+    async def __aexit__(self, *_) -> None:
+        await self.close()
+
     async def _call(self, blocking_task: Callable[..., Any], *args: Any, **kwargs: Any) -> Any:
         return await _common.async_call(self.executor, blocking_task, *args, **kwargs)
 

src/confluent_kafka/aio/_common.py

@@ -83,5 +83,4 @@ def wrap_common_callbacks(loop: asyncio.AbstractEventLoop, conf: Dict[str, Any])
     wrap_conf_callback(loop, conf, 'error_cb')
     wrap_conf_callback(loop, conf, 'throttle_cb')
     wrap_conf_callback(loop, conf, 'stats_cb')
-    wrap_conf_callback(loop, conf, 'oauth_cb')
     wrap_conf_logger(loop, conf)

src/confluent_kafka/aio/producer/_AIOProducer.py

@@ -17,6 +17,9 @@
 import logging
 from typing import Any, Callable, Dict, Optional
 
+# FIXME: import from typing once we depend on Python >= 3.11
+from typing_extensions import Self
+
 import confluent_kafka
 
 from .. import _common as _common
@@ -70,6 +73,12 @@ def __init__(
         if buffer_timeout > 0:
             self._buffer_timeout_manager.start_timeout_monitoring()
 
+    async def __aenter__(self) -> Self:
+        return self
+
+    async def __aexit__(self, *_) -> None:
+        await self.close()
+
     async def close(self) -> None:
         """Close the producer and cleanup resources