Import v2.5.0 rc3 (confluentinc#1255)

mapr · Jul 9, 2024 · d30da91 · d30da91
2 parents 6fd9f9a + 4c7634d
commit d30da91
Show file tree

Hide file tree

Showing 27 changed files with 904 additions and 503 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.4.0
+      value: v2.5.0-RC3
   prologue:
     commands:
       - checkout

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.4.0+.
+Supports Go 1.17+ and librdkafka 2.5.0+.
 
 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.4.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.0-RC3
 )
 
 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.4.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.5.0-RC3
 	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 0x02040000
+#define MIN_RD_KAFKA_VERSION 0x02050000
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-go requires librdkafka v2.4.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.0 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.4.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.0 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.4.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.0 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.4.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.0 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.4.0.tgz"
+const LibrdkafkaLinkInfo = "static darwin_amd64 from librdkafka-static-bundle-v2.5.0-RC3.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.4.0.tgz"
+const LibrdkafkaLinkInfo = "static darwin_arm64 from librdkafka-static-bundle-v2.5.0-RC3.tgz"
diff --git a/kafka/build_glibc_linux_amd64.go b/kafka/build_glibc_linux_amd64.go
@@ -6,8 +6,8 @@
 package kafka
 
 // #cgo CFLAGS: -DUSE_VENDORED_LIBRDKAFKA -DLIBRDKAFKA_STATICLIB
-// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_glibc_linux_amd64.a  -lm -ldl -lpthread -lrt
+// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_glibc_linux_amd64.a  -lm -ldl -lpthread -lrt -lpthread -lrt
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static glibc_linux_amd64 from librdkafka-static-bundle-v2.4.0.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_amd64 from librdkafka-static-bundle-v2.5.0-RC3.tgz"
diff --git a/kafka/build_glibc_linux_arm64.go b/kafka/build_glibc_linux_arm64.go
@@ -6,8 +6,8 @@
 package kafka
 
 // #cgo CFLAGS: -DUSE_VENDORED_LIBRDKAFKA -DLIBRDKAFKA_STATICLIB
-// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_glibc_linux_arm64.a  -lm -ldl -lpthread -lrt
+// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_glibc_linux_arm64.a  -lm -ldl -lpthread -lrt -lpthread -lrt
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static glibc_linux_arm64 from librdkafka-static-bundle-v2.4.0.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_arm64 from librdkafka-static-bundle-v2.5.0-RC3.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.4.0.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_amd64 from librdkafka-static-bundle-v2.5.0-RC3.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.4.0.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_arm64 from librdkafka-static-bundle-v2.5.0-RC3.tgz"
diff --git a/kafka/build_windows.go b/kafka/build_windows.go
@@ -6,8 +6,8 @@
 package kafka
 
 // #cgo CFLAGS: -DUSE_VENDORED_LIBRDKAFKA -DLIBRDKAFKA_STATICLIB
-// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_windows.a  -lws2_32 -lsecur32 -lcrypt32 -lssp
+// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_windows.a  -lws2_32 -lsecur32 -lcrypt32
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v2.4.0.tgz"
+const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v2.5.0-RC3.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-05-07 12:59:28.782336233 +0200 CEST m=+0.000220978 USING librdkafka 2.4.0
+// AUTOMATICALLY GENERATED ON 2024-07-09 12:54:50.958167639 +0530 IST m=+0.000307921 USING librdkafka 2.5.0-RC3
 
 /*
 #include "select_rdkafka.h"
@@ -349,4 +349,8 @@ const (
 	ErrUnsupportedAssignor ErrorCode = C.RD_KAFKA_RESP_ERR_UNSUPPORTED_ASSIGNOR
 	// ErrStaleMemberEpoch Broker: The member epoch is stale
 	ErrStaleMemberEpoch ErrorCode = C.RD_KAFKA_RESP_ERR_STALE_MEMBER_EPOCH
+	// ErrUnknownSubscriptionID Broker: Client sent a push telemetry request with an invalid or outdated subscription ID
+	ErrUnknownSubscriptionID ErrorCode = C.RD_KAFKA_RESP_ERR_UNKNOWN_SUBSCRIPTION_ID
+	// ErrTelemetryTooLarge Broker: Client sent a push telemetry request larger than the maximum size the broker will accept
+	ErrTelemetryTooLarge ErrorCode = C.RD_KAFKA_RESP_ERR_TELEMETRY_TOO_LARGE
 )