merge master and resolve conflicts

Author: wenbingshen

CHANGELOG.md

@@ -23,6 +23,30 @@
 
 All notable changes to this project will be documented in this file.
 
+[0.7.0] 2021-10-31
+
+## Feature
+* Encryption support for producer, see [PR-560](https://github.com/apache/pulsar-client-go/pull/560)
+* Decrytion support for consumer, see [PR-612](https://github.com/apache/pulsar-client-go/pull/612)
+* User-defined metric cardinality, see [PR-604](https://github.com/apache/pulsar-client-go/pull/604)
+* Better support for Azure AD OAuth 2.0, see [PR-630](https://github.com/apache/pulsar-client-go/pull/630), [PR-633](https://github.com/apache/pulsar-client-go/pull/633), [PR-634](https://github.com/apache/pulsar-client-go/pull/634)
+* Removed testing for go versions 1.11 and 1.12, see [PR-632](https://github.com/apache/pulsar-client-go/pull/632)
+* Add epoch to create producer to prevent a duplicate producer when broker is not available., see [PR-582] (https://github.com/apache/pulsar-client-go/pull/582)
+
+## Improve
+* Fix batch size limit validation, see [PR-528](https://github.com/apache/pulsar-client-go/pull/528)
+* Fix logic of command for sendError, see [PR-622](https://github.com/apache/pulsar-client-go/pull/622)
+* Drain connection requests channel without closing, see [PR-645](https://github.com/apache/pulsar-client-go/pull/645)
+* Fix ConsumersOpened counter not incremented when use multitopic or regexp consumer, see [PR-619](https://github.com/apache/pulsar-client-go/pull/619)
+* Fix reconnection logic when topic is deleted, see [PR-627](https://github.com/apache/pulsar-client-go/pull/627)
+* Fix panic when scale down partitions, see [PR-601](https://github.com/apache/pulsar-client-go/pull/601)
+* Fix missing metrics for topics by registration of existing collector, see [PR-600](https://github.com/apache/pulsar-client-go/pull/600)
+* Fix producer panic by oldProducers, see [PR-598](https://github.com/apache/pulsar-client-go/pull/598)
+* Fail pending messages when topic is terminated, see [PR-588](https://github.com/apache/pulsar-client-go/pull/588)
+* Fix handle send error panic, see [PR-576](https://github.com/apache/pulsar-client-go/pull/576)
+
+
+
 [0.6.0] 2021-07-21
 
 ## Feature

README.md

@@ -36,7 +36,7 @@ CGo based library.
 
 ## Requirements
 
-- Go 1.11+
+- Go 1.13+
 
 ## Status
 
@@ -72,8 +72,9 @@ defer producer.Close()
 
 if err != nil {
     fmt.Println("Failed to publish message", err)
+} else {
+    fmt.Println("Published message")
 }
-fmt.Println("Published message")
 ```
 
 Create a Consumer:

VERSION

@@ -1,3 +1,3 @@
 // This version number refers to the currently released version number
 // Please fix the version when release.
-v0.6.0
+v0.7.0

docs/release-process.md

@@ -12,6 +12,9 @@ In general, you need to perform the following steps:
 8. Update the release note.
 9. Announce the release.
 
+### Requirements
+- [GPG keys to sign release artifacts](https://github.com/apache/pulsar/wiki/Create-GPG-keys-to-sign-release-artifacts)
+
 ## Steps in detail
 
 1. Create a release branch.
@@ -65,9 +68,20 @@ $ gpg -b --armor apache-pulsar-client-go-0.X.0-src.tar.gz
 $ shasum -a 512 apache-pulsar-client-go-0.X.0-src.tar.gz > apache-pulsar-client-go-0.X.0-src.tar.gz.sha512 
 ```
 
+Checkout repo for uploading artifacts
+```
+$ svn co https://dist.apache.org/repos/dist/dev/pulsar pulsar-dist-dev
+$ cd pulsar-dist-dev
 ```
-$ mkdir pulsar-client-go-0.X.0-candidate-1
+
+Create a candidate directory at the root repo
+```
+$ svn mkdir pulsar-client-go-0.X.0-candidate-1
 $ cd pulsar-client-go-0.X.0-candidate-1
+```
+
+Copy the signed artifacts into the candiate directory and commit
+```
 $ cp ../apache-pulsar-client-go-0.X.0-* .
 $ svn add *
 $ svn ci -m 'Staging artifacts and signature for Pulsar Client Go release 0.X.0-candidate-1'
@@ -110,7 +124,7 @@ README.md to build and run the pulsar-client-go.
 The vote will be open for at least 72 hours. It is adopted by majority approval, with at least 3 PMC affirmative votes.
 
 Source file:
-https://dist.apache.org/repos/dist/dev/pulsar/pulsar-client-go/apache-pulsar-client-go-0.X.0-src.tar.gz
+https://dist.apache.org/repos/dist/dev/pulsar/pulsar-client-go-0.X.0-candidate-1/apache-pulsar-client-go-0.X.0-src.tar.gz
 
 The tag to be voted upon:
 v0.X.0
@@ -142,8 +156,9 @@ Remove the old releases (if any). We only need the latest release there, older r
 ```
 
 # Get the list of releases
-
-svn ls https://dist.apache.org/repos/dist/release/pulsar/pulsar-client-go/
+```
+svn ls https://dist.apache.org/repos/dist/release/pulsar | grep client-go
+```
 
 # Delete each release (except for the last one)
 

go.mod

@@ -3,29 +3,27 @@ module github.com/apache/pulsar-client-go
 go 1.13
 
 require (
-	github.com/AthenZ/athenz v1.10.15
+	github.com/AthenZ/athenz v1.10.39
 	github.com/DataDog/zstd v1.4.6-0.20210211175136-c6db21d202f4
 	github.com/apache/pulsar-client-go/oauth2 v0.0.0-20201120111947-b8bd55bc02bd
 	github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6
 	github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b
 	github.com/davecgh/go-spew v1.1.1
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.1.2
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/klauspost/compress v1.10.8
 	github.com/linkedin/goavro/v2 v2.9.8
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pierrec/lz4 v2.0.5+incompatible
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.7.1
-	github.com/sirupsen/logrus v1.4.2
+	github.com/prometheus/client_golang v1.11.0
+	github.com/sirupsen/logrus v1.6.0
 	github.com/spaolacci/murmur3 v1.1.0
-	github.com/spf13/cobra v0.0.3
-	github.com/spf13/pflag v1.0.3 // indirect
-	github.com/stretchr/testify v1.5.1
+	github.com/spf13/cobra v1.2.1
+	github.com/stretchr/testify v1.7.0
 	go.uber.org/atomic v1.7.0
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 )
 
 replace github.com/apache/pulsar-client-go/oauth2 => ./oauth2