Skip to content

Commit b062c96

Browse files
committed
fixing invocationtargetexception
1 parent 6a87970 commit b062c96

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

components/environment/src/main/java/datadog/environment/ConfigHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ public static String getEnvironmentVariable(String name) {
5353
|| name.startsWith("OTEL_")
5454
|| GeneratedSupportedConfigurations.ALIAS_MAPPING.containsKey(name))
5555
&& !GeneratedSupportedConfigurations.SUPPORTED.contains(name)) {
56-
throw new IllegalArgumentException(
57-
"Missing " + name + " env/configuration in supported-configurations.json file.");
56+
System.err.println("Warning: Unsupported environment variable " + name + " detected.");
5857
}
5958

6059
String config = EnvironmentVariables.get(name);

components/environment/src/main/java/datadog/environment/EnvironmentVariables.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static String getOrDefault(String name, String defaultValue) {
3636
return defaultValue;
3737
}
3838
try {
39-
// String value = ConfigHelper.getEnvironmentVariable(name);
39+
// String value = EnvironmentVariables.get(name);
4040
String value = System.getenv(name);
4141
return value == null ? defaultValue : value;
4242
} catch (SecurityException e) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static java.nio.charset.StandardCharsets.UTF_8;
44

5-
import datadog.environment.ConfigHelper;
65
import datadog.trace.bootstrap.environment.JavaVirtualMachine;
76
import datadog.trace.bootstrap.environment.SystemProperties;
87
import de.thetaphi.forbiddenapis.SuppressForbidden;
@@ -44,6 +43,7 @@
4443
* <li>Do dot touch any logging facilities here so we can configure them later
4544
* </ul>
4645
*/
46+
@SuppressForbidden
4747
public final class AgentBootstrap {
4848
static final String LIB_INJECTION_ENABLED_ENV_VAR = "DD_INJECTION_ENABLED";
4949
static final String LIB_INJECTION_FORCE_SYS_PROP = "dd.inject.force";
@@ -91,7 +91,7 @@ public static void agentmain(final String agentArgs, final Instrumentation inst)
9191
}
9292

9393
private static BootstrapInitializationTelemetry createInitializationTelemetry() {
94-
String forwarderPath = ConfigHelper.getEnvironmentVariable("DD_TELEMETRY_FORWARDER_PATH");
94+
String forwarderPath = System.getenv("DD_TELEMETRY_FORWARDER_PATH");
9595
if (forwarderPath == null) {
9696
return BootstrapInitializationTelemetry.noOpInstance();
9797
}
@@ -165,12 +165,12 @@ private static void agentmainImpl(
165165
static boolean getConfig(String configName) {
166166
switch (configName) {
167167
case LIB_INJECTION_ENABLED_ENV_VAR:
168-
return ConfigHelper.getEnvironmentVariable(LIB_INJECTION_ENABLED_ENV_VAR) != null;
168+
return System.getenv(LIB_INJECTION_ENABLED_ENV_VAR) != null;
169169
case LIB_INJECTION_FORCE_SYS_PROP:
170170
{
171171
String envVarName =
172172
LIB_INJECTION_FORCE_SYS_PROP.replace('.', '_').replace('-', '_').toUpperCase();
173-
String injectionForceFlag = ConfigHelper.getEnvironmentVariable(envVarName);
173+
String injectionForceFlag = System.getenv(envVarName);
174174
if (injectionForceFlag == null) {
175175
injectionForceFlag = SystemProperties.get(LIB_INJECTION_FORCE_SYS_PROP);
176176
}

0 commit comments

Comments
 (0)