librdkafka v2.2.0 (#1027)

confluentinc · Jul 12, 2023 · 278e952 · 278e952
2 parents 262be15 + 93eadbd
commit 278e952
Show file tree

Hide file tree

Showing 23 changed files with 325 additions and 322 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.2.0-RC2
+      value: v2.2.0
   prologue:
     commands:
       - checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,7 @@ This is a feature release.
    User SASL/SCRAM credentials alteration and description (#1004).
 
 confluent-kafka-go is based on librdkafka v2.2.0, see the
-[librdkafka v2.2.0 release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.2.0-RC2)
+[librdkafka v2.2.0 release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.2.0)
 for a complete list of changes, enhancements, fixes and upgrade considerations.
 
 

diff --git a/examples/go.mod b/examples/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/actgardner/gogen-avro/v10 v10.2.1
 	github.com/alecthomas/kingpin v2.2.6+incompatible
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
-	github.com/confluentinc/confluent-kafka-go/v2 v2.2.0-RC2
+	github.com/confluentinc/confluent-kafka-go/v2 v2.2.0
 	github.com/gdamore/tcell v1.4.0
 	google.golang.org/protobuf v1.30.0
 )
diff --git a/kafka/00version.go b/kafka/00version.go
@@ -32,16 +32,16 @@ import (
 #define MIN_RD_KAFKA_VERSION 0x02020000
 
 #ifdef __APPLE__
-#define MIN_VER_ERRSTR "confluent-kafka-go requires librdkafka v2.2.0-RC2 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.2.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.2.0-RC2 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.2.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.2.0-RC2 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.2.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.2.0-RC2 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.2.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static darwin_amd64 from librdkafka-static-bundle-v2.2.0.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static darwin_arm64 from librdkafka-static-bundle-v2.2.0.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_amd64 from librdkafka-static-bundle-v2.2.0.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static glibc_linux_arm64 from librdkafka-static-bundle-v2.2.0.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_amd64 from librdkafka-static-bundle-v2.2.0.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static musl_linux_arm64 from librdkafka-static-bundle-v2.2.0.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.2.0-RC2.tgz"
+const LibrdkafkaLinkInfo = "static windows from librdkafka-static-bundle-v2.2.0.tgz"
diff --git a/kafka/generated_errors.go b/kafka/generated_errors.go
@@ -1,7 +1,7 @@
 package kafka
 
 // Copyright 2016-2023 Confluent Inc.
-// AUTOMATICALLY GENERATED ON 2023-07-10 21:38:56.477866249 +0200 CEST m=+0.000163641 USING librdkafka 2.2.0-RC2
+// AUTOMATICALLY GENERATED ON 2023-07-12 11:45:05.970954589 +0200 CEST m=+0.000441527 USING librdkafka 2.2.0
 
 /*
 #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/rdkafka.h b/kafka/librdkafka_vendor/rdkafka.h
@@ -8736,7 +8736,7 @@ typedef struct rd_kafka_UserScramCredentialAlteration_s
 /**
  * @brief Allocates a new UserScramCredentialUpsertion given its fields.
  *        If salt isn't given a 64 B salt is generated using OpenSSL
- *        RAND_bytes, if available.
+ *        RAND_priv_bytes, if available.
  *
  * @param username The username (not empty).
  * @param mechanism SASL/SCRAM mechanism.
@@ -8746,6 +8746,9 @@ typedef struct rd_kafka_UserScramCredentialAlteration_s
  * @param salt Salt bytes (optional).
  * @param salt_size Size of \p salt (optional).
  *
+ * @remark A random salt is generated, when NULL, only if OpenSSL >= 1.1.1.
+ *         Otherwise it's a required param.
+ *
  * @return A newly created instance of rd_kafka_UserScramCredentialAlteration_t.
  *         Ownership belongs to the caller, use
  *         rd_kafka_UserScramCredentialAlteration_destroy to destroy.

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.2.0-RC2"
+    tag = "v2.2.0"
     major = tag.split(".")[0] # e.g. v2
     base_css = "https://go.dev/css"
     base_js = "https://go.dev/js"

diff --git a/schemaregistry/api.html b/schemaregistry/api.html
@@ -14,7 +14,7 @@
   <script defer="" src="https://go.dev/js/jquery.js">
   </script>
   <script>
-   var goVersion = "go1.18.5";
+   var goVersion = "go1.18.2";
   </script>
   <script defer="" src="https://go.dev/js/godocs.js">
   </script>
@@ -205,19 +205,19 @@ <h3>
       </h3>
       <p>
        <span style="font-size:90%">
-        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/config.go">
+        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/config.go">
          config.go
         </a>
-        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/mock_schemaregistry_client.go">
+        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/mock_schemaregistry_client.go">
          mock_schemaregistry_client.go
         </a>
-        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/rest_service.go">
+        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/rest_service.go">
          rest_service.go
         </a>
-        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go">
+        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go">
          schemaregistry_client.go
         </a>
-        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/testhelpers.go">
+        <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/testhelpers.go">
          testhelpers.go
         </a>
        </span>
@@ -248,7 +248,7 @@ <h2 id="pkg-constants">
 )</pre>
     <h2 id="Client">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=6422:7572#L182">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=6422:7572#L182">
       Client
      </a>
      <a class="permalink" href="#Client">
@@ -281,7 +281,7 @@ <h2 id="Client">
 }</pre>
     <h3 id="NewClient">
      func
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=7619:7663#L201">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=7619:7663#L201">
       NewClient
      </a>
      <a class="permalink" href="#NewClient">
@@ -294,7 +294,7 @@ <h3 id="NewClient">
     </p>
     <h2 id="Compatibility">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=16563:16585#L511">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=16563:16585#L511">
       Compatibility
      </a>
      <a class="permalink" href="#Compatibility">
@@ -307,7 +307,7 @@ <h2 id="Compatibility">
     <pre>type Compatibility <a href="https://pkg.go.dev/builtin/#int">int</a></pre>
     <h3 id="Compatibility.MarshalJSON">
      func (Compatibility)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=17340:17392#L549">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=17340:17392#L549">
       MarshalJSON
      </a>
      <a class="permalink" href="#Compatibility.MarshalJSON">
@@ -320,7 +320,7 @@ <h3 id="Compatibility.MarshalJSON">
     </p>
     <h3 id="Compatibility.ParseString">
      func (*Compatibility)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=17813:17866#L568">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=17813:17866#L568">
       ParseString
      </a>
      <a class="permalink" href="#Compatibility.ParseString">
@@ -333,7 +333,7 @@ <h3 id="Compatibility.ParseString">
     </p>
     <h3 id="Compatibility.String">
      func (Compatibility)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=17680:17718#L563">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=17680:17718#L563">
       String
      </a>
      <a class="permalink" href="#Compatibility.String">
@@ -343,7 +343,7 @@ <h3 id="Compatibility.String">
     <pre>func (c <a href="#Compatibility">Compatibility</a>) String() <a href="https://pkg.go.dev/builtin/#string">string</a></pre>
     <h3 id="Compatibility.UnmarshalJSON">
      func (*Compatibility)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=17476:17529#L554">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=17476:17529#L554">
       UnmarshalJSON
      </a>
      <a class="permalink" href="#Compatibility.UnmarshalJSON">
@@ -356,7 +356,7 @@ <h3 id="Compatibility.UnmarshalJSON">
     </p>
     <h2 id="Config">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/config.go?s=722:2038#L12">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/config.go?s=722:2038#L12">
       Config
      </a>
      <a class="permalink" href="#Config">
@@ -401,7 +401,7 @@ <h2 id="Config">
 </pre>
     <h3 id="NewConfig">
      func
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/config.go?s=2110:2144#L46">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/config.go?s=2110:2144#L46">
       NewConfig
      </a>
      <a class="permalink" href="#NewConfig">
@@ -414,7 +414,7 @@ <h3 id="NewConfig">
     </p>
     <h3 id="NewConfigWithAuthentication">
      func
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/config.go?s=2710:2796#L71">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/config.go?s=2710:2796#L71">
       NewConfigWithAuthentication
      </a>
      <a class="permalink" href="#NewConfigWithAuthentication">
@@ -428,7 +428,7 @@ <h3 id="NewConfigWithAuthentication">
     </p>
     <h2 id="Reference">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=3024:3145#L60">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=3024:3145#L60">
       Reference
      </a>
      <a class="permalink" href="#Reference">
@@ -446,7 +446,7 @@ <h2 id="Reference">
 </pre>
     <h2 id="RestError">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/rest_service.go?s=2572:2666#L84">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/rest_service.go?s=2572:2666#L84">
       RestError
      </a>
      <a class="permalink" href="#RestError">
@@ -463,7 +463,7 @@ <h2 id="RestError">
 </pre>
     <h3 id="RestError.Error">
      func (*RestError)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/rest_service.go?s=2715:2751#L90">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/rest_service.go?s=2715:2751#L90">
       Error
      </a>
      <a class="permalink" href="#RestError.Error">
@@ -476,7 +476,7 @@ <h3 id="RestError.Error">
     </p>
     <h2 id="SchemaInfo">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=3197:3381#L67">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=3197:3381#L67">
       SchemaInfo
      </a>
      <a class="permalink" href="#SchemaInfo">
@@ -494,7 +494,7 @@ <h2 id="SchemaInfo">
 </pre>
     <h3 id="SchemaInfo.MarshalJSON">
      func (*SchemaInfo)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=3438:3489#L74">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=3438:3489#L74">
       MarshalJSON
      </a>
      <a class="permalink" href="#SchemaInfo.MarshalJSON">
@@ -507,7 +507,7 @@ <h3 id="SchemaInfo.MarshalJSON">
     </p>
     <h3 id="SchemaInfo.UnmarshalJSON">
      func (*SchemaInfo)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=3802:3853#L87">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=3802:3853#L87">
       UnmarshalJSON
      </a>
      <a class="permalink" href="#SchemaInfo.UnmarshalJSON">
@@ -520,7 +520,7 @@ <h3 id="SchemaInfo.UnmarshalJSON">
     </p>
     <h2 id="SchemaMetadata">
      type
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=4235:4401#L105">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=4235:4401#L105">
       SchemaMetadata
      </a>
      <a class="permalink" href="#SchemaMetadata">
@@ -539,7 +539,7 @@ <h2 id="SchemaMetadata">
 </pre>
     <h3 id="SchemaMetadata.MarshalJSON">
      func (*SchemaMetadata)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=4458:4513#L113">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=4458:4513#L113">
       MarshalJSON
      </a>
      <a class="permalink" href="#SchemaMetadata.MarshalJSON">
@@ -552,7 +552,7 @@ <h3 id="SchemaMetadata.MarshalJSON">
     </p>
     <h3 id="SchemaMetadata.UnmarshalJSON">
      func (*SchemaMetadata)
-     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0-RC2/schemaregistry/schemaregistry_client.go?s=5014:5069#L132">
+     <a href="https://github.com/confluentinc/confluent-kafka-go/blob/v2.2.0/schemaregistry/schemaregistry_client.go?s=5014:5069#L132">
       UnmarshalJSON
      </a>
      <a class="permalink" href="#SchemaMetadata.UnmarshalJSON">
@@ -564,7 +564,7 @@ <h3 id="SchemaMetadata.UnmarshalJSON">
      UnmarshalJSON implements the json.Unmarshaller interface
     </p>
     <div id="footer">
-     Build version go1.18.5.
+     Build version go1.18.2.
      <br/>
      Except as
      <a href="https://developers.google.com/site-policies#restrictions">

diff --git a/soaktest/go.mod b/soaktest/go.mod
@@ -7,7 +7,7 @@ replace github.com/confluentinc/confluent-kafka-go/v2 => ../
 require (
 	github.com/DataDog/datadog-go v4.8.3+incompatible
 	github.com/Microsoft/go-winio v0.6.0 // indirect
-	github.com/confluentinc/confluent-kafka-go/v2 v2.2.0-RC2
+	github.com/confluentinc/confluent-kafka-go/v2 v2.2.0
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect