Skip to content

Commit

Permalink
[Backport 7.55.x] [ASCII-1946] Fix deadlock in config wrapper (#27310)
Browse files Browse the repository at this point in the history
Co-authored-by: Pierre Gimalac <pierre.gimalac@datadoghq.com>
agent-platform-auto-pr[bot] and pgimalac authored Jul 4, 2024

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
1 parent ad385b0 commit 51a7526
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/config/model/viper.go
Original file line number Diff line number Diff line change
@@ -658,7 +658,7 @@ func (c *safeConfig) AllSettingsBySource() map[Source]interface{} {
for _, source := range sources {
res[source] = c.configSources[source].AllSettingsWithoutDefault()
}
res[SourceProvided] = c.AllSettingsWithoutDefault()
res[SourceProvided] = c.Viper.AllSettingsWithoutDefault()
return res
}

0 comments on commit 51a7526

Please sign in to comment.