Merge branch 'master' into alexeyk/groovy-4

# Conflicts:
#	.gitlab-ci.yml
#	dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy

Author: AlexeyKuznetsov-DD

.github/workflows/create-release-branch.yaml

@@ -3,7 +3,7 @@ name: Create Release Branch and Pin System-Tests
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.0'  # Trigger on minor release tags (e.g. v1.54.0)
+      - 'v[0-9]+.[0-9]+.0' # Trigger on minor release tags (e.g. v1.54.0)
   workflow_dispatch:
     inputs:
       tag:
@@ -15,8 +15,7 @@ jobs:
   create-release-branch:
     runs-on: ubuntu-latest
     permissions:
-      # contents: write # Allow pushing the empty release branch
-      contents: read
+      contents: write # Allow pushing the empty release branch
       id-token: write # Required for OIDC token federation
     steps:
       - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
@@ -25,8 +24,14 @@ jobs:
           scope: DataDog/dd-trace-java
           policy: self.update-system-tests.create-pr
 
-      - name: Checkout dd-trace-java at tag
+      - name: Checkout dd-trace-java master branch
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
+        with:
+          ref: master
+
+      - name: Get head SHA of master branch
+        id: get-head-sha
+        run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
       - name: Determine tag
         id: determine-tag
@@ -90,7 +95,7 @@ jobs:
         with:
           token: "${{ steps.octo-sts.outputs.token }}"
           branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
-          head-sha: "${{ github.sha }}"
+          head-sha: "${{ steps.get-head-sha.outputs.sha }}"
           create-branch: true
           command: push
           commits: "${{ steps.create-commit.outputs.commit }}"

.gitlab-ci.yml

@@ -132,12 +132,12 @@ default:
   image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
   stage: build
   variables:
-    MAVEN_OPTS: "-Xms64M -Xmx512M"
+    MAVEN_OPTS: "-Xms256M -Xmx1024M"
     GRADLE_WORKERS: 2
-    GRADLE_MEM: 2560M
+    GRADLE_MEM: 3G
     KUBERNETES_CPU_REQUEST: 8
-    KUBERNETES_MEMORY_REQUEST: 8Gi
-    KUBERNETES_MEMORY_LIMIT: 8Gi
+    KUBERNETES_MEMORY_REQUEST: 10Gi
+    KUBERNETES_MEMORY_LIMIT: 10Gi
     CACHE_TYPE: "lib" #default
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "slowest"
@@ -290,7 +290,6 @@ build_tests:
       - GRADLE_TARGET: ":smokeTest"
         CACHE_TYPE: "smoke"
         MAVEN_OPTS: "-Xms256M -Xmx1024M"
-
   script:
     - *gitlab_base_ref_params
     - ./gradlew --version

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,2 +1,3 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.9/apache-maven-3.8.9-bin.zip

.mvn/wrapper/maven-wrapper.jar

@@ -6,6 +6,7 @@ plugins {
   id("datadog.dependency-locking")
   id("datadog.tracer-version")
   id("datadog.dump-hanged-test")
+  id("config-inversion-linter")
   id("datadog.ci-jobs")
 
   id("com.diffplug.spotless") version "6.13.0"

.mvn/wrapper/maven-wrapper.properties

@@ -64,6 +64,7 @@ dependencies {
   implementation("org.apache.maven", "maven-aether-provider", "3.3.9")
 
   implementation("com.github.zafarkhaja:java-semver:0.10.2")
+  implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   implementation("com.google.guava", "guava", "20.0")
   implementation(libs.asm)

build.gradle.kts

@@ -7,10 +7,6 @@ import org.gradle.api.plugins.jvm.JvmTestSuite
 import java.time.Duration
 import java.time.temporal.ChronoUnit
 
-val isTestingInstrumentation = providers.provider { 
-  project.findProperty("testingInstrumentation") as? Boolean ?: false 
-}
-
 // Need concrete implementation of BuildService in Kotlin
 abstract class ForkedTestLimit : BuildService<BuildServiceParameters.None>
 // Forked tests will fail with OOM if the memory is set too high. Gitlab allows at least a limit of 3.
@@ -43,25 +39,6 @@ tasks.withType<Test>().configureEach {
     !rootProject.providers.gradleProperty("rerun.tests.${project.name}").isPresent
   }
 
-  // Avoid executing classes used to test testing frameworks instrumentation
-  if (isTestingInstrumentation.get()) {
-    exclude("**/TestAssumption*", "**/TestSuiteSetUpAssumption*")
-    exclude("**/TestDisableTestTrace*")
-    exclude("**/TestError*")
-    exclude("**/TestFactory*")
-    exclude("**/TestFailed*")
-    exclude("**/TestFailedWithSuccessPercentage*")
-    exclude("**/TestInheritance*", "**/BaseTestInheritance*")
-    exclude("**/TestParameterized*")
-    exclude("**/TestRepeated*")
-    exclude("**/TestSkipped*")
-    exclude("**/TestSkippedClass*")
-    exclude("**/TestSucceed*")
-    exclude("**/TestTemplate*")
-    exclude("**/TestUnskippable*")
-    exclude("**/TestWithSetup*")
-  }
-
   // Split up tests that want to run forked in their own separate JVM for generated tasks
   if (name.startsWith("forkedTest") || name.endsWith("ForkedTest")) {
     setExcludes(emptyList())

buildSrc/build.gradle.kts

@@ -0,0 +1,23 @@
+plugins {
+  java
+}
+
+logger.info("Avoid executing classes used to test testing frameworks instrumentation")
+
+tasks.withType<Test>().configureEach {
+  exclude("**/TestAssumption*", "**/TestSuiteSetUpAssumption*")
+  exclude("**/TestDisableTestTrace*")
+  exclude("**/TestError*")
+  exclude("**/TestFactory*")
+  exclude("**/TestFailed*")
+  exclude("**/TestFailedWithSuccessPercentage*")
+  exclude("**/TestInheritance*", "**/BaseTestInheritance*")
+  exclude("**/TestParameterized*")
+  exclude("**/TestRepeated*")
+  exclude("**/TestSkipped*")
+  exclude("**/TestSkippedClass*")
+  exclude("**/TestSucceed*")
+  exclude("**/TestTemplate*")
+  exclude("**/TestUnskippable*")
+  exclude("**/TestWithSetup*")
+}

buildSrc/src/main/kotlin/datadog.configure-tests.gradle.kts

@@ -1,5 +1,13 @@
 package datadog.gradle.plugin.config
 
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.StaticJavaParser
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.expr.StringLiteralExpr
+import com.github.javaparser.ast.nodeTypes.NodeWithModifiers
+import com.github.javaparser.ast.Modifier
+import com.github.javaparser.ast.body.FieldDeclaration
+import com.github.javaparser.ast.body.VariableDeclarator
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.GradleException
@@ -14,6 +22,7 @@ class ConfigInversionLinter : Plugin<Project> {
     val extension = target.extensions.create("supportedTracerConfigurations", SupportedTracerConfigurations::class.java)
     registerLogEnvVarUsages(target, extension)
     registerCheckEnvironmentVariablesUsage(target)
+    registerCheckConfigStringsTask(target, extension)
   }
 }
 
@@ -124,3 +133,93 @@ private fun registerCheckEnvironmentVariablesUsage(project: Project) {
     }
   }
 }
+
+// Helper functions for checking Config Strings
+private fun normalize(configValue: String) =
+  "DD_" + configValue.uppercase().replace("-", "_").replace(".", "_")
+
+// Checking "public" "static" "final"
+private fun NodeWithModifiers<*>.hasModifiers(vararg mods: Modifier.Keyword) =
+  mods.all { hasModifier(it) }
+
+/** Registers `checkConfigStrings` to validate config definitions against documented supported configurations. */
+private fun registerCheckConfigStringsTask(project: Project, extension: SupportedTracerConfigurations) {
+  val ownerPath = extension.configOwnerPath
+  val generatedFile = extension.className
+
+  project.tasks.register("checkConfigStrings") {
+    group = "verification"
+    description = "Validates that all config definitions in `dd-trace-api/src/main/java/datadog/trace/api/config` exist in `metadata/supported-configurations.json`"
+
+    val mainSourceSetOutput = ownerPath.map {
+      project.project(it)
+        .extensions.getByType<SourceSetContainer>()
+        .named(SourceSet.MAIN_SOURCE_SET_NAME)
+        .map { main -> main.output }
+    }
+    inputs.files(mainSourceSetOutput)
+
+    doLast {
+      val repoRoot: Path = project.rootProject.projectDir.toPath()
+      val configDir = repoRoot.resolve("dd-trace-api/src/main/java/datadog/trace/api/config").toFile()
+
+      if (!configDir.exists()) {
+        throw GradleException("Config directory not found: ${configDir.absolutePath}")
+      }
+
+      val urls = mainSourceSetOutput.get().get().files.map { it.toURI().toURL() }.toTypedArray()
+      val (supported, aliasMapping) = URLClassLoader(urls, javaClass.classLoader).use { cl ->
+        val clazz = Class.forName(generatedFile.get(), true, cl)
+        @Suppress("UNCHECKED_CAST")
+        val supportedSet = clazz.getField("SUPPORTED").get(null) as Set<String>
+        @Suppress("UNCHECKED_CAST")
+        val aliasMappingMap = clazz.getField("ALIAS_MAPPING").get(null) as Map<String, String>
+        Pair(supportedSet, aliasMappingMap)
+      }
+
+      var parserConfig = ParserConfiguration()
+      parserConfig.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_8)
+
+      StaticJavaParser.setConfiguration(parserConfig)
+
+      val violations = buildList {
+        configDir.listFiles()?.forEach { file ->
+          val fileName = file.name
+          val cu: CompilationUnit = StaticJavaParser.parse(file)
+
+          cu.findAll(VariableDeclarator::class.java).forEach { varDecl ->
+            varDecl.parentNode
+              .map { it as? FieldDeclaration }
+              .ifPresent { field ->
+                if (field.hasModifiers(Modifier.Keyword.PUBLIC, Modifier.Keyword.STATIC, Modifier.Keyword.FINAL) &&
+                varDecl.typeAsString == "String") {
+
+                val fieldName = varDecl.nameAsString
+                if (fieldName.endsWith("_DEFAULT")) return@ifPresent
+                val init = varDecl.initializer.orElse(null) ?: return@ifPresent
+
+                if (init !is StringLiteralExpr) return@ifPresent
+                val rawValue = init.value
+
+                val normalized = normalize(rawValue)
+                if (normalized !in supported && normalized !in aliasMapping) {
+                  val line = varDecl.range.map { it.begin.line }.orElse(1)
+                  add("$fileName:$line -> Config '$rawValue' normalizes to '$normalized' " +
+                      "which is missing from '${extension.jsonFile.get()}'")
+                }
+              }
+            }
+          }
+        }
+      }
+
+      if (violations.isNotEmpty()) {
+        logger.error("\nFound config definitions not in '${extension.jsonFile.get()}':")
+        violations.forEach { logger.lifecycle(it) }
+        throw GradleException("Undocumented Environment Variables found. Please add the above Environment Variables to '${extension.jsonFile.get()}'.")
+      } else {
+        logger.info("All config strings are present in '${extension.jsonFile.get()}'.")
+      }
+    }
+  }
+}