Merge remote-tracking branch 'origin/master' into bdu/bdu-muzzle-dedicated-class-tasks

Author: bric3

.github/CODEOWNERS

@@ -12,20 +12,20 @@
 /.gitlab/                              @DataDog/apm-release-platform
 /.gitlab-ci.yml                        @DataDog/apm-release-platform
 
-# @DataDog/apm-sdk-api-java
-/dd-java-agent/agent-otel                                       @DataDog/apm-sdk-api-java
-/dd-smoke-tests/sample-trace                                    @DataDog/apm-sdk-api-java
-/dd-trace-core/src/main/java/datadog/trace/core/baggage         @DataDog/apm-sdk-api-java
-/dd-trace-core/src/test/groovy/datadog/trace/core/baggage       @DataDog/apm-sdk-api-java
-/dd-trace-core/src/main/java/datadog/trace/core/propagation     @DataDog/apm-sdk-api-java
-/dd-trace-core/src/test/groovy/datadog/trace/core/propagation   @DataDog/apm-sdk-api-java
-/dd-trace-core/src/main/java/datadog/trace/core/scopemanager    @DataDog/apm-sdk-api-java
-/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager  @DataDog/apm-sdk-api-java
-/dd-trace-ot/                                                   @DataDog/apm-sdk-api-java
-/internal-api/src/main/java/datadog/trace/bootstrap             @DataDog/apm-sdk-api-java
-/internal-api/src/test/groovy/datadog/trace/bootstrap           @DataDog/apm-sdk-api-java
-/internal-api/src/main/java/datadog/trace/api/sampling          @DataDog/apm-sdk-api-java
-/internal-api/src/test/groovy/datadog/trace/api/sampling        @DataDog/apm-sdk-api-java
+# @DataDog/apm-sdk-capabilities-java
+/dd-java-agent/agent-otel                                       @DataDog/apm-sdk-capabilities-java
+/dd-smoke-tests/sample-trace                                    @DataDog/apm-sdk-capabilities-java
+/dd-trace-core/src/main/java/datadog/trace/core/baggage         @DataDog/apm-sdk-capabilities-java
+/dd-trace-core/src/test/groovy/datadog/trace/core/baggage       @DataDog/apm-sdk-capabilities-java
+/dd-trace-core/src/main/java/datadog/trace/core/propagation     @DataDog/apm-sdk-capabilities-java
+/dd-trace-core/src/test/groovy/datadog/trace/core/propagation   @DataDog/apm-sdk-capabilities-java
+/dd-trace-core/src/main/java/datadog/trace/core/scopemanager    @DataDog/apm-sdk-capabilities-java
+/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager  @DataDog/apm-sdk-capabilities-java
+/dd-trace-ot/                                                   @DataDog/apm-sdk-capabilities-java
+/internal-api/src/main/java/datadog/trace/bootstrap             @DataDog/apm-sdk-capabilities-java
+/internal-api/src/test/groovy/datadog/trace/bootstrap           @DataDog/apm-sdk-capabilities-java
+/internal-api/src/main/java/datadog/trace/api/sampling          @DataDog/apm-sdk-capabilities-java
+/internal-api/src/test/groovy/datadog/trace/api/sampling        @DataDog/apm-sdk-capabilities-java
 
 # @DataDog/apm-serverless
 /dd-trace-core/src/main/java/datadog/trace/lambda/              @DataDog/apm-serverless
@@ -77,16 +77,14 @@
 /dd-java-agent/agent-ci-visibility/                 @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/cucumber/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/jacoco/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/junit-4.10/          @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/junit-5.3/           @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/junit                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/karate/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/scalatest/           @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/selenium/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/testng/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/gradle-3.0/          @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/gradle-8.3/          @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/gradle/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/gradle-testing/      @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/maven-3.2.1/         @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/maven                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/maven-surefire/      @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/weaver/              @DataDog/ci-app-libraries-java
 /dd-smoke-tests/gradle/                             @DataDog/ci-app-libraries-java

.github/pull_request_template.md

@@ -7,7 +7,7 @@
 # Contributor Checklist
 
 - Format the title [according the contribution guidelines](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#title-format)
-- Assign the `type:` and (`comp:` or `inst:`) labels in addition to [any usefull labels](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#labels)
+- Assign the `type:` and (`comp:` or `inst:`) labels in addition to [any useful labels](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#labels)
 - Don't use `close`, `fix` or any [linking keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) when referencing an issue.  
   Use `solves` instead, and assign the PR [milestone](https://github.com/DataDog/dd-trace-java/milestones) to the issue
 - Update the [CODEOWNERS](https://github.com/DataDog/dd-trace-java/blob/master/.github/CODEOWNERS) file on source file addition, move, or deletion

.github/workflows/README.md

@@ -28,6 +28,14 @@ _Action:_ Check the pull request complies with [the contribution guidelines](htt
 
 _Recovery:_ Manually verify the guideline compliance.
 
+### check-pull-request-labels [🔗](check-pull-request-labels.yaml)
+
+_Trigger:_ When creating or updating a pull request.
+
+_Action:_ Check the pull request did not introduce unexpected label.
+
+_Recovery:_ Update the pull request or add a comment to trigger the action again.
+
 ### draft-release-notes-on-tag [🔗](draft-release-notes-on-tag.yaml)
 
 _Trigger:_ When creating a tag, or manually (providing a tag)

.github/workflows/check-pull-request-labels.yaml

@@ -0,0 +1,82 @@
+name: Validate PR Label Format
+on:
+  pull_request:
+    types: [opened, edited, ready_for_review, labeled]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check_pr_labels:
+    name: Check pull request labels
+    permissions:
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check pull request labels
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            // Skip draft pull requests
+            if (context.payload.pull_request.draft) {
+              return
+            }
+            // Define valid label categories
+            const validCategories = [
+              'type:',
+              'comp:',
+              'inst:',
+              'tag:',
+              'performance:',  // To refactor to 'ci: ' in the future
+              'run-tests:'     // Unused since GitLab migration
+            ]
+            // Look for invalid labels
+            const invalidLabels = context.payload.pull_request.labels
+              .map(label => label.name)
+              .filter(label => validCategories.every(prefix => !label.startsWith(prefix)))
+            const hasInvalidLabels = invalidLabels.length > 0
+            // Get existing comments to check for blocking comment
+            const comments = await github.rest.issues.listComments({
+              issue_number: context.payload.pull_request.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            })
+            const commentMarker = '<!-- dd-trace-java-check-pr-labels-workflow -->'
+            const blockingComment = comments.data.find(comment => comment.body.includes(commentMarker))
+            // Create or update blocking comment if there are invalid labels
+            if (hasInvalidLabels) {
+              const commentBody = '**PR Blocked - Invalid Label**\n\n' +
+                `The pull request introduced unexpected labels:\n\n` +
+                invalidLabels.map(label => `* \`${label}\``).join('\n') + '\n\n' +
+                '**This PR is blocked until:**\n' +
+                '1. The invalid labels are deleted, and\n' +
+                '2. A maintainer deletes this comment to unblock the PR\n\n' +
+                '**Note:** Simply removing labels from the pull request is not enough - a maintainer must remove the label and delete this comment to remove the block.\n\n' +
+                commentMarker
+
+              if (blockingComment) {
+                // Update existing blocking comment
+                await github.rest.issues.updateComment({
+                  comment_id: blockingComment.id,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body: commentBody
+                })
+              } else {
+                // Create new blocking comment
+                await github.rest.issues.createComment({
+                  issue_number: context.payload.pull_request.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body: commentBody
+                })
+              }
+              blockingComment = true
+            }
+            if (blockingComment) {
+              // Block the PR by failing the workflow
+              core.setFailed(`PR blocked: Invalid labels detected: (${invalidLabels.join(', ')}). A maintainer must delete the blocking comment after fixing the labels to allow merging.`)
+            }

BUILDING.md

@@ -63,9 +63,6 @@ Requirements to build the full project:
 
 Download and install JDK versions 8, 11, 17, 21 and 25, and GraalVM 17 for your OS.
 
-> [!NOTE]
-> While Temurin JDK 25 from [Eclipse Temurin releases](https://adoptium.net/temurin/releases/) has not been released, please download the OpenJDK EA version at [this link](https://jdk.java.net/25/). Add the required environment variable using an `export` command along the lines of `export JAVA_25_HOME=/Library/Java/JavaVirtualMachines/jdk-25.jdk/Contents/Home`. Then, confirm that this was set properly by executing `echo $JAVA_25_HOME`.
-
 #### macOS
 
 * Install the required JDKs using `brew`:

build.gradle.kts

@@ -3,18 +3,16 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 plugins {
   id("datadog.gradle-debug")
   id("datadog.dependency-locking")
+  id("datadog.tracer-version")
+  id("datadog.dump-hanged-test")
 
   id("com.diffplug.spotless") version "6.13.0"
   id("com.github.spotbugs") version "5.0.14"
   id("de.thetaphi.forbiddenapis") version "3.8"
-
-  id("tracer-version")
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-
   id("com.gradleup.shadow") version "8.3.6" apply false
   id("me.champeau.jmh") version "0.7.3" apply false
   id("org.gradle.playframework") version "0.13" apply false
-  id("info.solidsoft.pitest") version "1.9.11" apply false
 }
 
 description = "dd-trace-java"

buildSrc/build.gradle.kts

@@ -27,9 +27,21 @@ gradlePlugin {
       implementationClass = "datadog.gradle.plugin.CallSiteInstrumentationPlugin"
     }
     create("tracer-version-plugin") {
-      id = "tracer-version"
+      id = "datadog.tracer-version"
       implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
     }
+    create("dump-hanged-test-plugin") {
+      id = "datadog.dump-hanged-test"
+      implementationClass = "datadog.gradle.plugin.dump.DumpHangedTestPlugin"
+    }
+    create("supported-config-generation") {
+      id = "supported-config-generator"
+      implementationClass = "datadog.gradle.plugin.config.SupportedConfigPlugin"
+    }
+    create("supported-config-linter") {
+      id = "config-inversion-linter"
+      implementationClass = "datadog.gradle.plugin.config.ConfigInversionLinter"
+    }
   }
 }
 
@@ -52,6 +64,11 @@ dependencies {
   implementation("com.google.guava", "guava", "20.0")
   implementation("org.ow2.asm", "asm", "9.8")
   implementation("org.ow2.asm", "asm-tree", "9.8")
+
+  implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.2"))
+  implementation("com.fasterxml.jackson.core:jackson-databind")
+  implementation("com.fasterxml.jackson.core:jackson-annotations")
+  implementation("com.fasterxml.jackson.core:jackson-core")
 }
 
 tasks.compileKotlin {

buildSrc/src/integTest/kotlin/datadog/gradle/plugin/version/DumpHangedTestIntegrationTest.kt

@@ -0,0 +1,123 @@
+package datadog.gradle.plugin.version
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.UnexpectedBuildFailure
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertNotNull
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import java.nio.file.Paths
+
+class DumpHangedTestIntegrationTest {
+  @Test
+  fun `should not take dumps`(@TempDir projectDir: File) {
+    val output = runGradleTest(projectDir, testSleep = 1000)
+
+    // Assert Gradle output has no evidence of taking dumps.
+    assertFalse(output.contains("Taking dumps after 15 seconds delay for :test"))
+    assertFalse(output.contains("Requesting stop of task ':test' as it has exceeded its configured timeout of 20s."))
+
+    assertTrue(file(projectDir, "build").exists()) // Assert build happened.
+    assertFalse(file(projectDir, "build", "dumps").exists()) // Assert no dumps created.
+  }
+
+  @Test
+  fun `should take dumps`(@TempDir projectDir: File) {
+    val output = runGradleTest(projectDir, testSleep = 25_0000)
+
+    // Assert Gradle output has evidence of taking dumps.
+    assertTrue(output.contains("Taking dumps after 15 seconds delay for :test"))
+    assertTrue(output.contains("Requesting stop of task ':test' as it has exceeded its configured timeout of 20s."))
+
+    assertTrue(file(projectDir, "build").exists()) // Assert build happened.
+
+    val dumps = file(projectDir, "build", "dumps")
+    assertTrue(dumps.exists()) // Assert dumps created.
+
+    // Assert actual dumps created.
+    val dumpFiles = dumps.list()
+    assertNotNull(dumpFiles.find { it.endsWith(".hprof") })
+    assertNotNull(dumpFiles.find { it.startsWith("all-thread-dumps") })
+  }
+
+  private fun runGradleTest(projectDir: File, testSleep: Long): List<String> {
+    file(projectDir, "settings.gradle.kts").writeText(
+      """
+      rootProject.name = "test-project"
+      """.trimIndent()
+    )
+
+    file(projectDir, "build.gradle.kts").writeText(
+      """
+      import java.time.Duration
+      
+      plugins {
+        id("java")
+        id("datadog.dump-hanged-test")
+      }
+      
+      group = "datadog.dump.test"
+      
+      repositories {
+        mavenCentral()
+      }
+      
+      dependencies {
+        testImplementation(platform("org.junit:junit-bom:5.10.0"))
+        testImplementation("org.junit.jupiter:junit-jupiter")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+      }
+      
+      dumpHangedTest {
+        // Set the dump offset for 5 seconds to trigger taking dumps after 15 seconds.
+        dumpOffset.set(5)
+      }
+      
+      tasks.withType<Test>().configureEach {
+        // Set test timeout after 20 seconds.
+        timeout.set(Duration.ofSeconds(20))
+        
+        useJUnitPlatform()
+      }
+      """.trimIndent()
+    )
+
+    file(projectDir, "src", "test", "java", "SimpleTest.java", makeDirectory = true).writeText(
+      """
+      import org.junit.jupiter.api.Test;
+      
+      public class SimpleTest {
+          @Test
+          public void test() throws InterruptedException {
+              Thread.sleep($testSleep);
+          }
+      }
+      """.trimIndent()
+    )
+
+    try {
+      val buildResult = GradleRunner.create()
+        .forwardOutput()
+        .withPluginClasspath()
+        .withArguments("test")
+        .withProjectDir(projectDir)
+        .build()
+
+      return buildResult.output.lines()
+    } catch (e: UnexpectedBuildFailure) {
+      return e.buildResult.output.lines()
+    }
+  }
+
+  private fun file(projectDir: File, vararg parts: String, makeDirectory: Boolean = false): File {
+    val f = Paths.get(projectDir.absolutePath, *parts).toFile()
+
+    if (makeDirectory) {
+      f.parentFile.mkdirs()
+    }
+
+    return f
+  }
+}

buildSrc/src/integTest/kotlin/datadog/gradle/plugin/version/TracerVersionIntegrationTest.kt

@@ -265,7 +265,7 @@ class TracerVersionIntegrationTest {
     File(projectDir, "build.gradle.kts").writeText(
       """
       plugins {
-        id("tracer-version")
+        id("datadog.tracer-version")
       }
       
       tasks.register("printVersion") {

buildSrc/src/main/groovy/InstrumentingPlugin.groovy

@@ -49,7 +49,19 @@ class InstrumentingPlugin {
           .withErrorHandlers(
             Plugin.Engine.ErrorHandler.Enforcing.ALL_TYPES_RESOLVED,
             Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS,
-            Plugin.Engine.ErrorHandler.Failing.FAIL_LAST)
+            new Plugin.Engine.ErrorHandler() {
+              @Delegate
+              Plugin.Engine.ErrorHandler delegate = Plugin.Engine.ErrorHandler.Failing.FAIL_LAST
+
+              void onError(Map<TypeDescription, List<Throwable>> throwables) {
+                throw new IllegalStateException("Failed to transform at least one type: " + throwables).tap { ise ->
+                  throwables.values().flatten().each {
+                    ise.addSuppressed(it)
+                  }
+                };
+              }
+            }
+          )
           .with(Plugin.Engine.Dispatcher.ForSerialTransformation.Factory.INSTANCE)
           .apply(source, target, factories)