Skip to content

Log unresolved config instead of resolved config #74

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 3 commits into from
Aug 4, 2023
Merged

Log unresolved config instead of resolved config #74

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1baafe2
Redact values of some key substrings
suresh-prakash Aug 3, 2023
d6aad6c
Move the private method at the end of the file
suresh-prakash Aug 3, 2023
ebc59dd
Log unresolved config instead of resolved config
suresh-prakash Aug 4, 2023
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
12 changes: 6 additions & 6 deletions ...src/main/java/org/hypertrace/core/serviceframework/config/DirectoryBasedConfigClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,14 @@ public Config getConfig() {

@Override
public Config getConfig(String service, String cluster, String pod, String container) {
final Config resolvedConfig = loadConfigs(service, cluster, pod, container);
final Config unresolvedConfig = loadUnresolvedConfig(service, cluster, pod, container);
LOGGER.info("Overrided Configs are listed below:");
ConfigUtils.logConfFile(resolvedConfig);
return resolvedConfig;
ConfigUtils.logConfFile(unresolvedConfig);
return unresolvedConfig.resolve();
}

private Config loadConfigs(String service, String cluster, String pod, String container) {
private Config loadUnresolvedConfig(
String service, String cluster, String pod, String container) {
LOGGER.info("Trying to compile configs under directory: {}", baseDir);
Config serviceLevelConf =
getConfigFromPath(String.format("%s/%s", baseDir, service))
Expand All @@ -89,8 +90,7 @@ private Config loadConfigs(String service, String cluster, String pod, String co
return containerLevelConf
.withFallback(podLevelConf)
.withFallback(clusterLevelConf)
.withFallback(serviceLevelConf)
.resolve();
.withFallback(serviceLevelConf);
}

private Config getConfigFromPath(String configDir) {
Expand Down