Skip to content

Commit 06c162d

Browse files
committed
fixing invocationtargetexception
1 parent a3cc4e6 commit 06c162d

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
@@ -32,7 +32,7 @@ private EnvironmentVariables() {}
3232
*/
3333
public static String getOrDefault(@Nonnull String name, String defaultValue) {
3434
try {
35-
// String value = ConfigHelper.getEnvironmentVariable(name);
35+
// String value = EnvironmentVariables.get(name);
3636
String value = System.getenv(name);
3737
return value == null ? defaultValue : value;
3838
} 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
}
@@ -161,12 +161,12 @@ private static void agentmainImpl(
161161
static boolean getConfig(String configName) {
162162
switch (configName) {
163163
case LIB_INJECTION_ENABLED_ENV_VAR:
164-
return ConfigHelper.getEnvironmentVariable(LIB_INJECTION_ENABLED_ENV_VAR) != null;
164+
return System.getenv(LIB_INJECTION_ENABLED_ENV_VAR) != null;
165165
case LIB_INJECTION_FORCE_SYS_PROP:
166166
{
167167
String envVarName =
168168
LIB_INJECTION_FORCE_SYS_PROP.replace('.', '_').replace('-', '_').toUpperCase();
169-
String injectionForceFlag = ConfigHelper.getEnvironmentVariable(envVarName);
169+
String injectionForceFlag = System.getenv(envVarName);
170170
if (injectionForceFlag == null) {
171171
injectionForceFlag = SystemProperties.get(LIB_INJECTION_FORCE_SYS_PROP);
172172
}

0 commit comments

Comments
 (0)