Gradle 9.7 and miscellaneous tool updates

README.md

@@ -7,7 +7,7 @@ This repository contains helpers for working with the [Instrumentation](https://
 ## Features
 
 * [`ClassInjector`](class-inject/src/main/java/datadog/instrument/classinject/ClassInjector.java)
-  * Supports injection of auxiliary classes, even in the bootstrap class-loader
+  * Supports injection of auxiliary classes, even on the bootstrap classpath
 * [`ClassFile`](class-match/src/main/java/datadog/instrument/classmatch/ClassFile.java)
   * Optimized class-file parser for extracting the header or outline of a class
 * [`ClassLoaderValue`](utils/src/main/java/datadog/instrument/utils/ClassLoaderValue.java)

build.gradle.kts

@@ -23,7 +23,7 @@ java {
   withSourcesJar()
 }
 
-val embed by configurations.creating {
+val embed = configurations.create("embed") {
   isTransitive = false
 }
 

buildSrc/src/main/kotlin/instrument-glue.gradle.kts

@@ -17,15 +17,15 @@ sourceSets {
   }
 }
 
-val glueImplementation by configurations
+val glueImplementation = configurations.getByName("glueImplementation")
 dependencies {
   glueImplementation(libs.asm)
   glueImplementation(libs.spotbugs.annotations)
   glueImplementation(project(":utils"))
 }
 
 val generateGlue = tasks.register<JavaExec>("generateGlue") {
-  val glue: List<String> by project.extra
+  @Suppress("UNCHECKED_CAST") val glue = project.extra["glue"] as List<String>
 
   // generate glue files under a consistent packaging location
   val resourcePath = generatedGlueResources.dir("datadog/instrument/glue/")

buildSrc/src/main/kotlin/java-common.gradle.kts

@@ -83,7 +83,7 @@ spotbugs {
 }
 
 // dependency configuration to help pull sample bytecode in for testing
-val sampleBytecode by configurations.creating {
+val sampleBytecode = configurations.create("sampleBytecode") {
   isTransitive = false
 }
 

class-inject/src/main/java/datadog/instrument/classinject/package-info.java

@@ -1,3 +1,4 @@
+/** Supports injection of auxiliary classes, even on the bootstrap classpath. */
 @ParametersAreNonnullByDefault
 package datadog.instrument.classinject;
 

class-match/build.gradle.kts

@@ -6,7 +6,7 @@ dependencies {
   implementation(project(":utils"))
 
   sampleBytecode("org.ow2.asm:asm-test:9.10.1")
-  sampleBytecode("org.springframework:spring-web:7.0.7")
+  sampleBytecode("org.springframework:spring-web:7.0.8")
   jmh(project(":testing"))
   jmh(libs.asm)
 }

class-match/src/main/java/datadog/instrument/classmatch/package-info.java

@@ -1,3 +1,4 @@
+/** Supports matching classes by name, hierarchy, annotations, methods, or fields. */
 @ParametersAreNonnullByDefault
 package datadog.instrument.classmatch;
 

field-inject/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  jmh (group = "com.blogspot.mydailyjava", name = "weak-lock-free", version = "0.18")
+  jmh("com.blogspot.mydailyjava:weak-lock-free:0.18")
 }

field-inject/src/main/java/datadog/instrument/fieldinject/package-info.java

@@ -1,3 +1,4 @@
+/** Supports Key-value object stores where keys and values have specific types. */
 @ParametersAreNonnullByDefault
 package datadog.instrument.fieldinject;
 

gradle.properties

@@ -1,6 +1,7 @@
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.gradle.parallel=true
+org.gradle.workers.max=4
 org.gradle.java.installations.auto-detect=false
 org.gradle.java.installations.auto-download=false
 org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME

gradle/libs.versions.toml

@@ -3,10 +3,10 @@ asm = "9.10.1"
 junit-jupiter = "5.14.4"
 junit-platform = "1.14.4"
 assertj = "3.27.7"
-spotless = "8.8.0"
-spotbugs = "6.5.8"
-spotbugs-annotations = "4.10.2"
-axion-release = "1.21.2"
+spotless = "8.10.0"
+spotbugs = "6.5.10"
+spotbugs-annotations = "4.10.3"
+axion-release = "1.21.3"
 nexus-publish = "2.0.0"
 jmh-plugin = "0.7.3"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

utils/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  sampleBytecode("org.springframework:spring-web:7.0.7")
+  sampleBytecode("org.springframework:spring-web:7.0.8")
   jmh(project(":testing"))
 }
 

utils/src/main/java/datadog/instrument/utils/package-info.java

@@ -1,3 +1,4 @@
+/** Utilities shared across instrumentation helpers. */
 @ParametersAreNonnullByDefault
 package datadog.instrument.utils;
 

utils/src/test/java/datadog/instrument/utils/ClassNameTrieTest.java

@@ -10,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -40,6 +41,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+@SuppressFBWarnings("NP_NONNULL_PARAM_VIOLATION")
 class ClassNameTrieTest {
 
   static ClassNameTrie testClassNamesTrie;