Upgraded librdkafka to v2.1.0 (confluentinc#1544)

emasab · web-flow · commit 662118768652 · 2023-04-04T18:10:03.000+05:30
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -6,7 +6,7 @@ agent:
 global_job_config:
   env_vars:
     - name: LIBRDKAFKA_VERSION
-      value: v2.0.2
+      value: v2.1.0-RC3
   prologue:
     commands:
       - checkout
@@ -203,7 +203,7 @@ blocks:
   - name: "Packaging"
     run:
       when: "tag =~ '.*'"
-    dependencies: 
+    dependencies:
       - "Wheels: OSX x64"
       - "Wheels: OSX arm64"
       - "Wheels: Linux arm64"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Confluent's Python client for Apache Kafka
 
-## vNext
+## v2.1.0
+
+v2.1.0 is a feature release with the following features, fixes and enhancements:
 
 - Added `set_sasl_credentials`. This new method (on the Producer, Consumer, and AdminClient) allows modifying the stored
   SASL PLAIN/SCRAM credentials that will be used for subsequent (new) connections to a broker (#1511).
@@ -11,6 +13,11 @@
 - Migrated travis jobs to Semaphore CI (#1503)
 
 
+confluent-kafka-python is based on librdkafka v2.1.0, see the
+[librdkafka release notes](https://github.com/edenhill/librdkafka/releases/tag/v2.1.0)
+for a complete list of changes, enhancements, fixes and upgrade considerations.
+
+
 ## v2.0.2
 
 v2.0.2 is a feature release with the following features, fixes and enhancements:
diff --git a/docs/conf.py b/docs/conf.py
@@ -34,7 +34,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.2'
+version = '2.1.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 ######################################################################
diff --git a/examples/docker/Dockerfile.alpine b/examples/docker/Dockerfile.alpine
@@ -30,7 +30,7 @@ FROM alpine:3.12
 
 COPY . /usr/src/confluent-kafka-python
 
-ENV LIBRDKAFKA_VERSION v2.0.2
+ENV LIBRDKAFKA_VERSION v2.1.0
 ENV KAFKACAT_VERSION master
 
 
diff --git a/setup.py b/setup.py
@@ -75,7 +75,7 @@ def get_install_requirements(path):
 setup(name='confluent-kafka',
       # Make sure to bump CFL_VERSION* in confluent_kafka/src/confluent_kafka.h
       # and version in docs/conf.py.
-      version='2.0.2',
+      version='2.1.0',
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='support@confluent.io',
diff --git a/src/confluent_kafka/src/confluent_kafka.h b/src/confluent_kafka/src/confluent_kafka.h
@@ -42,28 +42,28 @@
  *  0xMMmmRRPP
  *  MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
  */
-#define CFL_VERSION     0x02000200
-#define CFL_VERSION_STR "2.0.2"
+#define CFL_VERSION     0x02010000
+#define CFL_VERSION_STR "2.1.0"
 
 /**
  * Minimum required librdkafka version. This is checked both during
  * build-time (just below) and runtime (see confluent_kafka.c).
  * Make sure to keep the MIN_RD_KAFKA_VERSION, MIN_VER_ERRSTR and #error
  * defines and strings in sync.
  */
-#define MIN_RD_KAFKA_VERSION 0x020002ff
+#define MIN_RD_KAFKA_VERSION 0x020100ff
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.0.2 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
+#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.1.0 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
 #else
-#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.0.2 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
+#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v2.1.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 
 #if RD_KAFKA_VERSION < MIN_RD_KAFKA_VERSION
 #ifdef __APPLE__
-#error "confluent-kafka-python requires librdkafka v2.0.2 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
+#error "confluent-kafka-python requires librdkafka v2.1.0 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
 #else
-#error "confluent-kafka-python requires librdkafka v2.0.2 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
+#error "confluent-kafka-python requires librdkafka v2.1.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`# built documents.`
`35`	`35`	`#`
`36`	`36`	`# The short X.Y version.`
`37`		`-version = '2.0.2'`
	`37`	`+version = '2.1.0'`
`38`	`38`	`# The full version, including alpha/beta/rc tags.`
`39`	`39`	`release = version`
`40`	`40`	`######################################################################`