Skip to content

Commit 75d29bd

Browse files
Introduce env variable for application insights RP configuration file. (#1652)
1 parent c346002 commit 75d29bd

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/configuration/ConfigurationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static boolean overlayWithEnvVar(String name, boolean defaultValue) {
326326
}
327327

328328
// never returns empty string (empty string is normalized to null)
329-
private static String getEnvVar(String name) {
329+
protected static String getEnvVar(String name) {
330330
return trimAndEmptyToNull(System.getenv(name));
331331
}
332332

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/configuration/RpConfigurationBuilder.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,30 @@
2121

2222
package com.microsoft.applicationinsights.agent.internal.wasbootstrap.configuration;
2323

24+
import java.io.File;
2425
import java.io.IOException;
2526
import java.io.InputStream;
26-
import java.lang.reflect.Type;
2727
import java.nio.file.Files;
2828
import java.nio.file.Path;
2929
import java.nio.file.attribute.BasicFileAttributes;
30-
import java.util.List;
31-
import java.util.Locale;
32-
import java.util.concurrent.CopyOnWriteArrayList;
33-
34-
import com.microsoft.applicationinsights.agent.internal.wasbootstrap.configuration.Configuration.JmxMetric;
35-
import com.microsoft.applicationinsights.customExceptions.FriendlyException;
3630
import com.squareup.moshi.JsonAdapter;
37-
import com.squareup.moshi.JsonDataException;
38-
import com.squareup.moshi.JsonEncodingException;
39-
import com.squareup.moshi.JsonReader;
4031
import com.squareup.moshi.Moshi;
41-
import com.squareup.moshi.Types;
4232
import okio.Buffer;
43-
import org.slf4j.Logger;
44-
import org.slf4j.LoggerFactory;
4533

4634
public class RpConfigurationBuilder {
4735

36+
private static final String APPLICATIONINSIGHTS_RP_CONFIGURATION_FILE = "APPLICATIONINSIGHTS_RP_CONFIGURATION_FILE";
37+
4838
public static RpConfiguration create(Path agentJarPath) throws IOException {
49-
Path configPath = agentJarPath.resolveSibling("applicationinsights-rp.json");
39+
Path configPath;
40+
String configPathString = ConfigurationBuilder.getEnvVar(APPLICATIONINSIGHTS_RP_CONFIGURATION_FILE);
41+
42+
if (configPathString != null) {
43+
configPath = new File(configPathString).toPath();
44+
} else {
45+
configPath = agentJarPath.resolveSibling("applicationinsights-rp.json");
46+
}
47+
5048
if (Files.exists(configPath)) {
5149
return loadJsonConfigFile(configPath);
5250
}

0 commit comments

Comments
 (0)