Merge pull request #818 from confluentinc/import_v1.9.1

Import librdkafka v1.9.1
confluentinc · Jul 6, 2022 · db57ef6 · db57ef6
2 parents 561a260 + 6a71d82
commit db57ef6
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Confluent's Golang client for Apache Kafka
 
+
+## v1.9.1
+
+This is a feature release:
+
+ * Built-in support for Mac OSX M1 / arm64.
+
+
+confluent-kafka-go is based on librdkafka v1.9.1, see the
+[librdkafka release notes](https://github.com/edenhill/librdkafka/releases/tag/v1.9.1)
+for a complete list of changes, enhancements, fixes and upgrade considerations.
+
+
+
 ## v1.9.0
 
 This is a feature release:

diff --git a/kafka/api.html b/kafka/api.html
diff --git a/kafka/build_darwin.go → kafka/build_darwin_amd64.go b/kafka/build_darwin.go → kafka/build_darwin_amd64.go
@@ -6,8 +6,8 @@
 package kafka
 
 // #cgo CFLAGS: -DUSE_VENDORED_LIBRDKAFKA -DLIBRDKAFKA_STATICLIB
-// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_darwin.a  -lm -lsasl2 -ldl -lpthread -framework CoreFoundation -framework SystemConfiguration
+// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_darwin_amd64.a  -lm -lsasl2 -ldl -lpthread -framework CoreFoundation -framework SystemConfiguration
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static darwin from librdkafka-static-bundle-v1.9.0.tgz"
+const LibrdkafkaLinkInfo = "static darwin_amd64 from librdkafka-static-bundle-v1.9.1.tgz"
diff --git a/kafka/build_darwin_arm64.go b/kafka/build_darwin_arm64.go
@@ -0,0 +1,13 @@
+// +build !dynamic
+
+
+// This file was auto-generated by librdkafka_vendor/bundle-import.sh, DO NOT EDIT.
+
+package kafka
+
+// #cgo CFLAGS: -DUSE_VENDORED_LIBRDKAFKA -DLIBRDKAFKA_STATICLIB
+// #cgo LDFLAGS: ${SRCDIR}/librdkafka_vendor/librdkafka_darwin_arm64.a  -lm -lsasl2 -ldl -lpthread -framework CoreFoundation -framework SystemConfiguration
+import "C"
+
+// LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
+const LibrdkafkaLinkInfo = "static darwin_arm64 from librdkafka-static-bundle-v1.9.1.tgz"
diff --git a/kafka/build_glibc_linux.go b/kafka/build_glibc_linux.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static glibc_linux from librdkafka-static-bundle-v1.9.0.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux from librdkafka-static-bundle-v1.9.1.tgz"
diff --git a/kafka/build_musl_linux.go b/kafka/build_musl_linux.go
@@ -10,4 +10,4 @@ package kafka
 import "C"
 
 // LibrdkafkaLinkInfo explains how librdkafka was linked to the Go client
-const LibrdkafkaLinkInfo = "static musl_linux from librdkafka-static-bundle-v1.9.0.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux from librdkafka-static-bundle-v1.9.1.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-v1.9.0.tgz"
+const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v1.9.1.tgz"
diff --git a/kafka/generated_errors.go b/kafka/generated_errors.go
@@ -1,6 +1,6 @@
 package kafka
 // Copyright 2016-2022 Confluent Inc.
-// AUTOMATICALLY GENERATED ON 2022-06-16 11:17:24.861602 -0700 PDT m=+0.000650282 USING librdkafka 1.9.0
+// AUTOMATICALLY GENERATED ON 2022-07-07 00:18:45.833869 +0200 CEST m=+0.000704459 USING librdkafka 1.9.1
 
 /*
 #include "select_rdkafka.h"

diff --git a/kafka/librdkafka_vendor/bundle-import.sh b/kafka/librdkafka_vendor/bundle-import.sh
@@ -101,7 +101,7 @@ for f in rdkafka.h LICENSES.txt ; do
 done
 
 
-for btype in glibc_linux musl_linux darwin windows ; do
+for btype in glibc_linux musl_linux darwin_amd64 darwin_arm64 windows ; do
     lib=$bdir/librdkafka_${btype}.a
     pc=${lib/%.a/.pc}
     [[ -f $lib ]] || (echo "Expected file $lib missing" ; exit 1)

diff --git a/kafka/librdkafka_vendor/librdkafka_darwin.a → ...brdkafka_vendor/librdkafka_darwin_amd64.a b/kafka/librdkafka_vendor/librdkafka_darwin.a → ...brdkafka_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.a b/kafka/librdkafka_vendor/librdkafka_glibc_linux.a
diff --git a/kafka/librdkafka_vendor/librdkafka_musl_linux.a b/kafka/librdkafka_vendor/librdkafka_musl_linux.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
@@ -165,7 +165,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 0x010900ff
+#define RD_KAFKA_VERSION 0x010901ff
 
 /**
  * @brief Returns the librdkafka version as integer.