Import librdkafka 2.5.3 (#1287)

confluentinc · Sep 2, 2024 · 3ee4497 · 3ee4497
2 parents a1f474a + f2d295f
commit 3ee4497
Show file tree

Hide file tree

Showing 23 changed files with 368 additions and 356 deletions.
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.5.3-RC1
+      value: v2.5.3
   prologue:
     commands:
       - checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,18 @@ There were no v2.5.1 or v2.5.2 releases.
 
 # v2.5.0
 
+> [!WARNING]
+This version has introduced a regression in which an assert is triggered during **PushTelemetry** call. This happens when no metric is matched on the client side among those requested by broker subscription.
+>
+> You won't face any problem if:
+> * Broker doesn't support [KIP-714](https://cwiki.apache.org/confluence/display/KAFKA/KIP-714%3A+Client+metrics+and+observability).
+> * [KIP-714](https://cwiki.apache.org/confluence/display/KAFKA/KIP-714%3A+Client+metrics+and+observability) feature is disabled on the broker side.
+> * [KIP-714](https://cwiki.apache.org/confluence/display/KAFKA/KIP-714%3A+Client+metrics+and+observability) feature is disabled on the client side. This is enabled by default. Set configuration `enable.metrics.push` to `false`.
+> * If [KIP-714](https://cwiki.apache.org/confluence/display/KAFKA/KIP-714%3A+Client+metrics+and+observability) is enabled on the broker side and there is no subscription configured there.
+> * If [KIP-714](https://cwiki.apache.org/confluence/display/KAFKA/KIP-714%3A+Client+metrics+and+observability) is enabled on the broker side with subscriptions that match the [KIP-714](https://cwiki.apache.org/confluence/display/KAFKA/KIP-714%3A+Client+metrics+and+observability) metrics defined on the client.
+>
+> Having said this, we strongly recommend using `v2.5.3` and above to not face this regression at all.
+
 This is a feature release.
 
  * Adds an AdminAPI `DeleteRecords()` (#1141, @PratRanj07).

diff --git a/examples/docker_aws_lambda_example/go.mod b/examples/docker_aws_lambda_example/go.mod
@@ -2,7 +2,7 @@ module docker_example
 
 require (
 	github.com/aws/aws-lambda-go v1.27.0
-	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3-RC1
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3
 )
 
 go 1.21

diff --git a/examples/go.mod b/examples/go.mod
@@ -9,7 +9,7 @@ replace github.com/confluentinc/confluent-kafka-go/v2 => ../
 require (
 	github.com/actgardner/gogen-avro/v10 v10.2.1
 	github.com/alecthomas/kingpin v2.2.6+incompatible
-	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3-RC1
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3
 	github.com/gdamore/tcell v1.4.0
 	google.golang.org/protobuf v1.33.0
 )

diff --git a/kafka/api.html b/kafka/api.html
diff --git a/kafka/build_darwin_amd64.go b/kafka/build_darwin_amd64.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static darwin_amd64 from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static darwin_amd64 from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/build_darwin_arm64.go b/kafka/build_darwin_arm64.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static darwin_arm64 from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static darwin_arm64 from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/build_glibc_linux_amd64.go b/kafka/build_glibc_linux_amd64.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static glibc_linux_amd64 from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_amd64 from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/build_glibc_linux_arm64.go b/kafka/build_glibc_linux_arm64.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static glibc_linux_arm64 from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_arm64 from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/build_musl_linux_amd64.go b/kafka/build_musl_linux_amd64.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static musl_linux_amd64 from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_amd64 from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/build_musl_linux_arm64.go b/kafka/build_musl_linux_arm64.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static musl_linux_arm64 from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_arm64 from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/build_windows.go b/kafka/build_windows.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v2.5.3-RC1.tgz"
+const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v2.5.3.tgz"
diff --git a/kafka/generated_errors.go b/kafka/generated_errors.go
@@ -1,7 +1,7 @@
 package kafka
 
 // Copyright 2016-2024 Confluent Inc.
-// AUTOMATICALLY GENERATED ON 2024-09-02 08:57:47.119730045 +0530 IST m=+0.004351436 USING librdkafka 2.5.3-RC1
+// AUTOMATICALLY GENERATED ON 2024-09-02 16:16:32.144950005 +0530 IST m=+0.000136202 USING librdkafka 2.5.3
 
 /*
 #include "select_rdkafka.h"

diff --git a/kafka/librdkafka_vendor/librdkafka_darwin_amd64.a b/kafka/librdkafka_vendor/librdkafka_darwin_amd64.a
diff --git a/kafka/librdkafka_vendor/librdkafka_darwin_arm64.a b/kafka/librdkafka_vendor/librdkafka_darwin_arm64.a
diff --git a/kafka/librdkafka_vendor/librdkafka_glibc_linux_amd64.a b/kafka/librdkafka_vendor/librdkafka_glibc_linux_amd64.a
diff --git a/kafka/librdkafka_vendor/librdkafka_glibc_linux_arm64.a b/kafka/librdkafka_vendor/librdkafka_glibc_linux_arm64.a
diff --git a/kafka/librdkafka_vendor/librdkafka_musl_linux_amd64.a b/kafka/librdkafka_vendor/librdkafka_musl_linux_amd64.a
diff --git a/kafka/librdkafka_vendor/librdkafka_musl_linux_arm64.a b/kafka/librdkafka_vendor/librdkafka_musl_linux_arm64.a
diff --git a/kafkatest/go.mod b/kafkatest/go.mod
@@ -8,7 +8,7 @@ replace github.com/confluentinc/confluent-kafka-go/v2 => ../
 
 require (
 	github.com/alecthomas/kingpin v2.2.6+incompatible
-	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3-RC1
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3
 )
 
 require (

diff --git a/mk/doc-gen.py b/mk/doc-gen.py
@@ -24,7 +24,7 @@ def convert_path(url, base_url, after):
         sys.exit(1)
     package = sys.argv[1]
 
-    tag = "v2.5.3-RC1"
+    tag = "v2.5.3"
     major = tag.split(".")[0] # e.g. v2
     base_css = "https://go.dev/css"
     base_js = "https://go.dev/js"