Skip to content

Migrate products and instrumentations to environment component #9290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PerfectSlayer merged 9 commits into from
Aug 1, 2025
Merged

Migrate products and instrumentations to environment component #9290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa6e313
feat(civis): Migrate CI Visibility to environment component
PerfectSlayer Jul 17, 2025
392db1a
feat(env): Migrate communication to environment component
PerfectSlayer Jul 18, 2025
2ce9c27
feat(env): Migrate crash tracking to environment component
PerfectSlayer Jul 18, 2025
a69f033
feat(env): Migrate debugger to environment component
PerfectSlayer Jul 18, 2025
cd5f2c3
feat(env): Migrate jmxfetch to environment component
PerfectSlayer Jul 18, 2025
5b752eb
feat(env): Migrate logging to environment component
PerfectSlayer Jul 18, 2025
21957a8
feat(env): Migrate profiling to environment component
PerfectSlayer Jul 18, 2025
f31a12c
feat(env): Migrate security libraries to environment component
PerfectSlayer Jul 18, 2025
3925256
feat(env): Migrate intrumentations to environment component
PerfectSlayer Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(env): Migrate security libraries to environment component
  • Loading branch information
@PerfectSlayer
PerfectSlayer committed Aug 1, 2025
commit f31a12c3d93b0d555df7b9fd61ddc7a8957258c9
5 changes: 3 additions & 2 deletions dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WafInitialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.datadog.appsec.util.StandardizedLogging;
import com.datadog.ddwaf.Waf;
import datadog.environment.SystemProperties;
import java.io.File;
import java.io.IOException;
import java.util.Scanner;
Expand All @@ -13,7 +14,7 @@ public class WafInitialization {

private static boolean initWAF() {
try {
boolean simpleLoad = System.getProperty("POWERWAF_SIMPLE_LOAD") != null;
boolean simpleLoad = SystemProperties.get("POWERWAF_SIMPLE_LOAD") != null;
Waf.initialize(simpleLoad);
} catch (Throwable e) {
Logger logger = LoggerFactory.getLogger(WafInitialization.class);
Expand All @@ -26,7 +27,7 @@ private static boolean initWAF() {
}

private static String getLibc() {
String os = System.getProperty("os.name");
String os = SystemProperties.get("os.name");
if ("Linux".equals(os)) {
File file = new File("/proc/self/maps");
try (Scanner sc = new Scanner(file, "ISO-8859-1")) {
Expand Down
10 changes: 7 additions & 3 deletions dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/AppSecVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package com.datadog.appsec.util;

import datadog.environment.SystemProperties;
import java.io.BufferedReader;
import java.io.InputStreamReader;

public class AppSecVersion {
public static final String JAVA_VERSION = System.getProperty("java.version", "unknown");
public static final String JAVA_VM_NAME = System.getProperty("java.vm.name", "unknown");
public static final String JAVA_VM_VENDOR = System.getProperty("java.vm.vendor", "unknown");
public static final String JAVA_VERSION =
SystemProperties.getOrDefault("java.version", "unknown");
public static final String JAVA_VM_NAME =
SystemProperties.getOrDefault("java.vm.name", "unknown");
public static final String JAVA_VM_VENDOR =
SystemProperties.getOrDefault("java.vm.vendor", "unknown");
public static final String VERSION;

static {
Expand Down
9 changes: 5 additions & 4 deletions dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.datadog.appsec.event.data.Address;
import com.datadog.appsec.report.AppSecEvent;
import com.datadog.ddwaf.Waf;
import datadog.environment.SystemProperties;
import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
Expand Down Expand Up @@ -42,11 +43,11 @@ public static void libddwafCannotBeLoaded(Logger logger, String libc) {
+ "AppSec could not start. No security activities will be collected. "
+ "Please contact support at https://docs.datadoghq.com/help/ for help. "
+ "Host information: operating_system: {}, libc: {}, arch: {}, runtime: {} {}",
System.getProperty("os.name"),
SystemProperties.get("os.name"),
libc,
System.getProperty("os.arch"),
System.getProperty("java.vm.vendor"),
System.getProperty("java.version"));
SystemProperties.get("os.arch"),
SystemProperties.get("java.vm.vendor"),
SystemProperties.get("java.version"));
}

// C4:
Expand Down
3 changes: 2 additions & 1 deletion dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.sun.jna.Pointer;
import datadog.cws.erpc.Erpc;
import datadog.cws.erpc.Request;
import datadog.environment.SystemProperties;
import datadog.trace.api.DD128bTraceId;
import datadog.trace.api.DDTraceId;

Expand Down Expand Up @@ -40,7 +41,7 @@ public interface CLibrary extends Library {
}

static int getGettidSyscallId() {
String arch = System.getProperty("os.arch");
String arch = SystemProperties.get("os.arch");
if (arch.equals("amd64")) {
return 186; // 186 is the syscall ID for "gettid" on amd64
} else if (arch.equals("arm64")) {
Expand Down