Bring semaphore synchronization updates in retry delegating handler t…

…o LTS (#3148) * fix(iot-dev): Fix bug where client's retry policy applied n^2 times rather than n times (#2209) * Fix synchronization of semaphore in retry delegating handler (#3135) --------- Co-authored-by: timtay-microsoft <[email protected]>
Azure · Mar 8, 2023 · 6463887 · 6463887
1 parent 784e866
commit 6463887
Show file tree

Hide file tree

Showing 8 changed files with 616 additions and 316 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -151,7 +151,7 @@ Function BuildPackage($path, $message)
         SignDotNetBinary $filesToSign
     }
 
-    & dotnet pack --verbosity $verbosity --configuration $configuration --no-build --include-symbols --include-source --output $localPackages
+    & dotnet pack --verbosity $verbosity --configuration $configuration --no-build --include-symbols --include-source --property:PackageOutputPath=$localPackages
 
     if ($LASTEXITCODE -ne 0)
     {

diff --git a/e2e/test/iothub/FileUploadE2ETests.cs b/e2e/test/iothub/FileUploadE2ETests.cs
@@ -97,6 +97,7 @@ public async Task FileUpload_SmallFile_Http_GranularSteps_x509()
 
         [LoggedTestMethod]
         [TestCategory("LongRunning")]
+        [TestCategory("Proxy")]
         public async Task FileUpload_SmallFile_Http_GranularSteps_Proxy()
         {
             string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false);

diff --git a/e2e/test/iothub/service/RegistryManagerE2ETests.cs b/e2e/test/iothub/service/RegistryManagerE2ETests.cs
@@ -117,6 +117,7 @@ public async Task RegistryManager_AddDeviceWithTwinWithDeviceCapabilities()
         }
 
         [LoggedTestMethod]
+        [TestCategory("Proxy")]
         public async Task RegistryManager_AddDeviceWithProxy()
         {
             string deviceId = _devicePrefix + Guid.NewGuid();

diff --git a/iothub/device/src/Transport/DefaultDelegatingHandler.cs b/iothub/device/src/Transport/DefaultDelegatingHandler.cs
@@ -11,8 +11,9 @@ namespace Microsoft.Azure.Devices.Client.Transport
 {
     internal abstract class DefaultDelegatingHandler : IDelegatingHandler
     {
-        private volatile IDelegatingHandler _innerHandler;
+        protected const string ClientDisposedMessage = "The client has been disposed and is no longer usable.";
         protected volatile bool _disposed;
+        private volatile IDelegatingHandler _innerHandler;
 
         protected DefaultDelegatingHandler(IPipelineContext context, IDelegatingHandler innerHandler)
         {
@@ -208,7 +209,7 @@ protected void ThrowIfDisposed()
         {
             if (_disposed)
             {
-                throw new ObjectDisposedException("IoT Client");
+                throw new ObjectDisposedException("IoT client", ClientDisposedMessage);
             }
         }
 

diff --git a/iothub/device/src/Transport/RetryDelegatingHandler.cs b/iothub/device/src/Transport/RetryDelegatingHandler.cs
diff --git a/iothub/device/tests/RetryDelegatingHandlerTests.cs b/iothub/device/tests/RetryDelegatingHandlerTests.cs
diff --git a/iothub/service/src/IoTHubExceptionResult.cs b/iothub/service/src/IoTHubExceptionResult.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Devices
@@ -10,6 +11,8 @@ namespace Microsoft.Azure.Devices
     /// </summary>
     internal class IoTHubExceptionResult
     {
+        [SuppressMessage("Usage", "CA1507: Use nameof in place of string literal 'Message'",
+            Justification = "This JsonProperty annotation depends on service-defined contract (name) and is independent of the property name selected by the SDK.")]
         [JsonProperty("Message")]
         internal string Message { get; set; }
     }

diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml
@@ -532,13 +532,8 @@ jobs:
     pool:
       vmImage: windows-2022
     steps:
-      - script: |
-          rem Run dotnet first experience.
-          dotnet new
-          rem Start build
-          build.cmd -clean -build -configuration Debug -package
-
-        displayName: build
+      - powershell: .\build.ps1 -clean -build -configutaion Debug -package
+        displayName: Build Package
 
       - task: ComponentGovernanceComponentDetection@0
         displayName: "Component Detection"