Skip to content

Commit 1df82d2

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

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/benchmark/StaticEventLogger.java

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

3+
import datadog.environment.SystemProperties;
34
import java.io.*;
45
import java.nio.charset.StandardCharsets;
56
import java.util.Objects;
@@ -18,8 +19,8 @@ public class StaticEventLogger {
1819
static {
1920
BufferedWriter writer = null;
2021

21-
if ("true".equalsIgnoreCase(System.getProperty("dd.benchmark.enabled"))) {
22-
String dir = System.getProperty("dd.benchmark.output.dir");
22+
if ("true".equalsIgnoreCase(SystemProperties.get("dd.benchmark.enabled"))) {
23+
String dir = SystemProperties.get("dd.benchmark.output.dir");
2324
dir = (dir != null ? dir + File.separator : "");
2425
String fileName = dir + "startup_" + System.currentTimeMillis() + ".csv";
2526

dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static datadog.trace.agent.tooling.bytebuddy.matcher.GlobalIgnoresMatcher.globalIgnoresMatcher;
66
import static net.bytebuddy.matcher.ElementMatchers.isDefaultFinalizer;
77

8+
import datadog.environment.SystemProperties;
89
import datadog.trace.agent.tooling.bytebuddy.SharedTypePools;
910
import datadog.trace.agent.tooling.bytebuddy.iast.TaintableRedefinitionStrategyListener;
1011
import datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers;
@@ -318,18 +319,18 @@ public static Set<InstrumenterModule.TargetSystem> getEnabledSystems() {
318319
}
319320

320321
private static void addByteBuddyRawSetting() {
321-
final String savedPropertyValue = System.getProperty(TypeDefinition.RAW_TYPES_PROPERTY);
322+
final String savedPropertyValue = SystemProperties.get(TypeDefinition.RAW_TYPES_PROPERTY);
322323
try {
323-
System.setProperty(TypeDefinition.RAW_TYPES_PROPERTY, "true");
324+
SystemProperties.set(TypeDefinition.RAW_TYPES_PROPERTY, "true");
324325
final boolean rawTypes = TypeDescription.AbstractBase.RAW_TYPES;
325326
if (!rawTypes && DEBUG) {
326327
log.debug("Too late to enable {}", TypeDefinition.RAW_TYPES_PROPERTY);
327328
}
328329
} finally {
329330
if (savedPropertyValue == null) {
330-
System.clearProperty(TypeDefinition.RAW_TYPES_PROPERTY);
331+
SystemProperties.clear(TypeDefinition.RAW_TYPES_PROPERTY);
331332
} else {
332-
System.setProperty(TypeDefinition.RAW_TYPES_PROPERTY, savedPropertyValue);
333+
SystemProperties.set(TypeDefinition.RAW_TYPES_PROPERTY, savedPropertyValue);
333334
}
334335
}
335336
}

0 commit comments

Comments
 (0)