diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt index dd23dbbcd05..2aad9ff564e 100644 --- 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 { 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 index 4dca7fc3036..ce67f74ff29 100644 --- 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 index f5506e22870..8ba65ada04f 100644 --- 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 index 29889b8aa29..441b5874e3c 100644 --- 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 index d3e04981923..0ac436fae5b 100644 --- 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 index 44015b0349a..d7613aa8c66 100644 --- 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 index cb93bef401a..1d7b819a240 100644 --- 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 index d846f5afea2..daf520accae 100644 --- 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 index bd4060b5ca9..2cbe98f0ee8 100644 --- 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 index 2d3f24c4d81..b4271d94180 100644 --- 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 index ce3ee56057c..baf8bcea1f1 100644 --- 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 index 95377bf5c18..f7b6603d1f3 100644 --- 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 index f580bf8a86f..d0b0139f25c 100644 --- 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 index 6eb8d9e310a..c9d6bf2dbaa 100644 --- 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 index 04415ddc29c..1166a2ebcfa 100644 --- 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... + * * */ @Deprecated