Merge pull request Azure#3788 from begoldsm/preview

Target perf regression fix to preview branch - ADLS

Author: markcowl

src/ResourceManager/DataLakeStore/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* For `Import-AzureRMDataLakeStoreItem` and `Export-AzureRMDataLakeStoreItem` trace logging has been disabled by default to improve performance. If trace logging is desired please use the `-DiagnosticLogLevel` and `-DiagnosticLogPath` parameters
 
 ## Version 3.6.0
 * Add support for head and tail to the `Get-AzureRMDataLakeStoreItemContent` cmdlet. This enables returning the top N or last N new line delimited rows to be displayed.

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ExportAzureRmDataLakeStoreItem.cs

@@ -18,6 +18,7 @@
 using Microsoft.Rest.Azure;
 using System.Management.Automation;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Microsoft.Rest;
 
 namespace Microsoft.Azure.Commands.DataLakeStore
 {
@@ -148,6 +149,7 @@ public override void ExecuteCmdlet()
                     DataLakeStoreTraceLogger logger = null;
                     var originalLevel = AdalTrace.TraceSource.Switch.Level;
                     var originalLegacyLevel = AdalTrace.LegacyTraceSwitch.Level;
+                    var previousTracing = ServiceClientTracing.IsEnabled;
                     try
                     {
                         if (ParameterSetName.Equals(DiagnosticParameterSetName) && DiagnosticLogLevel != LogLevel.None)
@@ -156,6 +158,13 @@ public override void ExecuteCmdlet()
                             logger = new DataLakeStoreTraceLogger(this, diagnosticPath, DiagnosticLogLevel);
                         }
 
+                        if (logger == null)
+                        {
+                            // if the caller does not explicitly want logging, we will explicitly turn it off
+                            // for performance reasons
+                            ServiceClientTracing.IsEnabled = false;
+                        }
+
                         if (type == FileType.FILE)
                         {
                             DataLakeStoreFileSystemClient.CopyFile(powerShellReadyPath, Account, Path.TransformedPath, CmdletCancellationToken,
@@ -173,6 +182,8 @@ public override void ExecuteCmdlet()
                     }
                     finally
                     {
+                        // set service client tracing back always
+                        ServiceClientTracing.IsEnabled = previousTracing;
                         if (logger != null)
                         {
                             // dispose and free the logger.

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ImportAzureRmDataLakeStoreItem.cs

@@ -15,6 +15,7 @@
 using Microsoft.Azure.Commands.DataLakeStore.Models;
 using Microsoft.Azure.Commands.DataLakeStore.Properties;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Microsoft.Rest;
 using System.IO;
 using System.Management.Automation;
 
@@ -153,6 +154,7 @@ public override void ExecuteCmdlet()
                     DataLakeStoreTraceLogger logger = null;
                     var originalLevel = AdalTrace.TraceSource.Switch.Level;
                     var originalLegacyLevel = AdalTrace.LegacyTraceSwitch.Level;
+                    var previousTracing = ServiceClientTracing.IsEnabled;
                     try
                     {
                         if (ParameterSetName.Equals(DiagnosticParameterSetName) && DiagnosticLogLevel != LogLevel.None)
@@ -161,6 +163,13 @@ public override void ExecuteCmdlet()
                             logger = new DataLakeStoreTraceLogger(this, diagnosticPath, DiagnosticLogLevel);                            
                         }
 
+                        if (logger == null)
+                        {
+                            // if the caller does not explicitly want logging, we will explicitly turn it off
+                            // for performance reasons
+                            ServiceClientTracing.IsEnabled = false;
+                        }
+
                         if (Directory.Exists(powerShellSourcePath))
                         {
                             DataLakeStoreFileSystemClient.CopyDirectory(
@@ -200,6 +209,8 @@ public override void ExecuteCmdlet()
                     }
                     finally
                     {
+                        // set service client tracing back always
+                        ServiceClientTracing.IsEnabled = previousTracing;
                         if (logger != null)
                         {
                             // dispose and free the logger.