Use environment config even when config file fails to load (#236)

pavolloffay · web-flow · commit 02a3f7485fd6 · 2021-01-14T21:50:43.000+01:00
Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,8 @@ static AgentConfig load(String filename) throws IOException {`
`140`	`140`	`File configFile = new File(filename);`
`141`	`141`	`if (!configFile.exists() \|\| configFile.isDirectory() \|\| !configFile.canRead()) {`
`142`	`142`	`log.error("Config file {} does not exist", filename);`
`143`		`- return AgentConfig.newBuilder().build();`
	`143`	`+ AgentConfig.Builder configBuilder = AgentConfig.newBuilder();`
	`144`	`+ return EnvironmentConfig.applyPropertiesAndEnvVars(applyDefaults(configBuilder)).build();`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`AgentConfig.Builder configBuilder = AgentConfig.newBuilder();`