Merge branch 'master' into codex/find-and-fix-critical-bug-in-dd-java-agent/agent-iast

Author: smola

.gitlab-ci.yml

@@ -136,13 +136,16 @@ default:
       policy: $BUILD_CACHE_POLICY
   before_script:
     - source .gitlab/gitlab-utils.sh
-    - export GRADLE_USER_HOME=`pwd`/.gradle
+    - export GRADLE_USER_HOME=$(pwd)/.gradle
     - |
       # Don't put jvm args here as it will be picked up by child gradle processes used in tests
       cat << EOF > $GRADLE_USER_HOME/gradle.properties
       mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
       gradlePluginProxy=$GRADLE_PLUGIN_PROXY
       EOF
+    - |
+      # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
+      sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx$GRADLE_MEM -Xms$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
     - *normalize_node_index
@@ -371,7 +374,7 @@ muzzle:
     - ./gradlew writeMuzzleTasksToFile $GRADLE_ARGS
     - sort workspace/build/muzzleTasks > sortedMuzzleTasks
     - split --number=l/$NORMALIZED_NODE_TOTAL --suffix-length=1 --numeric-suffixes sortedMuzzleTasks muzzleSplit
-    - ./gradlew `cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs` $GRADLE_ARGS
+    - ./gradlew $(cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs) $GRADLE_ARGS
   after_script:
     - *cgroup_info
     - source .gitlab/gitlab-utils.sh

dd-java-agent/instrumentation/org-json/build.gradle

@@ -33,5 +33,5 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testRuntimeOnly project(':dd-java-agent:instrumentation:java-io') //Needed for Reader
 
-  latestDepTestImplementation group: 'org.json', name: 'json', version: '+'
+  latestDepTestImplementation group: 'org.json', name: 'json', version: '20250107' // TODO replace with + when APPSEC-58007 solved
 }

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -113,7 +113,7 @@ public final class ConfigDefaults {
   static final int DEFAULT_APPSEC_TRACE_RATE_LIMIT = 100;
   static final boolean DEFAULT_APPSEC_WAF_METRICS = true;
   static final int DEFAULT_APPSEC_WAF_TIMEOUT = 100000; // 0.1 s
-  static final boolean DEFAULT_API_SECURITY_ENABLED = false;
+  static final boolean DEFAULT_API_SECURITY_ENABLED = true;
   static final float DEFAULT_API_SECURITY_SAMPLE_DELAY = 30.0f;
   // TODO: change to true once the RFC is approved
   static final boolean DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED = false;

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -54,6 +54,8 @@ public final class GeneralConfig {
 
   public static final String RUNTIME_METRICS_ENABLED = "runtime.metrics.enabled";
   public static final String RUNTIME_ID_ENABLED = "runtime-id.enabled";
+  public static final String RUNTIME_METRICS_RUNTIME_ID_ENABLED =
+      "runtime.metrics.runtime-id.enabled";
 
   public static final String HEALTH_METRICS_ENABLED = "trace.health.metrics.enabled";
   public static final String HEALTH_METRICS_STATSD_HOST = "trace.health.metrics.statsd.host";

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -601,7 +601,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     this.configProvider = configProvider;
     this.instrumenterConfig = instrumenterConfig;
     configFileStatus = configProvider.getConfigFileStatus();
-    runtimeIdEnabled = configProvider.getBoolean(RUNTIME_ID_ENABLED, true);
+    runtimeIdEnabled =
+        configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED);
     runtimeVersion = System.getProperty("java.version", "unknown");
 
     // Note: We do not want APiKey to be loaded from property for security reasons

internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy

@@ -3,18 +3,30 @@ package datadog.trace.api
 import spock.lang.Specification
 
 import static datadog.trace.api.config.GeneralConfig.RUNTIME_ID_ENABLED
+import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_RUNTIME_ID_ENABLED
 
 class ConfigForkedTest extends Specification {
 
   static final String PREFIX = "dd."
 
+  def getSetting() {
+    RUNTIME_ID_ENABLED
+  }
+
   def "test random runtime id generation can be turned off"(){
     setup:
-    System.setProperty(PREFIX + RUNTIME_ID_ENABLED, "false")
+    System.setProperty(PREFIX + getSetting(), "false")
 
     when:
     def config = new Config()
     then:
     config.runtimeId == ""
   }
 }
+
+class RuntimeMetricsRuntimeIdAliasForkedTest extends ConfigForkedTest {
+  @Override
+  def getSetting() {
+    RUNTIME_METRICS_RUNTIME_ID_ENABLED
+  }
+}