Skip to content

Minor code cleanup. #10008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2025
Merged

Minor code cleanup. #10008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c912954
Minor code cleanup.
AlexeyKuznetsov-DD Nov 20, 2025
67a5392
Missing `}`
AlexeyKuznetsov-DD Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion components/json/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ plugins {
apply(from = "$rootDir/gradle/java.gradle")

jmh {
version = "1.28"
jmhVersion = libs.versions.jmh.get()
}
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

muzzle {
pass {
group = "org.elasticsearch.client"
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

muzzle {
pass {
group = "org.elasticsearch.client"
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/jackson-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions ...liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Server.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Server.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion dd-smoke-tests/gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ tasks.named("test", Test) {
environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
}
}

1 change: 1 addition & 0 deletions dd-smoke-tests/ratpack-1.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 5 additions & 4 deletions internal-api/src/main/java/datadog/trace/api/TagMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down