reducing ILogger messages in SecretManager

brettsam · brettsam · commit 7685cbe750ca · 2019-09-30T17:51:37.000-07:00
diff --git a/src/WebJobs.Script.WebHost/GlobalSuppressions.cs b/src/WebJobs.Script.WebHost/GlobalSuppressions.cs
@@ -106,7 +106,6 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.DefaultSecretsRepositoryFactory.#Create(Microsoft.Azure.WebJobs.Script.Config.ScriptSettingsManager,Microsoft.Azure.WebJobs.Script.WebHost.WebHostSettings,Microsoft.Azure.WebJobs.Script.ScriptHostConfiguration)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1014:MarkAssembliesWithClsCompliant")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.DefaultSecretManagerFactory.#Create(Microsoft.Azure.WebJobs.Script.Config.ScriptSettingsManager,Microsoft.Azure.WebJobs.Host.TraceWriter,Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Azure.WebJobs.Script.WebHost.ISecretsRepository)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.SecretManager.#.ctor(Microsoft.Azure.WebJobs.Script.WebHost.ISecretsRepository,Microsoft.Azure.WebJobs.Script.WebHost.IKeyValueConverterFactory,Microsoft.Azure.WebJobs.Host.TraceWriter,Microsoft.Extensions.Logging.ILoggerFactory,System.Boolean)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "host", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.StandbyManager.#WarmUp(Microsoft.Azure.WebJobs.Script.ScriptHost)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "settings", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.WebHostResolver.#GetPerformanceManager(Microsoft.Azure.WebJobs.Script.WebHost.WebHostSettings)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2213:DisposableFieldsShouldBeDisposed", MessageId = "_specializationTimer", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.WebHostResolver.#Dispose()")]
@@ -126,4 +125,4 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.WebScriptHostManager.#.ctor(Microsoft.Azure.WebJobs.Script.ScriptHostConfiguration,Microsoft.Azure.WebJobs.Script.WebHost.ISecretManagerFactory,Microsoft.Azure.WebJobs.Script.Eventing.IScriptEventManager,Microsoft.Azure.WebJobs.Script.Config.ScriptSettingsManager,Microsoft.Azure.WebJobs.Script.WebHost.WebHostSettings,Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Azure.WebJobs.Script.IScriptHostFactory,Microsoft.Azure.WebJobs.Script.WebHost.ISecretsRepositoryFactory,Microsoft.Azure.WebJobs.Script.Scale.HostPerformanceManager,System.Int32,System.Int32)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2213:DisposableFieldsShouldBeDisposed", MessageId = "_syncTimer", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.WebScriptHostManager.#Dispose(System.Boolean)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "config", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.Extensions.FunctionMetadataExtensions.#GetTestData(System.String,Microsoft.Azure.WebJobs.Script.ScriptHostConfiguration)")]
-
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.WebHost.SecretManager.#.ctor(Microsoft.Azure.WebJobs.Script.WebHost.ISecretsRepository,Microsoft.Azure.WebJobs.Script.WebHost.IKeyValueConverterFactory,Microsoft.Azure.WebJobs.Host.TraceWriter,System.Boolean)")]
diff --git a/src/WebJobs.Script.WebHost/Security/DefaultSecretManagerFactory.cs b/src/WebJobs.Script.WebHost/Security/DefaultSecretManagerFactory.cs
@@ -1,11 +1,6 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Extensions.Logging;
@@ -15,6 +10,6 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost
     public sealed class DefaultSecretManagerFactory : ISecretManagerFactory
     {
         public ISecretManager Create(ScriptSettingsManager settingsManager, TraceWriter traceWriter, ILoggerFactory loggerFactory, ISecretsRepository secretsRepository)
-            => new SecretManager(settingsManager, secretsRepository, traceWriter, loggerFactory);
+            => new SecretManager(settingsManager, secretsRepository, traceWriter);
     }
 }
diff --git a/src/WebJobs.Script.WebHost/Security/SecretManager.cs b/src/WebJobs.Script.WebHost/Security/SecretManager.cs
@@ -24,7 +24,6 @@ public class SecretManager : IDisposable, ISecretManager
         private readonly ConcurrentDictionary<string, Dictionary<string, string>> _secretsMap = new ConcurrentDictionary<string, Dictionary<string, string>>();
         private readonly IKeyValueConverterFactory _keyValueConverterFactory;
         private readonly TraceWriter _traceWriter;
-        private readonly ILogger _logger;
         private readonly ISecretsRepository _repository;
         private HostSecretsInfo _hostSecrets;
         private SemaphoreSlim _hostSecretsLock = new SemaphoreSlim(1, 1);
@@ -34,18 +33,17 @@ public SecretManager()
         {
         }
 
-        public SecretManager(ScriptSettingsManager settingsManager, ISecretsRepository repository, TraceWriter traceWriter, ILoggerFactory loggerFactory, bool createHostSecretsIfMissing = false)
-            : this(repository, new DefaultKeyValueConverterFactory(settingsManager), traceWriter, loggerFactory, createHostSecretsIfMissing)
+        public SecretManager(ScriptSettingsManager settingsManager, ISecretsRepository repository, TraceWriter traceWriter, bool createHostSecretsIfMissing = false)
+            : this(repository, new DefaultKeyValueConverterFactory(settingsManager), traceWriter, createHostSecretsIfMissing)
         {
         }
 
-        public SecretManager(ISecretsRepository repository, IKeyValueConverterFactory keyValueConverterFactory, TraceWriter traceWriter, ILoggerFactory loggerFactory, bool createHostSecretsIfMissing = false)
+        public SecretManager(ISecretsRepository repository, IKeyValueConverterFactory keyValueConverterFactory, TraceWriter traceWriter, bool createHostSecretsIfMissing = false)
         {
             _repository = repository;
             _keyValueConverterFactory = keyValueConverterFactory;
             _traceWriter = traceWriter;
             _repository.SecretsChanged += OnSecretsChanged;
-            _logger = loggerFactory?.CreateLogger(ScriptConstants.LogCategoryKeys);
 
             if (createHostSecretsIfMissing)
             {
@@ -55,7 +53,6 @@ public SecretManager(ISecretsRepository repository, IKeyValueConverterFactory ke
 
             string message = string.Format(Resources.TraceSecretsRepo, repository.ToString());
             _traceWriter.Info(message);
-            _logger?.LogInformation(message);
         }
 
         public void Dispose()
@@ -88,7 +85,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()
                     {
                         // host secrets do not yet exist so generate them
                         _traceWriter.Verbose(Resources.TraceHostSecretGeneration);
-                        _logger?.LogDebug(Resources.TraceHostSecretGeneration);
                         hostSecrets = GenerateHostSecrets();
                         await PersistSecretsAsync(hostSecrets);
                     }
@@ -102,7 +98,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()
                     catch (CryptographicException)
                     {
                         _traceWriter.Verbose(Resources.TraceNonDecryptedHostSecretRefresh);
-                        _logger?.LogDebug(Resources.TraceNonDecryptedHostSecretRefresh);
                         await PersistSecretsAsync(hostSecrets, null, true);
                         hostSecrets = GenerateHostSecrets(hostSecrets);
                         await RefreshSecretsAsync(hostSecrets);
@@ -113,7 +108,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()
                     if (hostSecrets.HasStaleKeys)
                     {
                         _traceWriter.Verbose(Resources.TraceStaleHostSecretRefresh);
-                        _logger?.LogDebug(Resources.TraceStaleHostSecretRefresh);
                         await RefreshSecretsAsync(hostSecrets);
                     }
 
@@ -131,7 +125,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()
             }
 
             _traceWriter.Info(Resources.TraceHostKeysLoaded);
-            _logger?.LogInformation(Resources.TraceHostKeysLoaded);
 
             return _hostSecrets;
         }
@@ -158,7 +151,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s
                     // no secrets exist for this function so generate them
                     string messageGeneratoin = string.Format(Resources.TraceFunctionSecretGeneration, functionName);
                     _traceWriter.Info(messageGeneratoin, traceProperties);
-                    _logger?.LogInformation(messageGeneratoin);
                     secrets = GenerateFunctionSecrets();
 
                     await PersistSecretsAsync(secrets, functionName);
@@ -173,7 +165,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s
                 {
                     string messageNonDecrypted = string.Format(Resources.TraceNonDecryptedFunctionSecretRefresh, functionName);
                     _traceWriter.Info(messageNonDecrypted, traceProperties);
-                    _logger?.LogInformation(messageNonDecrypted);
                     await PersistSecretsAsync(secrets, functionName, true);
                     secrets = GenerateFunctionSecrets(secrets);
                     await RefreshSecretsAsync(secrets, functionName);
@@ -183,7 +174,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s
                 {
                     string messageStaleFunction = string.Format(Resources.TraceStaleFunctionSecretRefresh, functionName);
                     _traceWriter.Info(messageStaleFunction);
-                    _logger?.LogInformation(messageStaleFunction);
                     await RefreshSecretsAsync(secrets, functionName);
                 }
 
@@ -205,7 +195,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s
 
             string messageLoaded = string.Format(Resources.TraceFunctionsKeysLoaded, functionName);
             _traceWriter.Info(messageLoaded);
-            _logger?.LogInformation(messageLoaded);
 
             return functionSecrets;
         }
@@ -232,7 +221,6 @@ public async Task<KeyOperationResult> AddOrUpdateFunctionSecretAsync(string secr
 
             string message = string.Format(Resources.TraceAddOrUpdateFunctionSecret, secretsType, secretName, keyScope ?? "host", result.Result);
             _traceWriter.Info(message);
-            _logger?.LogInformation(message);
 
             return result;
         }
@@ -268,7 +256,6 @@ public async Task<KeyOperationResult> SetMasterKeyAsync(string value = null)
 
             string message = string.Format(Resources.TraceMasterKeyCreatedOrUpdated, result);
             _traceWriter.Info(message);
-            _logger?.LogInformation(message);
 
             return new KeyOperationResult(masterKey, result);
         }
@@ -289,8 +276,6 @@ public async Task<bool> DeleteSecretAsync(string secretName, string keyScope, Sc
 
                 string message = string.Format(Resources.TraceSecretDeleted, target, secretName);
                 _traceWriter.Info(message);
-
-                _logger?.LogInformation(message);
             }
 
             return deleted;
@@ -477,7 +462,6 @@ private async Task PersistSecretsAsync<T>(T secrets, string keyScope = null, boo
                     string message = string.Format(Resources.ErrorTooManySecretBackups, ScriptConstants.MaximumSecretBackupCount, string.IsNullOrEmpty(keyScope) ? "host" : keyScope, await AnalizeSnapshots<T>(secretBackups));
                     TraceEvent traceEvent = new TraceEvent(TraceLevel.Verbose, message);
                     _traceWriter.Info(message);
-                    _logger?.LogInformation(message);
                     throw new InvalidOperationException(message);
                 }
                 await _repository.WriteSnapshotAsync(secretsType, keyScope, ScriptSecretSerializer.SerializeSecrets<T>(secrets));
@@ -489,7 +473,6 @@ private async Task PersistSecretsAsync<T>(T secrets, string keyScope = null, boo
                 secrets.DecryptionKeyId = hashes;
                 string message = $"Encription keys hashes: {hashes}";
                 _traceWriter.Info(message);
-                _logger?.LogInformation(message);
 
                 await _repository.WriteAsync(secretsType, keyScope, ScriptSecretSerializer.SerializeSecrets<T>(secrets));
             }
diff --git a/test/WebJobs.Script.Tests.Integration/FunctionGeneratorEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/FunctionGeneratorEndToEndTests.cs
@@ -112,7 +112,7 @@ internal async Task GeneratedMethods_WithOutParams_DoNotCauseDeadlocks(string fi
             WebHostSettings webHostSettings = new WebHostSettings();
             webHostSettings.SecretsPath = secretsPath;
             var eventManagerMock = new Mock<IScriptEventManager>();
-            var secretManager = new SecretManager(SettingsManager, repository, NullTraceWriter.Instance, null);
+            var secretManager = new SecretManager(SettingsManager, repository, NullTraceWriter.Instance);
             var loggerProvider = new TestLoggerProvider();
             var loggerFactory = new LoggerFactory();
             loggerFactory.AddProvider(loggerProvider);
diff --git a/test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTests.cs b/test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTests.cs
@@ -55,7 +55,7 @@ public WebScriptHostManagerTests(WebScriptHostManagerTests.Fixture fixture)
             };
 
             var secretsRepository = new FileSystemSecretsRepository(_secretsDirectory.Path);
-            SecretManager secretManager = new SecretManager(_settingsManager, secretsRepository, NullTraceWriter.Instance, null);
+            SecretManager secretManager = new SecretManager(_settingsManager, secretsRepository, NullTraceWriter.Instance);
             WebHostSettings webHostSettings = new WebHostSettings
             {
                 SecretsPath = _secretsDirectory.Path
@@ -147,7 +147,7 @@ public async Task EmptyHost_StartsSuccessfully()
             };
             string connectionString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.Storage);
             ISecretsRepository repository = new BlobStorageSecretsRepository(secretsDir, connectionString, "EmptyHost_StartsSuccessfully");
-            ISecretManager secretManager = new SecretManager(_settingsManager, repository, NullTraceWriter.Instance, null);
+            ISecretManager secretManager = new SecretManager(_settingsManager, repository, NullTraceWriter.Instance);
             WebHostSettings webHostSettings = new WebHostSettings();
             webHostSettings.SecretsPath = _secretsDirectory.Path;
             var mockEventManager = new Mock<IScriptEventManager>();
@@ -375,7 +375,7 @@ public Fixture()
                 };
 
                 ISecretsRepository repository = new FileSystemSecretsRepository(SecretsPath);
-                ISecretManager secretManager = new SecretManager(_settingsManager, repository, NullTraceWriter.Instance, null);
+                ISecretManager secretManager = new SecretManager(_settingsManager, repository, NullTraceWriter.Instance);
                 WebHostSettings webHostSettings = new WebHostSettings();
                 webHostSettings.SecretsPath = SecretsPath;
 
diff --git a/test/WebJobs.Script.Tests/Security/SecretManagerTests.cs b/test/WebJobs.Script.Tests/Security/SecretManagerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Linq;`
`7`		`-using System.Text;`
`8`		`-using System.Threading.Tasks;`
`9`	`4`	`using Microsoft.Azure.WebJobs.Host;`
`10`	`5`	`using Microsoft.Azure.WebJobs.Script.Config;`
`11`	`6`	`using Microsoft.Extensions.Logging;`
`@@ -15,6 +10,6 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost`
`15`	`10`	`public sealed class DefaultSecretManagerFactory : ISecretManagerFactory`
`16`	`11`	`{`
`17`	`12`	`public ISecretManager Create(ScriptSettingsManager settingsManager, TraceWriter traceWriter, ILoggerFactory loggerFactory, ISecretsRepository secretsRepository)`
`18`		`- => new SecretManager(settingsManager, secretsRepository, traceWriter, loggerFactory);`
	`13`	`+ => new SecretManager(settingsManager, secretsRepository, traceWriter);`
`19`	`14`	`}`
`20`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public class SecretManager : IDisposable, ISecretManager`
`24`	`24`	`private readonly ConcurrentDictionary<string, Dictionary<string, string>> _secretsMap = new ConcurrentDictionary<string, Dictionary<string, string>>();`
`25`	`25`	`private readonly IKeyValueConverterFactory _keyValueConverterFactory;`
`26`	`26`	`private readonly TraceWriter _traceWriter;`
`27`		`- private readonly ILogger _logger;`
`28`	`27`	`private readonly ISecretsRepository _repository;`
`29`	`28`	`private HostSecretsInfo _hostSecrets;`
`30`	`29`	`private SemaphoreSlim _hostSecretsLock = new SemaphoreSlim(1, 1);`
`@@ -34,18 +33,17 @@ public SecretManager()`
`34`	`33`	`{`
`35`	`34`	`}`
`36`	`35`
`37`		`- public SecretManager(ScriptSettingsManager settingsManager, ISecretsRepository repository, TraceWriter traceWriter, ILoggerFactory loggerFactory, bool createHostSecretsIfMissing = false)`
`38`		`- : this(repository, new DefaultKeyValueConverterFactory(settingsManager), traceWriter, loggerFactory, createHostSecretsIfMissing)`
	`36`	`+ public SecretManager(ScriptSettingsManager settingsManager, ISecretsRepository repository, TraceWriter traceWriter, bool createHostSecretsIfMissing = false)`
	`37`	`+ : this(repository, new DefaultKeyValueConverterFactory(settingsManager), traceWriter, createHostSecretsIfMissing)`
`39`	`38`	`{`
`40`	`39`	`}`
`41`	`40`
`42`		`- public SecretManager(ISecretsRepository repository, IKeyValueConverterFactory keyValueConverterFactory, TraceWriter traceWriter, ILoggerFactory loggerFactory, bool createHostSecretsIfMissing = false)`
	`41`	`+ public SecretManager(ISecretsRepository repository, IKeyValueConverterFactory keyValueConverterFactory, TraceWriter traceWriter, bool createHostSecretsIfMissing = false)`
`43`	`42`	`{`
`44`	`43`	`_repository = repository;`
`45`	`44`	`_keyValueConverterFactory = keyValueConverterFactory;`
`46`	`45`	`_traceWriter = traceWriter;`
`47`	`46`	`_repository.SecretsChanged += OnSecretsChanged;`
`48`		`- _logger = loggerFactory?.CreateLogger(ScriptConstants.LogCategoryKeys);`
`49`	`47`
`50`	`48`	`if (createHostSecretsIfMissing)`
`51`	`49`	`{`
`@@ -55,7 +53,6 @@ public SecretManager(ISecretsRepository repository, IKeyValueConverterFactory ke`
`55`	`53`
`56`	`54`	`string message = string.Format(Resources.TraceSecretsRepo, repository.ToString());`
`57`	`55`	`_traceWriter.Info(message);`
`58`		`- _logger?.LogInformation(message);`
`59`	`56`	`}`
`60`	`57`
`61`	`58`	`public void Dispose()`
`@@ -88,7 +85,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()`
`88`	`85`	`{`
`89`	`86`	`// host secrets do not yet exist so generate them`
`90`	`87`	`_traceWriter.Verbose(Resources.TraceHostSecretGeneration);`
`91`		`- _logger?.LogDebug(Resources.TraceHostSecretGeneration);`
`92`	`88`	`hostSecrets = GenerateHostSecrets();`
`93`	`89`	`await PersistSecretsAsync(hostSecrets);`
`94`	`90`	`}`
`@@ -102,7 +98,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()`
`102`	`98`	`catch (CryptographicException)`
`103`	`99`	`{`
`104`	`100`	`_traceWriter.Verbose(Resources.TraceNonDecryptedHostSecretRefresh);`
`105`		`- _logger?.LogDebug(Resources.TraceNonDecryptedHostSecretRefresh);`
`106`	`101`	`await PersistSecretsAsync(hostSecrets, null, true);`
`107`	`102`	`hostSecrets = GenerateHostSecrets(hostSecrets);`
`108`	`103`	`await RefreshSecretsAsync(hostSecrets);`
`@@ -113,7 +108,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()`
`113`	`108`	`if (hostSecrets.HasStaleKeys)`
`114`	`109`	`{`
`115`	`110`	`_traceWriter.Verbose(Resources.TraceStaleHostSecretRefresh);`
`116`		`- _logger?.LogDebug(Resources.TraceStaleHostSecretRefresh);`
`117`	`111`	`await RefreshSecretsAsync(hostSecrets);`
`118`	`112`	`}`
`119`	`113`
`@@ -131,7 +125,6 @@ public async virtual Task<HostSecretsInfo> GetHostSecretsAsync()`
`131`	`125`	`}`
`132`	`126`
`133`	`127`	`_traceWriter.Info(Resources.TraceHostKeysLoaded);`
`134`		`- _logger?.LogInformation(Resources.TraceHostKeysLoaded);`
`135`	`128`
`136`	`129`	`return _hostSecrets;`
`137`	`130`	`}`
`@@ -158,7 +151,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s`
`158`	`151`	`// no secrets exist for this function so generate them`
`159`	`152`	`string messageGeneratoin = string.Format(Resources.TraceFunctionSecretGeneration, functionName);`
`160`	`153`	`_traceWriter.Info(messageGeneratoin, traceProperties);`
`161`		`- _logger?.LogInformation(messageGeneratoin);`
`162`	`154`	`secrets = GenerateFunctionSecrets();`
`163`	`155`
`164`	`156`	`await PersistSecretsAsync(secrets, functionName);`
`@@ -173,7 +165,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s`
`173`	`165`	`{`
`174`	`166`	`string messageNonDecrypted = string.Format(Resources.TraceNonDecryptedFunctionSecretRefresh, functionName);`
`175`	`167`	`_traceWriter.Info(messageNonDecrypted, traceProperties);`
`176`		`- _logger?.LogInformation(messageNonDecrypted);`
`177`	`168`	`await PersistSecretsAsync(secrets, functionName, true);`
`178`	`169`	`secrets = GenerateFunctionSecrets(secrets);`
`179`	`170`	`await RefreshSecretsAsync(secrets, functionName);`
`@@ -183,7 +174,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s`
`183`	`174`	`{`
`184`	`175`	`string messageStaleFunction = string.Format(Resources.TraceStaleFunctionSecretRefresh, functionName);`
`185`	`176`	`_traceWriter.Info(messageStaleFunction);`
`186`		`- _logger?.LogInformation(messageStaleFunction);`
`187`	`177`	`await RefreshSecretsAsync(secrets, functionName);`
`188`	`178`	`}`
`189`	`179`
`@@ -205,7 +195,6 @@ public async virtual Task<IDictionary<string, string>> GetFunctionSecretsAsync(s`
`205`	`195`
`206`	`196`	`string messageLoaded = string.Format(Resources.TraceFunctionsKeysLoaded, functionName);`
`207`	`197`	`_traceWriter.Info(messageLoaded);`
`208`		`- _logger?.LogInformation(messageLoaded);`
`209`	`198`
`210`	`199`	`return functionSecrets;`
`211`	`200`	`}`
`@@ -232,7 +221,6 @@ public async Task<KeyOperationResult> AddOrUpdateFunctionSecretAsync(string secr`
`232`	`221`
`233`	`222`	`string message = string.Format(Resources.TraceAddOrUpdateFunctionSecret, secretsType, secretName, keyScope ?? "host", result.Result);`
`234`	`223`	`_traceWriter.Info(message);`
`235`		`- _logger?.LogInformation(message);`
`236`	`224`
`237`	`225`	`return result;`
`238`	`226`	`}`
`@@ -268,7 +256,6 @@ public async Task<KeyOperationResult> SetMasterKeyAsync(string value = null)`
`268`	`256`
`269`	`257`	`string message = string.Format(Resources.TraceMasterKeyCreatedOrUpdated, result);`
`270`	`258`	`_traceWriter.Info(message);`
`271`		`- _logger?.LogInformation(message);`
`272`	`259`
`273`	`260`	`return new KeyOperationResult(masterKey, result);`
`274`	`261`	`}`
`@@ -289,8 +276,6 @@ public async Task<bool> DeleteSecretAsync(string secretName, string keyScope, Sc`
`289`	`276`
`290`	`277`	`string message = string.Format(Resources.TraceSecretDeleted, target, secretName);`
`291`	`278`	`_traceWriter.Info(message);`
`292`		`-`
`293`		`- _logger?.LogInformation(message);`
`294`	`279`	`}`
`295`	`280`
`296`	`281`	`return deleted;`
`@@ -477,7 +462,6 @@ private async Task PersistSecretsAsync<T>(T secrets, string keyScope = null, boo`
`477`	`462`	`string message = string.Format(Resources.ErrorTooManySecretBackups, ScriptConstants.MaximumSecretBackupCount, string.IsNullOrEmpty(keyScope) ? "host" : keyScope, await AnalizeSnapshots<T>(secretBackups));`
`478`	`463`	`TraceEvent traceEvent = new TraceEvent(TraceLevel.Verbose, message);`
`479`	`464`	`_traceWriter.Info(message);`
`480`		`- _logger?.LogInformation(message);`
`481`	`465`	`throw new InvalidOperationException(message);`
`482`	`466`	`}`
`483`	`467`	`await _repository.WriteSnapshotAsync(secretsType, keyScope, ScriptSecretSerializer.SerializeSecrets<T>(secrets));`
`@@ -489,7 +473,6 @@ private async Task PersistSecretsAsync<T>(T secrets, string keyScope = null, boo`
`489`	`473`	`secrets.DecryptionKeyId = hashes;`
`490`	`474`	`string message = $"Encription keys hashes: {hashes}";`
`491`	`475`	`_traceWriter.Info(message);`
`492`		`- _logger?.LogInformation(message);`
`493`	`476`
`494`	`477`	`await _repository.WriteAsync(secretsType, keyScope, ScriptSecretSerializer.SerializeSecrets<T>(secrets));`
`495`	`478`	`}`