Skip to content

Commit c6b68a0

Browse files
karenychenserbrech
andauthored
remove deprecated LockRenewalHandler (#218)
Co-authored-by: Stéphane Erbrech <[email protected]>
1 parent 1fd7ed8 commit c6b68a0

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

v2/lockrenewer.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"sync/atomic"
88
"time"
99

10-
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
1110
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus"
1211
"go.opentelemetry.io/otel/attribute"
1312
"go.opentelemetry.io/otel/trace"
@@ -65,17 +64,6 @@ func NewLockRenewalHandler(lockRenewer LockRenewer, options *LockRenewalOptions,
6564
}
6665
}
6766

68-
// Deprecated: use NewLockRenewalHandler
69-
// NewRenewLockHandler starts a renewlock goroutine for each message received.
70-
func NewRenewLockHandler(lockRenewer LockRenewer, interval *time.Duration, handler Handler) HandlerFunc {
71-
return NewLockRenewalHandler(lockRenewer,
72-
&LockRenewalOptions{
73-
Interval: interval,
74-
// default to false on the old handler signature to keep the same behavior
75-
CancelMessageContextOnStop: to.Ptr(false)},
76-
handler)
77-
}
78-
7967
// peekLockRenewer starts a background goroutine that renews the message lock at the given interval until Stop() is called
8068
// or until the passed in context is canceled.
8169
// it is a pass through handler if the renewalInterval is nil

v2/lockrenewer_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -128,23 +128,6 @@ func Test_RenewPeriodically(t *testing.T) {
128128
20*time.Millisecond).Should(Succeed())
129129
}
130130

131-
//nolint:staticcheck // still need to cover the deprecated func
132-
func Test_NewLockRenewerHandler_defaultToNotCancelMessageContext(t *testing.T) {
133-
g := NewWithT(t)
134-
interval := 20 * time.Millisecond
135-
sbRenewer := &fakeSBLockRenewer{
136-
Err: &azservicebus.Error{Code: azservicebus.CodeLockLost},
137-
}
138-
139-
handler := shuttle.NewRenewLockHandler(sbRenewer, &interval,
140-
shuttle.HandlerFunc(func(ctx context.Context, settler shuttle.MessageSettler, message *azservicebus.ReceivedMessage) {
141-
g.Consistently(func(g Gomega) {
142-
g.Expect(ctx.Err()).To(BeNil())
143-
}, "120ms", "10ms").Should(Succeed())
144-
}))
145-
handler.Handle(context.Background(), &fakeSettler{}, &azservicebus.ReceivedMessage{})
146-
}
147-
148131
func Test_RenewPeriodically_Error(t *testing.T) {
149132
type testCase struct {
150133
name string

0 commit comments

Comments
 (0)