Amending http client handling and adding error details to trace

Author: markcowl

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/MockServer/MockHttpServer.cs

@@ -177,8 +177,6 @@ public static void SetupCertificates()
             AzureSMCmdlet.CurrentProfile = profile;
             AzureSession.DataStore = new MemoryDataStore();
             AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory();
-            // Use the default client factory for sql tests
-            AzureSession.ClientFactory = new ClientFactory();
             ProfileClient client = new ProfileClient(profile);
             client.AddOrSetAccount( new AzureAccount
             {

src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Common/SqlDatabaseExceptionHandler.cs

@@ -45,6 +45,15 @@ public static void WriteErrorDetails(
         {
             string requestId;
             ErrorRecord errorRecord = RetrieveExceptionDetails(exception, out requestId);
+            if (!string.IsNullOrEmpty(exception.StackTrace))
+            {
+                cmdlet.WriteWarning(string.Format("Received exception: {0}\n    Stack trace: {1}", exception.Message, exception.StackTrace));
+                var innerException = exception.InnerException;
+                while (innerException != null)
+                {
+                    cmdlet.WriteWarning(string.Format("Inner exception: {0}\n    Stack trace: {1}", innerException.Message, innerException.StackTrace));
+                }
+            }
 
             // Write the request Id as a warning
             if (requestId != null)

src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceCertAuth.cs

@@ -1314,12 +1314,19 @@ private RestoreDatabaseOperation CreateRestoreDatabaseOperationFromResponse(Rest
         /// <param name="sqlManagementClient">The client to add the headers on.</param>
         private void AddTracingHeaders(SqlManagementClient sqlManagementClient)
         {
-            sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
-                Constants.ClientSessionIdHeaderName,
-                this.ClientSessionId);
-            sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
-                Constants.ClientRequestIdHeaderName,
-                this.ClientRequestId);
+            try
+            {
+                sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
+                    Constants.ClientSessionIdHeaderName,
+                    this.ClientSessionId);
+                sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
+                    Constants.ClientRequestIdHeaderName,
+                    this.ClientRequestId);
+            }
+            catch
+            {
+                // do not fail if the http client is being reused
+            }
         }
 
         /// <summary>

src/ServiceManagement/Sql/Commands.SqlDatabase/SqlDatabaseCmdletBase.cs

@@ -64,8 +64,15 @@ protected SqlManagementClient GetCurrentSqlClient()
             AzureSubscription subscription = Profile.Context.Subscription;
             SqlDatabaseCmdletBase.ValidateSubscription(subscription);
             SqlManagementClient client = AzureSession.ClientFactory.CreateClient<SqlManagementClient>(Profile, subscription, AzureEnvironment.Endpoint.ServiceManagement);
-            client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientSessionIdHeaderName, clientSessionId);
-            client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, clientRequestId);
+            try
+            {
+                client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientSessionIdHeaderName, clientSessionId);
+                client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, clientRequestId);
+            }
+            catch
+            {
+                // do not fail if the http client is being reused
+            }
             return client;
         }