Skip to content

Instead of creating logger once, create before every fetch (allow hacking in different logger factory instance) #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Instead of creating logger once, create before every fetch (allow hacking in different logger factory instance) #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/W4k.Extensions.Configuration.Aws.SecretsManager/SecretsManagerConfigurationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace W4k.Extensions.Configuration.Aws.SecretsManager;
public sealed class SecretsManagerConfigurationProvider : ConfigurationProvider, ISecretsManagerConfigurationProvider
{
private readonly SecretFetcher _secretFetcher;
private readonly ILogger _logger;

private int _reloadInProgress;
private string? _currentSecretVersionId;
Expand All @@ -26,8 +25,6 @@ public SecretsManagerConfigurationProvider(SecretsManagerConfigurationSource sou
ArgumentNullException.ThrowIfNull(source);

_secretFetcher = new SecretFetcher(source.SecretsManager);
_logger = source.LoggerFactory.CreateLogger<SecretsManagerConfigurationProvider>();

Source = source;
}

Expand All @@ -47,6 +44,8 @@ public override void Load()
var secretProcessor = Source.Processor;
var watcher = Source.ConfigurationWatcher;

var logger = Source.LoggerFactory.CreateLogger<SecretsManagerConfigurationProvider>();

using var activity = ActivityDescriptors.Source.StartActivity(ActivityDescriptors.LoadActivityName);
try
{
Expand All @@ -64,7 +63,7 @@ public override void Load()
.AddEvent(new ActivityEvent("loaded"))
.SetStatus(ActivityStatusCode.Ok, "Secret loaded");

_logger.SecretLoaded(secretName, secret.VersionId);
logger.SecretLoaded(secretName, secret.VersionId);

// requires initial load to succeed (even when secret is optional)
watcher?.StartWatching(this);
Expand All @@ -81,7 +80,7 @@ public override void Load()
.SetStatus(ActivityStatusCode.Error, "Error loading secret");
#endif

_logger.FailedToLoadSecret(ex, secretName);
logger.FailedToLoadSecret(ex, secretName);
HandleException(ex, Source.OnLoadException);
}
}
Expand All @@ -98,6 +97,8 @@ public void Reload()
var secretVersion = Source.Version;
var secretProcessor = Source.Processor;

var logger = Source.LoggerFactory.CreateLogger<SecretsManagerConfigurationProvider>();

using var activity = ActivityDescriptors.Source.StartActivity(ActivityDescriptors.ReloadActivityName);
try
{
Expand All @@ -113,7 +114,7 @@ public void Reload()
.AddEvent(new ActivityEvent("skipped"))
.SetStatus(ActivityStatusCode.Ok, "Secret up-to-date");

_logger.SecretAlreadyLoaded(secretName, secret.VersionId);
logger.SecretAlreadyLoaded(secretName, secret.VersionId);
return;
}

Expand All @@ -126,7 +127,7 @@ public void Reload()
.AddEvent(new ActivityEvent("reloaded"))
.SetStatus(ActivityStatusCode.Ok, "Secret reloaded");

_logger.SecretRefreshed(secretName, previousVersionId ?? "N/A", secret.VersionId);
logger.SecretRefreshed(secretName, previousVersionId ?? "N/A", secret.VersionId);
}
catch (Exception ex)
{
Expand All @@ -140,7 +141,7 @@ public void Reload()
.SetStatus(ActivityStatusCode.Error, "Error reloading secret");
#endif

_logger.FailedToRefreshSecret(ex, secretName);
logger.FailedToRefreshSecret(ex, secretName);
HandleException(ex, Source.OnReloadException);
}
finally
Expand Down