Merge branch 'master' into alexeyk/spotless-remove-unused-imports

AlexeyKuznetsov-DD · web-flow · commit ad64a1e8f100 · 2025-06-27T08:16:16.000-04:00
diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle
@@ -15,7 +15,7 @@ dependencies {
   implementation project(':internal-api')
   implementation project(':communication')
   implementation project(':telemetry')
-  implementation group: 'io.sqreen', name: 'libsqreen', version: '14.1.0'
+  implementation group: 'io.sqreen', name: 'libsqreen', version: '15.0.0'
   implementation libs.moshi
 
   testImplementation libs.bytebuddy
diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle
@@ -1,3 +1,6 @@
+import java.time.Duration
+import java.time.temporal.ChronoUnit
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -21,6 +24,10 @@ tasks.withType(Test).configureEach {
   dependsOn "shadowJar"
   jvmArgs "-Ddatadog.smoketest.maven.jar.path=${tasks.shadowJar.archiveFile.get()}"
 
+  // overriding the default timeout set in configure_tests.gradle, as Maven smoke
+  // tests might run for a longer duration
+  timeout = Duration.of(20, ChronoUnit.MINUTES)
+
   if (project.hasProperty("mavenRepositoryProxy")) {
     // propagate proxy URL to tests, to then propagate it to nested Gradle builds
     environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
diff --git a/internal-api/src/main/java/datadog/trace/api/ConfigOrigin.java b/internal-api/src/main/java/datadog/trace/api/ConfigOrigin.java
@@ -1,5 +1,7 @@
 package datadog.trace.api;
 
+// https://github.com/DataDog/instrumentation-telemetry-api-docs/blob/main/
+// GeneratedDocumentation/ApiDocs/v2/SchemaDocumentation/Schemas/conf_key_value.md
 public enum ConfigOrigin {
   /** configurations that are set through environment variables */
   ENV("env_var"),
@@ -11,6 +13,12 @@ public enum ConfigOrigin {
   LOCAL_STABLE_CONFIG("local_stable_config"),
   /** configuration read in the stable config file, managed by fleet */
   FLEET_STABLE_CONFIG("fleet_stable_config"),
+  /** configurations that are set through the customer application */
+  CODE("code"),
+  /** set by the dd.yaml file or json */
+  DD_CONFIG("dd_config"),
+  /** set for cases where it is difficult/not possible to determine the source of a config. */
+  UNKNOWN("unknown"),
   /** set when the user has not set any configuration for the key (defaults to a value) */
   DEFAULT("default");
 
