Skip to content

Commit d374062

Browse files
committed
feat(env): Migrate agent bootstrap to environment component
1 parent f2c4c25 commit d374062

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Library.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.bootstrap;
22

3+
import datadog.environment.EnvironmentVariables;
34
import java.util.EnumSet;
45
import org.slf4j.Logger;
56

@@ -15,7 +16,7 @@ public enum Library {
1516
public static EnumSet<Library> detectLibraries(final Logger log) {
1617
final EnumSet<Library> libraries = EnumSet.noneOf(Library.class);
1718

18-
final String jbossHome = System.getenv("JBOSS_HOME");
19+
final String jbossHome = EnvironmentVariables.get("JBOSS_HOME");
1920
if (jbossHome != null) {
2021
log.debug("Env - jboss: {}", jbossHome);
2122
libraries.add(WILDFLY);

dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package datadog.trace.logging.ddlogger;
22

3+
import datadog.environment.EnvironmentVariables;
4+
import datadog.environment.SystemProperties;
35
import datadog.trace.api.Platform;
46
import datadog.trace.logging.LogLevel;
57
import datadog.trace.logging.LogLevelSwitcher;
@@ -99,14 +101,14 @@ && isFlagEnabled(
99101

100102
private static boolean isFlagEnabled(
101103
final String systemProperty, final String envVar, final boolean defaultValue) {
102-
String value = System.getProperty(systemProperty);
104+
String value = SystemProperties.get(systemProperty);
103105
if ("true".equalsIgnoreCase(value)) {
104106
return true;
105107
}
106108
if ("false".equalsIgnoreCase(value)) {
107109
return false;
108110
}
109-
value = System.getenv(envVar);
111+
value = EnvironmentVariables.get(envVar);
110112
if ("true".equalsIgnoreCase(value)) {
111113
return true;
112114
}

dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private static void agentmainImpl(
165165
static boolean getConfig(String configName) {
166166
switch (configName) {
167167
case LIB_INJECTION_ENABLED_ENV_VAR:
168-
return System.getenv(LIB_INJECTION_ENABLED_ENV_VAR) != null;
168+
return EnvironmentVariables.get(LIB_INJECTION_ENABLED_ENV_VAR) != null;
169169
case LIB_INJECTION_FORCE_SYS_PROP:
170170
{
171171
String envVarName =

dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreCheck.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,12 @@ static boolean compatible(String javaVersion, String javaHome, PrintStream outpu
101101

102102
reportIncompatibleJava(javaVersion, javaHome, agentVersion, output);
103103

104-
String forwarderPath = System.getenv("DD_TELEMETRY_FORWARDER_PATH");
105-
if (forwarderPath != null) {
106-
sendTelemetry(forwarderPath, javaVersion, agentVersion);
104+
try {
105+
String forwarderPath = System.getenv("DD_TELEMETRY_FORWARDER_PATH");
106+
if (forwarderPath != null) {
107+
sendTelemetry(forwarderPath, javaVersion, agentVersion);
108+
}
109+
} catch (SecurityException ignored) {
107110
}
108111

109112
return false;

0 commit comments

Comments
 (0)