Import RC1 for v2.5.3 (#1286)

confluentinc · Sep 2, 2024 · a1f474a · a1f474a
2 parents f312bbf + ebc409c
commit a1f474a
Show file tree

Hide file tree

Showing 27 changed files with 373 additions and 367 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.0
+      value: v2.5.3-RC1
   prologue:
     commands:
       - checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,12 @@ v2.5.3 is a maintenance release with the following fixes and enhancements:
 * Perform Avro schema resolution in the Avro deserializer if necessary
 * Add some missing APIs to the Schema Registry client
 
+confluent-kafka-go is based on librdkafka v2.5.3, see the
+[librdkafka v2.5.3 release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.5.3)
+for a complete list of changes, enhancements, fixes and upgrade considerations.
+
+There were no v2.5.1 or v2.5.2 releases.
+
 # v2.5.0
 
 This is a feature release.

diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ for use with [Confluent Cloud](https://www.confluent.io/confluent-cloud/).
 Getting Started
 ===============
 
-Supports Go 1.17+ and librdkafka 2.5.0+.
+Supports Go 1.17+ and librdkafka 2.5.3+.
 
 Using Go Modules
 ----------------

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.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3-RC1
 )
 
 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.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3-RC1
 	github.com/gdamore/tcell v1.4.0
 	google.golang.org/protobuf v1.33.0
 )

diff --git a/kafka/00version.go b/kafka/00version.go
@@ -29,19 +29,19 @@ import (
 //defines and strings in sync.
 //
 
-#define MIN_RD_KAFKA_VERSION 0x02050000
+#define MIN_RD_KAFKA_VERSION 0x02050300
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-go requires librdkafka v2.5.0 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-go requires librdkafka v2.5.3 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-go requires librdkafka v2.5.0 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-go requires librdkafka v2.5.3 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-go requires librdkafka v2.5.0 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
+#error "confluent-kafka-go requires librdkafka v2.5.3 or later. Install the latest version of librdkafka from Homebrew by running `brew install librdkafka` or `brew upgrade librdkafka`"
 #else
-#error "confluent-kafka-go requires librdkafka v2.5.0 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
+#error "confluent-kafka-go requires librdkafka v2.5.3 or later. Install the latest version of librdkafka from the Confluent repositories, see http://docs.confluent.io/current/installation.html"
 #endif
 #endif
 */

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.0.tgz"
+const LibrdkafkaLinkInfo = "static darwin_amd64 from librdkafka-static-bundle-v2.5.3-RC1.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.0.tgz"
+const LibrdkafkaLinkInfo = "static darwin_arm64 from librdkafka-static-bundle-v2.5.3-RC1.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.0.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_amd64 from librdkafka-static-bundle-v2.5.3-RC1.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.0.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_arm64 from librdkafka-static-bundle-v2.5.3-RC1.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.0.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_amd64 from librdkafka-static-bundle-v2.5.3-RC1.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.0.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_arm64 from librdkafka-static-bundle-v2.5.3-RC1.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.0.tgz"
+const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v2.5.3-RC1.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-07-10 19:23:45.908188233 +0530 IST m=+0.000136904 USING librdkafka 2.5.0
+// AUTOMATICALLY GENERATED ON 2024-09-02 08:57:47.119730045 +0530 IST m=+0.004351436 USING librdkafka 2.5.3-RC1
 
 /*
 #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/kafka/librdkafka_vendor/librdkafka_windows.a b/kafka/librdkafka_vendor/librdkafka_windows.a
diff --git a/kafka/librdkafka_vendor/rdkafka.h b/kafka/librdkafka_vendor/rdkafka.h
@@ -167,7 +167,7 @@ typedef SSIZE_T ssize_t;
  * @remark This value should only be used during compile time,
  *         for runtime checks of version use rd_kafka_version()
  */
-#define RD_KAFKA_VERSION 0x020500ff
+#define RD_KAFKA_VERSION 0x020503ff
 
 /**
  * @brief Returns the librdkafka version as integer.

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.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.3-RC1
 )
 
 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.0"
+    tag = "v2.5.3-RC1"
     major = tag.split(".")[0] # e.g. v2
     base_css = "https://go.dev/css"
     base_js = "https://go.dev/js"