Runtime checking of librdkafka version

edenhill · edenhill · commit 553582edb556 · 2017-09-11T07:35:59.000+02:00
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -1210,6 +1210,14 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 				   const void *, size_t, int32_t,
 				   void *, void *) = partitioner_cb;
 
+        if (rd_kafka_version() < MIN_RD_KAFKA_VERSION) {
+                PyErr_Format(PyExc_RuntimeError,
+                             "%s: librdkafka version %s (0x%x) detected",
+                             MIN_VER_ERRSTR, rd_kafka_version_str(),
+                             rd_kafka_version());
+                return NULL;
+        }
+
 	if (!kwargs) {
 		/* If no kwargs, fall back on single dict arg, if any. */
 		if (!args || !PyTuple_Check(args) || PyTuple_Size(args) < 1 ||
diff --git a/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h
@@ -20,14 +20,30 @@
 
 #include <librdkafka/rdkafka.h>
 
-#if RD_KAFKA_VERSION < 0x0090100
+
+/**
+ * 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 0x00090100
+
+#ifdef __APPLE__
+#define MIN_VER_ERRSTR "confluent-kafka-python requires librdkafka v0.9.1 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 v0.9.1 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 v0.9.1 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 v0.9.1 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 #endif
 
+
 #if PY_MAJOR_VERSION >= 3
 #define PY3
 #include <bytesobject.h>
