@platformatic/rdkafka 4.0.0 → 4.1.0-alpha.1

package/deps/librdkafka/src/tinycthread_extra.c

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2018-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -78,27 +79,41 @@ void cnd_wait_exit(cnd_t *cond) {
 
 
 int cnd_timedwait_ms(cnd_t *cnd, mtx_t *mtx, int timeout_ms) {
-        if (timeout_ms == -1 /* INFINITE*/)
+        int ret;
+        rd_ts_t abs_timeout;
+        rd_bool_t continue_timedwait = rd_true;
+
+        if (timeout_ms == RD_POLL_INFINITE)
                 return cnd_wait(cnd, mtx);
 #if defined(_TTHREAD_WIN32_)
         return _cnd_timedwait_win32(cnd, mtx, (DWORD)timeout_ms);
 #else
-        struct timeval tv;
-        struct timespec ts;
-
-        gettimeofday(&tv, NULL);
-        ts.tv_sec  = tv.tv_sec;
-        ts.tv_nsec = tv.tv_usec * 1000;
-
-        ts.tv_sec += timeout_ms / 1000;
-        ts.tv_nsec += (timeout_ms % 1000) * 1000000;
-
-        if (ts.tv_nsec >= 1000000000) {
-                ts.tv_sec++;
-                ts.tv_nsec -= 1000000000;
-        }
-
-        return cnd_timedwait(cnd, mtx, &ts);
+        abs_timeout = rd_timeout_init(timeout_ms);
+        do {
+                struct timeval tv;
+                struct timespec ts;
+
+                gettimeofday(&tv, NULL);
+                ts.tv_sec  = tv.tv_sec;
+                ts.tv_nsec = tv.tv_usec * 1000;
+
+                ts.tv_sec += timeout_ms / 1000;
+                ts.tv_nsec += (timeout_ms % 1000) * 1000000;
+
+                if (ts.tv_nsec >= 1000000000) {
+                        ts.tv_sec++;
+                        ts.tv_nsec -= 1000000000;
+                }
+
+                ret                = cnd_timedwait(cnd, mtx, &ts);
+                continue_timedwait = ret == thrd_timedout;
+                if (continue_timedwait) {
+                        timeout_ms = rd_timeout_remains(abs_timeout);
+                        if (rd_timeout_expired(timeout_ms))
+                                continue_timedwait = rd_false;
+                }
+        } while (continue_timedwait);
+        return ret;
 #endif
 }
 
@@ -113,13 +128,22 @@ int cnd_timedwait_msp(cnd_t *cnd, mtx_t *mtx, int *timeout_msp) {
         return r;
 }
 
-int cnd_timedwait_abs(cnd_t *cnd, mtx_t *mtx, const struct timespec *tspec) {
-        if (tspec->tv_sec == RD_POLL_INFINITE)
+int cnd_timedwait_abs(cnd_t *cnd, mtx_t *mtx, rd_ts_t abs_timeout) {
+        int r = thrd_timedout;
+        int timeout_ms;
+        if (abs_timeout == RD_POLL_INFINITE)
                 return cnd_wait(cnd, mtx);
-        else if (tspec->tv_sec == RD_POLL_NOWAIT)
+        else if (abs_timeout == RD_POLL_NOWAIT)
                 return thrd_timedout;
 
-        return cnd_timedwait(cnd, mtx, tspec);
+        do {
+                timeout_ms = rd_timeout_remains(abs_timeout);
+                if (timeout_ms == RD_POLL_NOWAIT)
+                        break;
+                r = cnd_timedwait_ms(cnd, mtx, timeout_ms);
+        } while (r == thrd_timedout);
+
+        return r;
 }
 
 

package/deps/librdkafka/src/tinycthread_extra.h

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2018-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,6 +41,7 @@
 #include <pthread.h> /* needed for rwlock_t */
 #endif
 
+#include "rdtypes.h"
 
 /**
  * @brief Set thread system name if platform supports it (pthreads)
@@ -83,13 +85,15 @@ int cnd_timedwait_ms(cnd_t *cnd, mtx_t *mtx, int timeout_ms);
 int cnd_timedwait_msp(cnd_t *cnd, mtx_t *mtx, int *timeout_msp);
 
 /**
- * @brief Same as cnd_timedwait() but honours
+ * @brief Same as cnd_timedwait() but takes an ansolute timeout in microseconds.
+ *        Honours
  *        RD_POLL_INFINITE (uses cnd_wait()),
  *        and RD_POLL_NOWAIT (return thrd_timedout immediately).
  *
- *  @remark Set up \p tspec with rd_timeout_init_timespec().
+ *  @remark Set up \p abs_timeout with rd_timeout_init() or
+ *          rd_timeout_init_us().
  */
-int cnd_timedwait_abs(cnd_t *cnd, mtx_t *mtx, const struct timespec *tspec);
+int cnd_timedwait_abs(cnd_t *cnd, mtx_t *mtx, rd_ts_t abs_timeout);
 
 
 

package/deps/librdkafka/src-cpp/rdkafkacpp.h

@@ -112,7 +112,7 @@ namespace RdKafka {
  * @remark This value should only be used during compile time,
  *         for runtime checks of version use RdKafka::version()
  */
-#define RD_KAFKA_VERSION 0x020601ff
+#define RD_KAFKA_VERSION 0x020c00ff
 
 /**
  * @brief Returns the librdkafka version as integer.
@@ -327,6 +327,11 @@ enum ErrorCode {
   ERR__AUTO_OFFSET_RESET = -140,
   /** Partition log truncation detected */
   ERR__LOG_TRUNCATION = -139,
+  /** A different record in the batch was invalid
+   *  and this message failed persisting. */
+  ERR__INVALID_DIFFERENT_RECORD = -138,
+  /** Broker is going away but client isn't terminating */
+  ERR__DESTROY_BROKER = -137,
 
   /** End internal error codes */
   ERR__END = -100,
@@ -544,7 +549,28 @@ enum ErrorCode {
   /** Unable to update finalized features due to server error */
   ERR_FEATURE_UPDATE_FAILED = 96,
   /** Request principal deserialization failed during forwarding */
-  ERR_PRINCIPAL_DESERIALIZATION_FAILURE = 97
+  ERR_PRINCIPAL_DESERIALIZATION_FAILURE = 97,
+  /** Unknown Topic Id */
+  ERR_UNKNOWN_TOPIC_ID = 100,
+  /** The member epoch is fenced by the group coordinator */
+  ERR_FENCED_MEMBER_EPOCH = 110,
+  /** The instance ID is still used by another member in the
+   *  consumer group */
+  ERR_UNRELEASED_INSTANCE_ID = 111,
+  /** The assignor or its version range is not supported by the consumer
+   *  group */
+  ERR_UNSUPPORTED_ASSIGNOR = 112,
+  /** The member epoch is stale */
+  ERR_STALE_MEMBER_EPOCH = 113,
+  /** Client sent a push telemetry request with an invalid or outdated
+   *  subscription ID. */
+  ERR_UNKNOWN_SUBSCRIPTION_ID = 117,
+  /** Client sent a push telemetry request larger than the maximum size
+   *  the broker will accept. */
+  ERR_TELEMETRY_TOO_LARGE = 118,
+  /** Client metadata is stale,
+   *  client should rebootstrap to obtain new metadata. */
+  ERR_REBOOTSTRAP_REQUIRED = 129
 };
 
 

package/deps/librdkafka/tests/0001-multiobj.c

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2012-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,6 +93,9 @@ int main_0001_multiobj(int argc, char **argv) {
                 /* Topic is created on the first iteration. */
                 if (i > 0)
                         TIMING_ASSERT(&t_full, 0, 999);
+                else
+                        /* Allow metadata propagation. */
+                        rd_sleep(1);
         }
 
         return 0;

package/deps/librdkafka/tests/0004-conf.c

@@ -511,28 +511,27 @@ int main_0004_conf(int argc, char **argv) {
         int i;
         const char *topic;
         static const char *gconfs[] = {
-                "message.max.bytes",
-                "12345", /* int property */
-                "client.id",
-                "my id", /* string property */
-                "debug",
-                "topic,metadata,interceptor", /* S2F property */
-                "topic.blacklist",
-                "__.*", /* #778 */
-                "auto.offset.reset",
-                "earliest", /* Global->Topic fallthru */
+            "message.max.bytes",
+            "12345", /* int property */
+            "client.id",
+            "my id", /* string property */
+            "debug",
+            "topic,metadata,interceptor", /* S2F property */
+            "topic.blacklist",
+            "__.*", /* #778 */
+            "auto.offset.reset",
+            "earliest", /* Global->Topic fallthru */
 #if WITH_ZLIB
-                "compression.codec",
-                "gzip", /* S2I property */
+            "compression.codec",
+            "gzip", /* S2I property */
 #endif
 #if defined(_WIN32)
-                "ssl.ca.certificate.stores",
-                "Intermediate ,, Root ,",
+            "ssl.ca.certificate.stores",
+            "Intermediate ,, Root ,",
 #endif
-                "client.dns.lookup",
-                "resolve_canonical_bootstrap_servers_only",
-                NULL
-        };
+            "client.dns.lookup",
+            "resolve_canonical_bootstrap_servers_only",
+            NULL};
         static const char *tconfs[] = {"request.required.acks",
                                        "-1", /* int */
                                        "auto.commit.enable",
@@ -721,6 +720,75 @@ int main_0004_conf(int argc, char **argv) {
                 rd_kafka_conf_destroy(conf);
         }
 
+#if WITH_OAUTHBEARER_OIDC
+        {
+                TEST_SAY(
+                    "Verify that https.ca.location is mutually "
+                    "exclusive with https.ca.pem\n");
+
+                conf = rd_kafka_conf_new();
+
+                test_conf_set(conf, "https.ca.pem",
+                              "-----BEGIN CERTIFICATE-----");
+                test_conf_set(conf, "https.ca.location",
+                              "/path/to/certificate.pem");
+
+                rk = rd_kafka_new(RD_KAFKA_PRODUCER, conf, errstr,
+                                  sizeof(errstr));
+                TEST_ASSERT(
+                    !rk, "Expected rd_kafka_new() to fail, but it succeeded");
+                TEST_ASSERT(!strcmp(errstr,
+                                    "`https.ca.location` and "
+                                    "`https.ca.pem` are mutually exclusive"),
+                            "Expected rd_kafka_new() to fail with: "
+                            "\"`https.ca.location` and `https.ca.pem` "
+                            "are mutually exclusive\", got: \"%s\"",
+                            errstr);
+                rd_kafka_conf_destroy(conf);
+        }
+        {
+                TEST_SAY(
+                    "Verify that https.ca.location gives an error when "
+                    "set to an invalid path\n");
+
+                conf = rd_kafka_conf_new();
+
+                test_conf_set(conf, "https.ca.location",
+                              "/?/does/!/not/exist!");
+
+                rk = rd_kafka_new(RD_KAFKA_PRODUCER, conf, errstr,
+                                  sizeof(errstr));
+                TEST_ASSERT(
+                    !rk, "Expected rd_kafka_new() to fail, but it succeeded");
+                TEST_ASSERT(!strcmp(errstr,
+                                    "`https.ca.location` must be "
+                                    "an existing file or directory"),
+                            "Expected rd_kafka_new() to fail with: "
+                            "\"`https.ca.location` must be "
+                            "an existing file or directory\", got: \"%s\"",
+                            errstr);
+                rd_kafka_conf_destroy(conf);
+        }
+        {
+                TEST_SAY(
+                    "Verify that https.ca.location doesn't give an error when "
+                    "set to `probe`\n");
+
+                conf = rd_kafka_conf_new();
+
+                test_conf_set(conf, "https.ca.location", "probe");
+
+                rk = rd_kafka_new(RD_KAFKA_PRODUCER, conf, errstr,
+                                  sizeof(errstr));
+                TEST_ASSERT(
+                    rk, "Expected rd_kafka_new() not to fail, but it failed");
+
+                rd_kafka_destroy(rk);
+        }
+#endif /* WITH_OAUTHBEARER_OIDC */
+
+        /* Verify that OpenSSL_AppLink is not needed on Windows (#3554) */
+
 #ifdef _WIN32
         {
                 FILE *fp;
@@ -774,26 +842,25 @@ int main_0004_conf(int argc, char **argv) {
                         const char *exp;
                         int is_global;
                 } props[] = {
-                        {"request.required.acks", "0", "0"},
-                        {"request.required.acks", "-1", "-1"},
-                        {"request.required.acks", "1", "1"},
-                        {"acks", "3", "3"}, /* alias test */
-                        {"request.required.acks", "393", "393"},
-                        {"request.required.acks", "bad", NULL},
-                        {"request.required.acks", "all", "-1"},
-                        {"request.required.acks", "all", "-1", 1 /*fallthru*/},
-                        {"acks", "0", "0"}, /* alias test */
+                    {"request.required.acks", "0", "0"},
+                    {"request.required.acks", "-1", "-1"},
+                    {"request.required.acks", "1", "1"},
+                    {"acks", "3", "3"}, /* alias test */
+                    {"request.required.acks", "393", "393"},
+                    {"request.required.acks", "bad", NULL},
+                    {"request.required.acks", "all", "-1"},
+                    {"request.required.acks", "all", "-1", 1 /*fallthru*/},
+                    {"acks", "0", "0"}, /* alias test */
 #if WITH_SASL
-                        {"sasl.mechanisms", "GSSAPI", "GSSAPI", 1},
-                        {"sasl.mechanisms", "PLAIN", "PLAIN", 1},
-                        {"sasl.mechanisms", "GSSAPI,PLAIN", NULL, 1},
-                        {"sasl.mechanisms", "", NULL, 1},
+                    {"sasl.mechanisms", "GSSAPI", "GSSAPI", 1},
+                    {"sasl.mechanisms", "PLAIN", "PLAIN", 1},
+                    {"sasl.mechanisms", "GSSAPI,PLAIN", NULL, 1},
+                    {"sasl.mechanisms", "", NULL, 1},
 #endif
-                        {"linger.ms", "12555.3", "12555.3", 1},
-                        {"linger.ms", "1500.000", "1500", 1},
-                        {"linger.ms", "0.0001", "0.0001", 1},
-                        {NULL}
-                };
+                    {"linger.ms", "12555.3", "12555.3", 1},
+                    {"linger.ms", "1500.000", "1500", 1},
+                    {"linger.ms", "0.0001", "0.0001", 1},
+                    {NULL}};
 
                 TEST_SAY("Canonical tests\n");
                 tconf = rd_kafka_topic_conf_new();

package/deps/librdkafka/tests/0009-mock_cluster.c

@@ -64,6 +64,7 @@ int main_0009_mock_cluster(int argc, char **argv) {
         c = test_create_consumer(topic, NULL, conf, NULL);
 
         rkt = test_create_producer_topic(p, topic, NULL);
+        test_wait_topic_exists(p, topic, 5000);
 
         /* Produce */
         test_produce_msgs(p, rkt, 0, RD_KAFKA_PARTITION_UA, 0, msgcnt, NULL, 0);

package/deps/librdkafka/tests/0011-produce_batch.c

@@ -366,7 +366,8 @@ static void test_per_message_partition_flag(void) {
         TEST_SAY("test_per_message_partition_flag: Created kafka instance %s\n",
                  rd_kafka_name(rk));
         topic_name = test_mk_topic_name("0011_per_message_flag", 1);
-        test_create_topic(rk, topic_name, topic_num_partitions, 1);
+        test_create_topic_wait_exists(rk, topic_name, topic_num_partitions, 1,
+                                      5000);
 
         rkt = rd_kafka_topic_new(rk, topic_name, topic_conf);
         if (!rkt)

package/deps/librdkafka/tests/0016-client_swname.c

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2020-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -120,6 +121,11 @@ int main_0016_client_swname(int argc, char **argv) {
         const char *jmx_port;
         const char *reason = NULL;
 
+        if (test_needs_auth()) {
+                TEST_SKIP("Cannot run this test with SSL/SASL\n");
+                return 0;
+        }
+
         /* If available, use the Kafka JmxTool to query software name
          * in broker JMX metrics */
         if (!(broker = test_getenv("BROKER_ADDRESS_2", NULL)))
@@ -136,14 +142,23 @@ int main_0016_client_swname(int argc, char **argv) {
                 reason =
                     "Env var BROKER_JMX_PORT_2 missing "
                     "(not running in trivup or trivup too old?)";
-        else
+        else {
+                rd_bool_t apache_kafka_4 =
+                    test_broker_version >= TEST_BRKVER(4, 0, 0, 0);
                 rd_snprintf(jmx_cmd, sizeof(jmx_cmd),
-                            "%s/bin/kafka-run-class.sh kafka.tools.JmxTool "
+                            "%s/bin/kafka-run-class.sh %s "
                             "--jmx-url "
                             "service:jmx:rmi:///jndi/rmi://:%s/jmxrmi "
+                            " --object-name '*:"
+                            "clientSoftwareName=*,"
+                            "clientSoftwareVersion=*,*' "
                             " --one-time true | "
                             "grep clientSoftware",
-                            kafka_path, jmx_port);
+                            kafka_path,
+                            apache_kafka_4 ? "org.apache.kafka.tools.JmxTool"
+                                           : "kafka.tools.JmxTool",
+                            jmx_port);
+        }
 
         if (reason)
                 TEST_WARN("Will not be able to verify JMX metrics: %s\n",

package/deps/librdkafka/tests/0017-compression.c

@@ -44,20 +44,17 @@ int main_0017_compression(int argc, char **argv) {
         int msg_base      = 0;
         uint64_t testid;
 #define CODEC_CNT 5
-        const char *codecs[CODEC_CNT + 1] = {
-                "none",
+        const char *codecs[CODEC_CNT + 1] = {"none",
 #if WITH_ZLIB
-                "gzip",
+                                             "gzip",
 #endif
 #if WITH_SNAPPY
-                "snappy",
+                                             "snappy",
 #endif
 #if WITH_ZSTD
-                "zstd",
+                                             "zstd",
 #endif
-                "lz4",
-                NULL
-        };
+                                             "lz4",    NULL};
         char *topics[CODEC_CNT];
         const int32_t partition = 0;
         int i;
@@ -77,6 +74,7 @@ int main_0017_compression(int argc, char **argv) {
                     msg_cnt, codecs[i], topics[i]);
                 rkt_p = test_create_producer_topic(
                     rk_p, topics[i], "compression.codec", codecs[i], NULL);
+                test_wait_topic_exists(rk_p, topics[i], 5000);
 
                 /* Produce small message that will not decrease with
                  * compression (issue #781) */

package/deps/librdkafka/tests/0018-cgrp_term.c

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2012-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,14 +64,16 @@ static void rebalance_cb(rd_kafka_t *rk,
         switch (err) {
         case RD_KAFKA_RESP_ERR__ASSIGN_PARTITIONS:
                 assign_cnt++;
-                rd_kafka_assign(rk, partitions);
+                test_consumer_assign_by_rebalance_protocol("rebalance", rk,
+                                                           partitions);
                 break;
 
         case RD_KAFKA_RESP_ERR__REVOKE_PARTITIONS:
                 if (assign_cnt == 0)
                         TEST_FAIL("asymetric rebalance_cb\n");
                 assign_cnt--;
-                rd_kafka_assign(rk, NULL);
+                test_consumer_unassign_by_rebalance_protocol("rebalance", rk,
+                                                             partitions);
                 break;
 
         default:
@@ -195,6 +198,7 @@ static void do_test(rd_bool_t with_queue) {
         /* Produce messages */
         rk_p  = test_create_producer();
         rkt_p = test_create_producer_topic(rk_p, topic, NULL);
+        test_wait_topic_exists(rk_p, topic, 5000);
 
         for (partition = 0; partition < partition_cnt; partition++) {
                 test_produce_msgs(rk_p, rkt_p, testid, partition,
@@ -260,7 +264,8 @@ static void do_test(rd_bool_t with_queue) {
         /* Let remaining consumers run for a while to take over the now
          * lost partitions. */
 
-        if (test_consumer_group_protocol_generic() &&
+        /* Callback count can vary in KIP-848 */
+        if (test_consumer_group_protocol_classic() &&
             assign_cnt != _CONS_CNT - 1)
                 TEST_FAIL("assign_cnt %d, should be %d\n", assign_cnt,
                           _CONS_CNT - 1);

package/deps/librdkafka/tests/0021-rkt_destroy.c

@@ -56,6 +56,7 @@ int main_0021_rkt_destroy(int argc, char **argv) {
         testid = test_id_generate();
         rk     = test_create_producer();
         rkt    = test_create_producer_topic(rk, topic, NULL);
+        test_wait_topic_exists(rk, topic, 5000);
 
 
         test_produce_msgs_nowait(rk, rkt, testid, RD_KAFKA_PARTITION_UA, 0,

package/deps/librdkafka/tests/0022-consume_batch.c

@@ -259,7 +259,10 @@ static void do_test_consume_batch_non_existent_topic(void) {
 
 int main_0022_consume_batch(int argc, char **argv) {
         do_test_consume_batch();
-        if (test_consumer_group_protocol_generic()) {
+        /* Subscribing to a non-existent topic doesn't generate a
+         * UNKNOWN_TOPIC_OR_PART error with `consumer` group rebalance protocol.
+         */
+        if (test_consumer_group_protocol_classic()) {
                 do_test_consume_batch_non_existent_topic();
         }
         return 0;

package/deps/librdkafka/tests/0026-consume_pause.c

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2012-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,9 +63,7 @@ static void consume_pause(void) {
         test_conf_set(conf, "enable.partition.eof", "true");
         test_topic_conf_set(tconf, "auto.offset.reset", "smallest");
 
-        test_create_topic(NULL, topic, partition_cnt, 1);
-
-        test_wait_topic_exists(NULL, topic, 10 * 1000);
+        test_create_topic_wait_exists(NULL, topic, partition_cnt, 1, 10 * 1000);
 
         /* Produce messages */
         testid =
@@ -260,9 +259,8 @@ static void consume_pause_resume_after_reassign(void) {
 
         test_conf_init(&conf, NULL, 60);
 
-        test_create_topic(NULL, topic, (int)partition + 1, 1);
-
-        test_wait_topic_exists(NULL, topic, 10 * 1000);
+        test_create_topic_wait_exists(NULL, topic, (int)partition + 1, 1,
+                                      10 * 1000);
 
         /* Produce messages */
         testid = test_produce_msgs_easy(topic, 0, partition, msgcnt);
@@ -380,7 +378,8 @@ static void rebalance_cb(rd_kafka_t *rk,
                  * while auto.offset.reset is default at `latest`. */
 
                 parts->elems[0].offset = RD_KAFKA_OFFSET_BEGINNING;
-                test_consumer_assign("rebalance", rk, parts);
+                test_consumer_assign_by_rebalance_protocol("rebalance", rk,
+                                                           parts);
                 TEST_SAY("Pausing partitions\n");
                 if ((err2 = rd_kafka_pause_partitions(rk, parts)))
                         TEST_FAIL("Failed to pause: %s",
@@ -391,7 +390,8 @@ static void rebalance_cb(rd_kafka_t *rk,
                                   rd_kafka_err2str(err2));
                 break;
         default:
-                test_consumer_unassign("rebalance", rk);
+                test_consumer_unassign_by_rebalance_protocol("rebalance", rk,
+                                                             parts);
                 break;
         }
 }
@@ -419,9 +419,8 @@ static void consume_subscribe_assign_pause_resume(void) {
 
         test_conf_init(&conf, NULL, 20);
 
-        test_create_topic(NULL, topic, (int)partition + 1, 1);
-
-        test_wait_topic_exists(NULL, topic, 10 * 1000);
+        test_create_topic_wait_exists(NULL, topic, (int)partition + 1, 1,
+                                      10 * 1000);
 
         /* Produce messages */
         testid = test_produce_msgs_easy(topic, 0, partition, msgcnt);
@@ -472,9 +471,8 @@ static void consume_seek_pause_resume(void) {
 
         test_conf_init(&conf, NULL, 20);
 
-        test_create_topic(NULL, topic, (int)partition + 1, 1);
-
-        test_wait_topic_exists(NULL, topic, 10 * 1000);
+        test_create_topic_wait_exists(NULL, topic, (int)partition + 1, 1,
+                                      10 * 1000);
 
         /* Produce messages */
         testid = test_produce_msgs_easy(topic, 0, partition, msgcnt);

package/deps/librdkafka/tests/0028-long_topicnames.c

@@ -62,7 +62,7 @@ int main_0028_long_topicnames(int argc, char **argv) {
         rk_c = test_create_consumer(topic, NULL, NULL, NULL);
 
         /* Create topic */
-        test_create_topic(rk_c, topic, 1, 1);
+        test_create_topic_wait_exists(rk_c, topic, 1, 1, 5000);
 
         test_consumer_subscribe(rk_c, topic);
         test_consumer_poll_no_msgs("consume.nomsgs", rk_c, 0, 5000);

package/deps/librdkafka/tests/0029-assign_offset.c

@@ -2,6 +2,7 @@
  * librdkafka - Apache Kafka C library
  *
  * Copyright (c) 2012-2022, Magnus Edenhill
+ *               2025, Confluent Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -89,11 +90,13 @@ static void rebalance_cb(rd_kafka_t *rk,
                 }
                 TEST_SAY("Use these offsets:\n");
                 test_print_partition_list(parts);
-                test_consumer_assign("HL.REBALANCE", rk, parts);
+                test_consumer_assign_by_rebalance_protocol("HL.REBALANCE", rk,
+                                                           parts);
                 break;
 
         case RD_KAFKA_RESP_ERR__REVOKE_PARTITIONS:
-                test_consumer_unassign("HL.REBALANCE", rk);
+                test_consumer_unassign_by_rebalance_protocol("HL.REBALANCE", rk,
+                                                             parts);
                 break;
 
         default:
@@ -111,12 +114,6 @@ int main_0029_assign_offset(int argc, char **argv) {
         test_timing_t t_simple, t_hl;
         test_msgver_t mv;
 
-        if (!test_consumer_group_protocol_generic()) {
-                /* FIXME: this should be fixed when upgrading from generic to
-                 * new consumer group will be possible. See KAFKA-15989 */
-                return 0;
-        }
-
         test_conf_init(NULL, NULL, 20 + (test_session_timeout_ms * 3 / 1000));
 
         /* Produce X messages to Y partitions so we get a
@@ -125,6 +122,7 @@ int main_0029_assign_offset(int argc, char **argv) {
         testid = test_id_generate();
         rk     = test_create_producer();
         rkt    = test_create_producer_topic(rk, topic, NULL);
+        test_wait_topic_exists(rk, topic, 5000);
 
         parts = rd_kafka_topic_partition_list_new(partitions);