From 79b95f8ad34e29a9d742e757a97435d8b8fb97c6 Mon Sep 17 00:00:00 2001
From: Joel Hendrix <jhendrix@microsoft.com>
Date: Thu, 12 Aug 2021 17:39:04 -0700
Subject: [PATCH 1/2] Retry refreshing credentials

Don't exit the refresh goroutine on error, retry instead.
---
 namespace.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/namespace.go b/namespace.go
index 2f60c3f..7492dc6 100644
--- a/namespace.go
+++ b/namespace.go
@@ -266,10 +266,20 @@ func (ns *Namespace) negotiateClaim(ctx context.Context, client *amqp.Client, en
 				case <-time.After(15 * time.Minute):
 					refreshCtx, span := ns.startSpanFromContext(refreshCtx, "sb.namespace.negotiateClaim.refresh")
 					defer span.End()
-					if err := cbs.NegotiateClaim(refreshCtx, audience, client, ns.TokenProvider); err != nil {
+					// refresh credentials until it succeeds
+					for {
+						err := cbs.NegotiateClaim(refreshCtx, audience, client, ns.TokenProvider)
+						if err == nil {
+							break
+						}
+						// the refresh failed, wait a few seconds then try again
 						tab.For(refreshCtx).Error(err)
-						// if auth failed cancel auto-refresh
-						cancel()
+						select {
+						case <-refreshCtx.Done():
+							break
+						case <-time.After(5 * time.Second):
+							// retry
+						}
 					}
 				}
 			}

From 0a8f011a902a531628de11ced0e7ee3c4d3ee801 Mon Sep 17 00:00:00 2001
From: Joel Hendrix <jhendrix@microsoft.com>
Date: Thu, 12 Aug 2021 17:52:20 -0700
Subject: [PATCH 2/2] update changelog and version info

---
 changelog.md | 5 +++++
 namespace.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 743e70f..052b6fe 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## `v0.10.16`
+
+- fixed an issue where links weren't being closed when retrying
+- fixed an issue where auto-refreshing of claims would exit due to a transient error
+
 ## `v0.10.15`
 
 - fix issue where deferring a message could result us encoding it incorrectly and sending the sequence 
diff --git a/namespace.go b/namespace.go
index 7492dc6..f49efd0 100644
--- a/namespace.go
+++ b/namespace.go
@@ -52,7 +52,7 @@ const (
 	//`
 
 	// Version is the semantic version number
-	Version = "0.10.11"
+	Version = "0.10.16"
 
 	rootUserAgent = "/golang-service-bus"