enable MSAL logging

Azure · Mar 26, 2021 · bd0a6f0 · bd0a6f0
1 parent be06367
commit bd0a6f0
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/sdk/identity/Azure.Identity/src/AzureIdentityEventSource.cs b/sdk/identity/Azure.Identity/src/AzureIdentityEventSource.cs
@@ -21,6 +21,10 @@ internal sealed class AzureIdentityEventSource : EventSource
         private const int ProbeImdsEndpointEvent = 4;
         private const int ImdsEndpointFoundEvent = 5;
         private const int ImdsEndpointUnavailableEvent = 6;
+        private const int MsalLogVerboseEvent = 7;
+        private const int MsalLogInfoEvent = 8;
+        private const int MsalLogWarningEvent = 9;
+        private const int MsalLogErrorEvent = 10;
 
         private AzureIdentityEventSource() : base(EventSourceName, EventSourceSettings.Default, AzureEventSourceListener.TraitName, AzureEventSourceListener.TraitValue) { }
 
@@ -151,6 +155,55 @@ private static string FormatException(Exception ex)
             return sb.ToString();
         }
 
+        [NonEvent]
+        public void LogMsal(Microsoft.Identity.Client.LogLevel level, string message, bool containsPii)
+        {
+            if (!containsPii)
+            {
+                switch (level)
+                {
+                    case Microsoft.Identity.Client.LogLevel.Error:
+                        LogMsalError(message);
+                        break;
+                    case Microsoft.Identity.Client.LogLevel.Warning:
+                        LogMsalWarning(message);
+                        break;
+                    case Microsoft.Identity.Client.LogLevel.Info:
+                        LogMsalInformational(message);
+                        break;
+                    case Microsoft.Identity.Client.LogLevel.Verbose:
+                        LogMsalVerbose(message);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        [Event(MsalLogErrorEvent, Level = EventLevel.Error, Message = "{0}")]
+        public void LogMsalError(string message)
+        {
+            WriteEvent(MsalLogErrorEvent, message);
+        }
+
+        [Event(MsalLogWarningEvent, Level = EventLevel.Warning, Message = "{0}")]
+        public void LogMsalWarning(string message)
+        {
+            WriteEvent(MsalLogWarningEvent, message);
+        }
+
+        [Event(MsalLogInfoEvent, Level = EventLevel.Informational, Message = "{0}")]
+        public void LogMsalInformational(string message)
+        {
+            WriteEvent(MsalLogInfoEvent, message);
+        }
+
+        [Event(MsalLogVerboseEvent, Level = EventLevel.Verbose, Message = "{0}")]
+        public void LogMsalVerbose(string message)
+        {
+            WriteEvent(MsalLogVerboseEvent, message);
+        }
+
         [NonEvent]
         private static string FormatStringArray(string[] array)
         {

diff --git a/sdk/identity/Azure.Identity/src/MsalPublicClient.cs b/sdk/identity/Azure.Identity/src/MsalPublicClient.cs
@@ -31,7 +31,7 @@ protected override ValueTask<IPublicClientApplication> CreateClientAsync(bool as
 
             var authorityUri = new UriBuilder(authorityHost.Scheme, authorityHost.Host, authorityHost.Port, TenantId ?? Constants.OrganizationsTenantId).Uri;
 
-            PublicClientApplicationBuilder pubAppBuilder = PublicClientApplicationBuilder.Create(ClientId).WithAuthority(authorityUri).WithHttpClientFactory(new HttpPipelineClientFactory(Pipeline.HttpPipeline));
+            PublicClientApplicationBuilder pubAppBuilder = PublicClientApplicationBuilder.Create(ClientId).WithAuthority(authorityUri).WithHttpClientFactory(new HttpPipelineClientFactory(Pipeline.HttpPipeline)).WithLogging(AzureIdentityEventSource.Singleton.LogMsal);
 
             if (!string.IsNullOrEmpty(RedirectUrl))
             {