Prepare for release (#33456)

* Prepare for release * Add change
Azure · Jan 12, 2023 · 8e09b3b · 8e09b3b
1 parent 6b30cc4
commit 8e09b3b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md b/sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md
@@ -1,14 +1,23 @@
 # Release History
 
-## 7.12.0-beta.1 (Unreleased)
+## 7.12.0 (2023-01-12)
+
+### Acknowledgments
+Thank you to our developer community members who helped to make the Service Bus client library better with their contributions to this release:
+
+- Daniel Marbach  _([GitHub](https://github.com/danielmarbach))_
 
 ### Features Added
 
-### Breaking Changes
+- Added `UpdatePrefetchCount` methods to `ServiceBusProcessor` and `ServiceBusSessionProcessor` to allow updating the prefetch count of a running processor. _(A community contribution, courtesy of [danielmarbach](https://github.com/danielmarbach))_
+
+### Other Changes
+
+- Update AMQP library dependency to leverage new `DrainAsync` method.
 
 ### Bugs Fixed
 
-### Other Changes
+- Fixed issue with `MaxConcurrentCallsPerSession` setting which resulted in the setting not always being respected.
 
 ## 7.11.1 (2022-11-08)
 

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
@@ -277,7 +277,7 @@ protected ServiceBusProcessor(Azure.Messaging.ServiceBus.ServiceBusClient client
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public override string ToString() { throw null; }
         public void UpdateConcurrency(int maxConcurrentCalls) { }
-        public void UpdatePrefetch(int prefetchCount) { }
+        public void UpdatePrefetchCount(int prefetchCount) { }
     }
     public partial class ServiceBusProcessorOptions
     {
@@ -501,7 +501,7 @@ protected ServiceBusSessionProcessor(Azure.Messaging.ServiceBus.ServiceBusClient
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public override string ToString() { throw null; }
         public void UpdateConcurrency(int maxConcurrentSessions, int maxConcurrentCallsPerSession) { }
-        public void UpdatePrefetch(int prefetchCount) { }
+        public void UpdatePrefetchCount(int prefetchCount) { }
     }
     public partial class ServiceBusSessionProcessorOptions
     {

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Azure Service Bus is a fully managed enterprise integration message broker. Service Bus can decouple applications and services. Service Bus offers a reliable and secure platform for asynchronous transfer of data and state. This client library allows for both sending and receiving messages using Azure Service Bus. For more information about Service Bus, see https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview</Description>
-    <Version>7.12.0-beta.1</Version>
+    <Version>7.12.0</Version>
     <!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
     <ApiCompatVersion>7.11.1</ApiCompatVersion>
     <PackageTags>Azure;Service Bus;ServiceBus;.NET;AMQP;$(PackageCommonTags)</PackageTags>

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Processor/ServiceBusProcessor.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Processor/ServiceBusProcessor.cs
@@ -1048,7 +1048,7 @@ public void UpdateConcurrency(int maxConcurrentCalls)
         /// </summary>
         /// <param name="prefetchCount">The new prefetch count value. This will be reflected in the <see cref="ServiceBusProcessor.PrefetchCount"/>
         /// property.</param>
-        public void UpdatePrefetch(int prefetchCount)
+        public void UpdatePrefetchCount(int prefetchCount)
         {
             lock (_optionsLock)
             {

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Processor/ServiceBusSessionProcessor.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Processor/ServiceBusSessionProcessor.cs
@@ -343,9 +343,9 @@ public void UpdateConcurrency(int maxConcurrentSessions, int maxConcurrentCallsP
         /// </summary>
         /// <param name="prefetchCount">The new prefetch count value. This will be reflected in the <see cref="ServiceBusProcessor.PrefetchCount"/>
         /// property.</param>
-        public void UpdatePrefetch(int prefetchCount)
+        public void UpdatePrefetchCount(int prefetchCount)
         {
-            InnerProcessor.UpdatePrefetch(prefetchCount);
+            InnerProcessor.UpdatePrefetchCount(prefetchCount);
         }
     }
 }
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/ProcessorLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/ProcessorLiveTests.cs
@@ -1099,7 +1099,7 @@ async Task ProcessMessage(ProcessMessageEventArgs args)
                     // decrease prefetch
                     if (count == 100)
                     {
-                        processor.UpdatePrefetch(1);
+                        processor.UpdatePrefetchCount(1);
                         Assert.AreEqual(20, processor.MaxConcurrentCalls);
                         Assert.AreEqual(1, processor.PrefetchCount);
                     }
@@ -1108,7 +1108,7 @@ async Task ProcessMessage(ProcessMessageEventArgs args)
                     if (count == 150)
                     {
                         Assert.LessOrEqual(processor.TaskTuples.Where(t => !t.Task.IsCompleted).Count(), 20);
-                        processor.UpdatePrefetch(10);
+                        processor.UpdatePrefetchCount(10);
                         Assert.AreEqual(20, processor.MaxConcurrentCalls);
                         Assert.AreEqual(10, processor.PrefetchCount);
                     }

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/SessionProcessorLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/SessionProcessorLiveTests.cs
@@ -2257,7 +2257,7 @@ async Task ProcessMessage(ProcessSessionMessageEventArgs args)
 
                     if (count == 5)
                     {
-                        processor.UpdatePrefetch(2);
+                        processor.UpdatePrefetchCount(2);
                         Assert.AreEqual(2, processor.PrefetchCount);
                         Assert.AreEqual(1, processor.MaxConcurrentSessions);
                         Assert.AreEqual(1, processor.MaxConcurrentCallsPerSession);
@@ -2272,7 +2272,7 @@ async Task ProcessMessage(ProcessSessionMessageEventArgs args)
                     }
                     if (count == 75)
                     {
-                        processor.UpdatePrefetch(1);
+                        processor.UpdatePrefetchCount(1);
                         Assert.AreEqual(1, processor.PrefetchCount);
                         Assert.AreEqual(1, processor.MaxConcurrentSessions);
                         Assert.AreEqual(1, processor.MaxConcurrentCallsPerSession);