Merge pull request #3643 from Particular/backport-missing-commits

Backport missing commits
Particular · Jul 20, 2023 · 02388c6 · 02388c6
2 parents 76ede43 + 0f3ee05
commit 02388c6
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -27,7 +27,7 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageVersion Include="Microsoft.Owin.Cors" Version="4.2.2" />
     <PackageVersion Include="Mindscape.Raygun4Net" Version="5.13.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
@@ -48,7 +48,7 @@
     <PackageVersion Include="NServiceBus.RabbitMQ" Version="7.0.5" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="3.0.1" />
     <PackageVersion Include="NServiceBus.Testing" Version="7.4.2" />
-    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="2.0.5" />
+    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="2.0.6" />
     <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="10.0.4" />
     <PackageVersion Include="NServiceBus.Transport.Msmq" Version="1.2.1" />
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="6.3.4" />

diff --git a/src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/InstanceName.cs b/src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/InstanceName.cs
@@ -7,10 +7,10 @@ class InstanceName
     {
         [Test]
         [TestCase("Foo/*", "Foo")]
-        [TestCase("Foo     ", "Foo.")]
+        [TestCase("Foo     ", "Foo")]
         [TestCase("  Foo/*", "Foo")]
-        [TestCase("  Foo     ", "Foo.")]
-        [TestCase("  Foo a     ", "Foo.a.")]
+        [TestCase("  Foo     ", "Foo")]
+        [TestCase("  Foo a     ", "Foo.a")]
         [TestCase(@"<foo", "foo")]
         [TestCase(@">  foo", "foo")]
         [TestCase(@"foo | foo", "foo.foo")]

diff --git a/src/ServiceControl.Config.Tests/AddInstance/InstanceName.cs b/src/ServiceControl.Config.Tests/AddInstance/InstanceName.cs
@@ -27,10 +27,10 @@ public void Add_instance_name_taken_adds_1_to_instance_name()
 
         [Test]
         [TestCase("Foo/*", "Foo")]
-        [TestCase("Foo     ", "Foo.")]
+        [TestCase("Foo     ", "Foo")]
         [TestCase("  Foo/*", "Foo")]
-        [TestCase("  Foo     ", "Foo.")]
-        [TestCase("  Foo a     ", "Foo.a.")]
+        [TestCase("  Foo     ", "Foo")]
+        [TestCase("  Foo a     ", "Foo.a")]
         [TestCase(@"<foo", "foo")]
         [TestCase(@">  foo", "foo")]
         [TestCase(@"foo | foo", "foo.foo")]

diff --git a/src/ServiceControl.Config/Extensions/InstanceNameExtensions.cs b/src/ServiceControl.Config/Extensions/InstanceNameExtensions.cs
@@ -36,7 +36,7 @@ public static string SanitizeInstanceName(this string instanceName)
 
             instanceName = serviceNameBuilder.ToString();
 
-            instanceName = instanceName.TrimStart();
+            instanceName = instanceName.Trim();
 
             instanceName = ReplaceSpacesWithPeriods(instanceName);
 

diff --git a/src/ServiceControl.Config/UI/InstanceDetails/InstanceDetailsView.xaml b/src/ServiceControl.Config/UI/InstanceDetails/InstanceDetailsView.xaml
@@ -26,7 +26,7 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="90" />
             <RowDefinition Height="8" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
@@ -231,7 +231,7 @@
         <GroupBox Grid.Row="8"
                   Header="TRANSPORT"
                   HeaderTemplate="{StaticResource SimpleHeaderedGroupBox}">
-            <TextBlock FontSize="14px" Text="{Binding Transport.Name}" />
+            <TextBlock FontSize="14px" Text="{Binding Transport.Name}" TextWrapping="WrapWithOverflow" />
         </GroupBox>
         <GroupBox Grid.Row="8"
                    Grid.Column="1"

diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
@@ -7,7 +7,6 @@
   "ValidateConfiguration": true,
   "ExternalIntegrationsDispatchingBatchSize": 100,
   "DisableExternalIntegrationsPublishing": false,
-  "DisableRavenDBPerformanceCounters": false,
   "SkipQueueCreation": false,
   "RunCleanupBundle": false,
   "RootUrl": "http://localhost:8888/",

diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClr.approved.txt
@@ -72,7 +72,6 @@ namespace ServiceBus.Management.Infrastructure.Settings
         public string DbPath { get; set; }
         public bool DisableExternalIntegrationsPublishing { get; set; }
         public bool DisableHealthChecks { get; set; }
-        public bool DisableRavenDBPerformanceCounters { get; set; }
         public string EmailDropFolder { get; set; }
         public bool EnableFullTextSearchOnBodies { get; set; }
         public string ErrorLogQueue { get; set; }

diff --git a/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClrHosting.approved.txt b/src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PublicClrHosting.approved.txt
@@ -29,7 +29,6 @@ namespace ServiceBus.Management.Infrastructure.Settings
         public string DbPath { get; set; }
         public bool DisableExternalIntegrationsPublishing { get; set; }
         public bool DisableHealthChecks { get; set; }
-        public bool DisableRavenDBPerformanceCounters { get; set; }
         public string EmailDropFolder { get; set; }
         public bool EnableFullTextSearchOnBodies { get; set; }
         public string ErrorLogQueue { get; set; }

diff --git a/src/ServiceControl/Infrastructure/Settings/Settings.cs b/src/ServiceControl/Infrastructure/Settings/Settings.cs
@@ -74,8 +74,6 @@ public Settings(string serviceName = null)
 
         public bool DisableExternalIntegrationsPublishing { get; set; }
 
-        public bool DisableRavenDBPerformanceCounters { get; set; }
-
         public bool SkipQueueCreation { get; set; }
 
         public bool RunCleanupBundle { get; set; }

diff --git a/src/ServiceControl/MessageFailures/Handlers/MessageFailureResolvedHandler.cs b/src/ServiceControl/MessageFailures/Handlers/MessageFailureResolvedHandler.cs
@@ -43,7 +43,12 @@ public async Task Handle(MarkPendingRetriesAsResolved message, IMessageHandlerCo
                 {
                     while (await ie.MoveNextAsync().ConfigureAwait(false))
                     {
-                        await context.SendLocal<MarkPendingRetryAsResolved>(m => m.FailedMessageId = ie.Current.Document.Id)
+                        var sendOptions = new SendOptions();
+                        sendOptions.RouteToThisEndpoint();
+                        // In AzureServiceBus transport there is a limit of 100 messages being sent in a single transaction
+                        // These do not need to be transactionally consistent so we can dispatch the messages immediately
+                        sendOptions.RequireImmediateDispatch();
+                        await context.Send<MarkPendingRetryAsResolved>(m => m.FailedMessageId = ie.Current.Document.Id, sendOptions)
                             .ConfigureAwait(false);
                     }
                 }