Merge branch 'master' into sarahchen6/combine-release-branch-workflows

Author: sarahchen6

.github/chainguard/self.enforce-datadog-merge-queue.comment-pr.sts.yaml

@@ -4,7 +4,7 @@ subject: repo:DataDog/dd-trace-java:pull_request
 
 claim_pattern:
   event_name: pull_request
-  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/enforce-datadog-merge-queue\.yaml@refs/heads/master
+  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/enforce-datadog-merge-queue\.yaml@refs/pull/[0-9]+/merge
 
 permissions:
   issues: write

AGENTS.md

@@ -7,26 +7,20 @@ It ships ~120 integrations (~200 instrumentations) for tracing, profiling, AppSe
 
 ## Project layout
 
+See [ARCHITECTURE.md](ARCHITECTURE.md) for detailed module descriptions.
+
 ```
-dd-java-agent/            Main agent
-  instrumentation/        All auto-instrumentations (one dir per framework)
-  agent-bootstrap/        Bootstrap classloader classes
-  agent-builder/          Agent build & bytecode weaving
-  agent-tooling/          Shared tooling for instrumentations
-  agent-{product}/        Product-specific modules (ci-visibility, iast, profiling, debugger, llmobs, aiguard, ...)
-  appsec/                 Application Security (WAF, threat detection)
+dd-java-agent/            Main agent (shadow jar, instrumentations, product modules)
 dd-trace-api/             Public API & configuration constants
 dd-trace-core/            Core tracing engine (spans, propagation, writer)
-dd-trace-ot/              OpenTracing compatibility layer
+dd-trace-ot/              Legacy OpenTracing compatibility library
 internal-api/             Internal shared API across modules
+components/               Shared low-level components (context, environment, json)
 products/                 Sub-products (feature flagging, metrics)
 communication/            HTTP transport to Datadog Agent
-components/               Shared low-level components
 remote-config/            Remote configuration support
 telemetry/                Agent telemetry
 utils/                    Shared utility modules (config, time, socket, test, etc.)
-metadata/                 Supported configurations metadata & requirements
-benchmark/                Performance benchmarks
 dd-smoke-tests/           Smoke tests (real apps + agent)
 docs/                     Developer documentation (see below)
 ```
@@ -35,6 +29,7 @@ docs/                     Developer documentation (see below)
 
 | Topic | File |
 |---|---|
+| Architecture & design | [ARCHITECTURE.md](ARCHITECTURE.md) |
 | Building from source | [BUILDING.md](BUILDING.md) |
 | Contributing & PR guidelines | [CONTRIBUTING.md](CONTRIBUTING.md) |
 | How instrumentations work | [docs/how_instrumentations_work.md](docs/how_instrumentations_work.md) |

ARCHITECTURE.md

@@ -123,30 +123,37 @@ class DumpHangedTestPlugin : Plugin<Project> {
       fun file(name: String, ext: String = "log") =
         File(dumpsDir, "$name-${System.currentTimeMillis()}.$ext")
 
-      // For simplicity, use `0` as the PID, which collects all thread dumps across JVMs.
-      val allThreadsFile = file("all-thread-dumps")
-      runCmd(Redirect.to(allThreadsFile), "jcmd", "0", "Thread.print", "-l")
-
       // Collect all JVMs pids.
       val allJavaProcessesFile = file("all-java-processes")
       runCmd(Redirect.to(allJavaProcessesFile), "jcmd", "-l")
 
-      // Collect pids for 'Gradle Test Executor'.
-      val pids = allJavaProcessesFile.readLines()
-        .filter { it.contains("Gradle Test Executor") }
-        .map { it.substringBefore(' ') }
+      // On IBM JDK thread dump can be collected by signaling the matching `Gradle Test Executor` process with `kill -3`.
+      // It will be writen into `/tmp/javacore.YYYYMMDD.HHMMSS.PID.SEQ.txt
+      if (isIbm8(allJavaProcessesFile)) {
+        val allProcessesFile = file("all-processes")
+        runCmd(Redirect.to(allProcessesFile), "ps", "-ef")
+        extractPidsIbm8(allProcessesFile).forEach { ibm8Pid ->
+          runCmd(Redirect.INHERIT, "kill", "-3", ibm8Pid)
+        }
+      } else {
+        val pids = extractPids(allJavaProcessesFile)
 
-      pids.forEach { pid ->
-        // Collect heap dump by pid.
-        val heapDumpPath = file("${pid}-heap-dump", "hprof").absolutePath
-        runCmd(Redirect.INHERIT, "jcmd", pid, "GC.heap_dump", heapDumpPath)
+        pids.forEach { pid ->
+          // Collect heap dump by pid.
+          val heapDumpPath = file("${pid}-heap-dump", "hprof").absolutePath
+          runCmd(Redirect.INHERIT, "jcmd", pid, "GC.heap_dump", heapDumpPath)
 
-        // Collect thread dump by pid.
-        val threadDumpFile = file("${pid}-thread-dump")
-        runCmd(Redirect.to(threadDumpFile), "jcmd", pid, "Thread.print", "-l")
+          // Collect thread dump by pid.
+          val threadDumpFile = file("${pid}-thread-dump")
+          runCmd(Redirect.to(threadDumpFile), "jcmd", pid, "Thread.print", "-l")
+        }
+
+        // Just in case collect all thread dumps by using special PID `0`.
+        val allThreadsFile = file("all-thread-dumps")
+        runCmd(Redirect.to(allThreadsFile), "jcmd", "0", "Thread.print", "-l")
       }
     } catch (e: Throwable) {
-      t.logger.warn("Taking dumps failed with error: ${e.message}, for ${t.path}")
+      t.logger.warn("Taking dumps failed with error: ${e.message ?: e.javaClass.name}, for ${t.path}")
     }
   }
 
@@ -175,4 +182,24 @@ class DumpHangedTestPlugin : Plugin<Project> {
       throw IOException("Process failed: ${args.joinToString(" ")}, exit code: $exitCode")
     }
   }
+
+  private fun isIbm8(file: File): Boolean =
+    file.readLines().any { it.contains("-PtestJvm=ibm8") }
+
+  private fun extractPids(file: File): List<String> =
+    file.readLines()
+      .filter { it.contains("Gradle Test Executor") }
+      .map { it.substringBefore(' ') }
+
+  private fun extractPidsIbm8(file: File): List<String> =
+    file.readLines()
+      .filter { it.contains("Gradle Test Executor") }
+      .filter { it.contains("ibm", ignoreCase = true) }
+      .mapNotNull(::extractPid)
+
+  private val whitespaceRegex = Regex("\\s+")
+
+  // ps -ef format produce output like: UID PID PPID ...
+  private fun extractPid(line: String): String? =
+    line.trimStart().split(whitespaceRegex, limit = 3).getOrNull(1)
 }