From 4732ff6806a524d706ca5459c387004d7a295956 Mon Sep 17 00:00:00 2001 From: Anchit Jain Date: Mon, 8 Jul 2024 12:11:30 +0530 Subject: [PATCH] PR feedback 10th round --- INTRODUCTION.md | 2 ++ src/rdkafka_telemetry.c | 10 +++++----- src/rdkafka_telemetry_decode.c | 2 +- src/rdkafka_telemetry_encode.c | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/INTRODUCTION.md b/INTRODUCTION.md index 2225a3323b..cbe9516071 100644 --- a/INTRODUCTION.md +++ b/INTRODUCTION.md @@ -2107,6 +2107,8 @@ release of librdkafka. | 50 | DescribeUserScramCredentials | 0 | 0 | | 51 | AlterUserScramCredentials | 0 | 0 | | 68 | ConsumerGroupHeartbeat | 0 | 0 | +| 71 | GetTelemetrySubscriptions | 0 | 0 | +| 72 | PushTelemetry | 0 | 0 | # Recommendations for language binding developers diff --git a/src/rdkafka_telemetry.c b/src/rdkafka_telemetry.c index 70de637138..3f2fece177 100644 --- a/src/rdkafka_telemetry.c +++ b/src/rdkafka_telemetry.c @@ -88,7 +88,7 @@ static rd_kafka_broker_t *rd_kafka_get_preferred_broker(rd_kafka_t *rk) { rd_kafka_dbg(rk, TELEMETRY, "SETBROKER", "Lost preferred broker, switching to new " - "preferred broker %d\n", + "preferred broker %" PRId32 "\n", rkb ? rd_kafka_broker_id(rkb) : -1); } mtx_unlock(&rk->rk_telemetry.lock); @@ -211,7 +211,7 @@ static void rd_kafka_match_requested_metrics(rd_kafka_t *rk) { } rd_kafka_dbg(rk, TELEMETRY, "GETSUBSCRIPTIONS", - "Matched metrics: %" PRIdsz, + "Matched metrics: %" PRIusz, rk->rk_telemetry.matched_metrics_cnt); } @@ -352,7 +352,7 @@ static void rd_kafka_send_push_telemetry(rd_kafka_t *rk, if (compressed_metrics_payload_size > (size_t)rk->rk_telemetry.telemetry_max_bytes) { rd_kafka_log(rk, LOG_WARNING, "TELEMETRY", - "Metrics payload size %" PRIdsz + "Metrics payload size %" PRIusz " exceeds telemetry_max_bytes %" PRId32 "specified by the broker.", compressed_metrics_payload_size, @@ -360,8 +360,8 @@ static void rd_kafka_send_push_telemetry(rd_kafka_t *rk, } rd_kafka_dbg(rk, TELEMETRY, "PUSH", - "Sending PushTelemetryRequest with terminating = %d", - terminating); + "Sending PushTelemetryRequest with terminating = %s", + RD_STR_ToF(terminating)); rd_kafka_PushTelemetryRequest( rkb, &rk->rk_telemetry.client_instance_id, rk->rk_telemetry.subscription_id, terminating, compression_used, diff --git a/src/rdkafka_telemetry_decode.c b/src/rdkafka_telemetry_decode.c index 17b7528ec4..e380b964ff 100644 --- a/src/rdkafka_telemetry_decode.c +++ b/src/rdkafka_telemetry_decode.c @@ -493,7 +493,7 @@ bool unit_test_telemetry(rd_kafka_telemetry_producer_metric_name_t metric_name, rd_buf_t *rbuf = rd_kafka_telemetry_encode_metrics(rk); void *metrics_payload = rbuf->rbuf_wpos->seg_p; size_t metrics_payload_size = rbuf->rbuf_wpos->seg_of; - RD_UT_SAY("metrics_payload_size: %zu", metrics_payload_size); + RD_UT_SAY("metrics_payload_size: %" PRIusz, metrics_payload_size); RD_UT_ASSERT(metrics_payload_size != 0, "Metrics payload zero"); diff --git a/src/rdkafka_telemetry_encode.c b/src/rdkafka_telemetry_encode.c index c5bb35b1ca..5e5a5a3dc1 100644 --- a/src/rdkafka_telemetry_encode.c +++ b/src/rdkafka_telemetry_encode.c @@ -712,7 +712,7 @@ rd_buf_t *rd_kafka_telemetry_encode_metrics(rd_kafka_t *rk) { total_metrics_count); metric_names = rd_malloc(sizeof(char *) * total_metrics_count); rd_kafka_dbg(rk, TELEMETRY, "PUSH", - "Total metrics to be encoded count: %ld", + "Total metrics to be encoded count: %" PRIusz, total_metrics_count); @@ -806,7 +806,7 @@ rd_buf_t *rd_kafka_telemetry_encode_metrics(rd_kafka_t *rk) { goto fail; } rd_kafka_dbg(rk, TELEMETRY, "PUSH", - "Push Telemetry metrics encoded, size: %ld", + "Push Telemetry metrics encoded, size: %" PRIusz, stream.bytes_written); rd_buf_write(rbuf, NULL, stream.bytes_written);