From 9ccb85d3dd2a5857428830f782b526266814cf50 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Thu, 14 Jan 2021 21:43:25 +0100 Subject: [PATCH] Use environment config even when config file fails to load Signed-off-by: Pavol Loffay --- .../org/hypertrace/agent/core/config/HypertraceConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/javaagent-core/src/main/java/org/hypertrace/agent/core/config/HypertraceConfig.java b/javaagent-core/src/main/java/org/hypertrace/agent/core/config/HypertraceConfig.java index e1fce9f7c..bb96fe85a 100644 --- a/javaagent-core/src/main/java/org/hypertrace/agent/core/config/HypertraceConfig.java +++ b/javaagent-core/src/main/java/org/hypertrace/agent/core/config/HypertraceConfig.java @@ -140,7 +140,8 @@ static AgentConfig load(String filename) throws IOException { File configFile = new File(filename); if (!configFile.exists() || configFile.isDirectory() || !configFile.canRead()) { log.error("Config file {} does not exist", filename); - return AgentConfig.newBuilder().build(); + AgentConfig.Builder configBuilder = AgentConfig.newBuilder(); + return EnvironmentConfig.applyPropertiesAndEnvVars(applyDefaults(configBuilder)).build(); } AgentConfig.Builder configBuilder = AgentConfig.newBuilder();