Minor code cleanup. (#10008)

AlexeyKuznetsov-DD · amarziali · commit 71f7705b3c46 · 2025-11-21T15:25:59.000+01:00
diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt
@@ -19,8 +19,8 @@ class SupportedConfigPlugin : Plugin<Project> {
         className.set(extension.className)
       }
 
-    val sourceset = targetProject.extensions.getByType(SourceSetContainer::class.java).named(SourceSet.MAIN_SOURCE_SET_NAME)
-    sourceset.configure {
+    val sourceSet = targetProject.extensions.getByType(SourceSetContainer::class.java).named(SourceSet.MAIN_SOURCE_SET_NAME)
+    sourceSet.configure {
       java.srcDir(generateTask)
     }
 
diff --git a/components/json/build.gradle.kts b/components/json/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 apply(from = "$rootDir/gradle/java.gradle")
 
 jmh {
-  version = "1.28"
+  jmhVersion = libs.versions.jmh.get()
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle
@@ -1,4 +1,3 @@
-
 muzzle {
   pass {
     group = "org.elasticsearch.client"
diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle
@@ -1,4 +1,3 @@
-
 muzzle {
   pass {
     group = "org.elasticsearch.client"
diff --git a/dd-java-agent/instrumentation/jackson-core/build.gradle b/dd-java-agent/instrumentation/jackson-core/build.gradle
@@ -20,6 +20,7 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 
 final jacksonVersion = '2.14.0'
+
 dependencies {
   compileOnly(group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: jacksonVersion)
   compileOnly(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion)
diff --git a/dd-java-agent/instrumentation/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Server.groovy b/dd-java-agent/instrumentation/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Server.groovy
@@ -4,6 +4,7 @@ import com.ibm.wsspi.kernel.embeddable.Server
 import com.ibm.wsspi.kernel.embeddable.ServerBuilder
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.utils.PortUtils
+import groovy.xml.XmlParser
 import groovy.xml.XmlUtil
 
 import java.util.concurrent.TimeUnit
diff --git a/dd-java-agent/instrumentation/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Server.groovy b/dd-java-agent/instrumentation/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Server.groovy
@@ -4,6 +4,7 @@ import com.ibm.wsspi.kernel.embeddable.Server
 import com.ibm.wsspi.kernel.embeddable.ServerBuilder
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.utils.PortUtils
+import groovy.xml.XmlParser
 import groovy.xml.XmlUtil
 
 import java.util.concurrent.TimeUnit
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
@@ -37,7 +37,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:http-url-connection')
 
-  testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
+  testImplementation libs.spock.spring
 
   // These two version sets are compatible together:
   testImplementation enforcedPlatform('org.springframework.boot:spring-boot-dependencies:2.3.5.RELEASE') {
diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle b/dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle
@@ -37,7 +37,7 @@ dependencies {
   compileOnly(group: 'org.springframework', name: 'spring-aop', version: '1.2')
   implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
 
-  testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
+  testImplementation libs.spock.spring
   testImplementation group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
 
   // JPA dependencies
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle
@@ -66,7 +66,7 @@ dependencies {
   testImplementation group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final'
   testImplementation group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final'
 
-  testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
+  testImplementation libs.spock.spring
 
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.17.RELEASE'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.17.RELEASE'
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle
@@ -21,7 +21,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1')
 
-  testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
+  testImplementation libs.spock.spring
 
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.7.5'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.7.5'
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle
@@ -47,7 +47,7 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testImplementation project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
 
-  testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
+  testImplementation libs.spock.spring
 
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.0.0'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '3.0.0'
diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle
@@ -22,4 +22,3 @@ tasks.named("test", Test) {
     environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
   }
 }
-
diff --git a/dd-smoke-tests/ratpack-1.5/build.gradle b/dd-smoke-tests/ratpack-1.5/build.gradle
@@ -11,6 +11,7 @@ tasks.named("jar", Jar) {
     attributes('Main-Class': 'datadog.smoketest.ratpack.RatpackApp')
   }
 }
+
 dependencies {
   implementation 'io.ratpack:ratpack-core:1.5.0'
   implementation 'com.sun.activation:jakarta.activation:1.2.2'
diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java
@@ -96,11 +96,12 @@ static Ledger ledger(int size) {
 
   /**
    * Deprecated in favor of typed getters like...
+   *
    * <ul>
-   * <li>{@link TagMap#getObject(String)}
-   * <li>{@link TagMap#getString(String)}
-   * <li>{@link TagMap#getBoolean(String)
-   * <li>...
+   *   <li>{@link TagMap#getObject(String)}
+   *   <li>{@link TagMap#getString(String)}
+   *   <li>{@link TagMap#getBoolean(String)}
+   *   <li>...
    * </ul>
    */
   @Deprecated

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ class SupportedConfigPlugin : Plugin<Project> {`
`19`	`19`	`className.set(extension.className)`
`20`	`20`	`}`
`21`	`21`
`22`		`- val sourceset = targetProject.extensions.getByType(SourceSetContainer::class.java).named(SourceSet.MAIN_SOURCE_SET_NAME)`
`23`		`- sourceset.configure {`
	`22`	`+ val sourceSet = targetProject.extensions.getByType(SourceSetContainer::class.java).named(SourceSet.MAIN_SOURCE_SET_NAME)`
	`23`	`+ sourceSet.configure {`
`24`	`24`	`java.srcDir(generateTask)`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ plugins {`
`5`	`5`	`apply(from = "$rootDir/gradle/java.gradle")`
`6`	`6`
`7`	`7`	`jmh {`
`8`		`- version = "1.28"`
	`8`	`+ jmhVersion = libs.versions.jmh.get()`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`muzzle {`
`3`	`2`	`pass {`
`4`	`3`	`group = "org.elasticsearch.client"`