Merge branch 'master' into sarahchen6/workflow-to-enforce-no-groovy

Author: sarahchen6

.claude/skills/migrate-groovy-to-java/SKILL.md

@@ -5,17 +5,19 @@ description: migrate test groovy files to java
 
 Migrate test Groovy files to Java using JUnit 5
 
-1. List all groovy files of the current gradle module
-2. convert groovy files to Java using Junit 5
-3. make sure the tests are still passing after migration
-4. remove groovy files
+1. List all Groovy files of the current Gradle module
+2. Convert Groovy files to Java using JUnit 5
+3. Make sure the tests are still passing after migration and that the test count has not changed
+4. Remove Groovy files
 5. Add the migrated module path(s) to `.github/g2j-migrated-modules.txt`
 
-When converting groovy code to java code make sure that:
-- the Java code generated is compatible with JDK 8
-- when translating Spock test, favor using `@CsvSource` with `|` delimiters
-- when using a `@MethodSource`, use the test method name, and suffix it with `_arguments`
-- when converting tuples, create light dedicated structure instead to keep the typing system
+When converting Groovy code to Java code, make sure that:
+- The Java code generated is compatible with JDK 8
+- When translating Spock tests, favor using `@CsvSource` with `|` delimiters
+- When using `@MethodSource`, name the arguments method by appending `Arguments` using camelCase to the test method name (e.g. `testMethodArguments`)
+- Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.of(...)` value or index the test case
+- When converting tuples, create a light dedicated structure instead to keep the typing system
 - Instead of checking a state and throwing an exception, use JUnit asserts
-- Do not wrap checked exception and throwing a Runtime exception, prefer adding a throws clause at method declaration
+- Do not wrap checked exceptions and throw a Runtime exception; prefer adding a throws clause at method declaration
 - Do not mark local variables `final`
+- Ensure variables are human-readable; avoid single-letter names and pre-define variables that are referenced multiple times

buildSrc/src/main/groovy/datadog/gradle/plugin/instrument/BuildTimeInstrumentationExtension.groovy

@@ -1,9 +1,11 @@
 package datadog.gradle.plugin.instrument
 
+import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.ListProperty
 
 abstract class BuildTimeInstrumentationExtension {
   abstract ListProperty<String> getPlugins()
   abstract ListProperty<DirectoryProperty> getAdditionalClasspath()
+  abstract ConfigurableFileCollection getIncludeClassDirectories()
 }

buildSrc/src/main/groovy/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPlugin.groovy

@@ -126,6 +126,7 @@ class BuildTimeInstrumentationPlugin implements Plugin<Project> {
           it.inputs.property("javaVersion", javaVersion)
           it.inputs.property("plugins", extension.plugins)
           it.inputs.files(extension.additionalClasspath)
+          it.inputs.files(extension.includeClassDirectories)
 
           // Temporary location for raw (un-instrumented) classes
           DirectoryProperty tmpUninstrumentedClasses = project.objects.directoryProperty().value(
@@ -149,7 +150,8 @@ class BuildTimeInstrumentationPlugin implements Plugin<Project> {
               extension.plugins,
               instrumentingClassPath,
               it.destinationDirectory,
-              tmpUninstrumentedClasses
+              tmpUninstrumentedClasses,
+              extension.includeClassDirectories
             )
           )
           logger.info("[BuildTimeInstrumentationPlugin] Configured post-compile instrumentation for $compileTaskName for source-set $sourceSetName")

buildSrc/src/main/groovy/datadog/gradle/plugin/instrument/InstrumentAction.groovy

@@ -44,6 +44,15 @@ abstract class InstrumentAction implements WorkAction<InstrumentWorkParameters>
       from(classesDirectory)
       into(tmpUninstrumentedDir)
     }
+    // Merge any additional class directories (e.g. unpacked dependency JARs) to be processed
+    parameters.includeClassDirectories.files.each { classesDir ->
+      if (classesDir.exists()) {
+        fileSystemOperations.copy {
+          from(classesDir)
+          into(tmpUninstrumentedDir)
+        }
+      }
+    }
     fileSystemOperations.delete {
       delete(objects.fileTree().from(classesDirectory))
     }

buildSrc/src/main/groovy/datadog/gradle/plugin/instrument/InstrumentPostProcessingAction.groovy

@@ -35,30 +35,33 @@ abstract class InstrumentPostProcessingAction implements Action<AbstractCompile>
   final FileCollection instrumentingClassPath
   final DirectoryProperty compilerOutputDirectory
   final DirectoryProperty tmpDirectory
+  final FileCollection includeClassDirectories
 
   @Inject
   InstrumentPostProcessingAction(
       String javaVersion,
       ListProperty<String> plugins,
       FileCollection instrumentingClassPath,
       DirectoryProperty compilerOutputDirectory,
-      DirectoryProperty tmpDirectory
+      DirectoryProperty tmpDirectory,
+      FileCollection includeClassDirectories
   ) {
     this.javaVersion = javaVersion == BuildTimeInstrumentationPlugin.DEFAULT_JAVA_VERSION ? JavaLanguageVersion.current() : JavaLanguageVersion.of(javaVersion)
     this.plugins = plugins
     this.instrumentingClassPath = instrumentingClassPath
     this.compilerOutputDirectory = compilerOutputDirectory
     this.tmpDirectory = tmpDirectory
+    this.includeClassDirectories = includeClassDirectories
   }
 
   @Override
   void execute(AbstractCompile task) {
     logger.info(
         """
-        [InstrumentPostProcessingAction] About to instrument classes 
-          javaVersion=${javaVersion}, 
-          plugins=${plugins.get()}, 
-          instrumentingClassPath=${instrumentingClassPath.files}, 
+        [InstrumentPostProcessingAction] About to instrument classes
+          javaVersion=${javaVersion},
+          plugins=${plugins.get()},
+          instrumentingClassPath=${instrumentingClassPath.files},
           rawClassesDirectory=${compilerOutputDirectory.get().asFile}
         """.stripIndent()
     )
@@ -72,6 +75,7 @@ abstract class InstrumentPostProcessingAction implements Action<AbstractCompile>
       parameters.instrumentingClassPath.setFrom(postCompileAction.instrumentingClassPath)
       parameters.compilerOutputDirectory.set(postCompileAction.compilerOutputDirectory)
       parameters.tmpDirectory.set(postCompileAction.tmpDirectory)
+      parameters.includeClassDirectories.setFrom(postCompileAction.includeClassDirectories)
     })
   }
 

buildSrc/src/main/groovy/datadog/gradle/plugin/instrument/InstrumentWorkParameters.groovy

@@ -14,4 +14,5 @@ interface InstrumentWorkParameters extends WorkParameters {
   ConfigurableFileCollection getInstrumentingClassPath()
   DirectoryProperty getCompilerOutputDirectory()
   DirectoryProperty getTmpDirectory()
+  ConfigurableFileCollection getIncludeClassDirectories()
 }