Skip to content

Clean up forbiddenApi configurations; after updating to the latest version, many entries are no longer relevant. #10241

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
AlexeyKuznetsov-DD merged 1 commit into from
Dec 18, 2025
Merged

Clean up forbiddenApi configurations; after updating to the latest version, many entries are no longer relevant. #10241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 4 deletions dd-java-agent/agent-bootstrap/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
}

tasks.named("forbiddenApisMain_java11", CheckForbiddenApis) {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/agent-builder/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
}

tasks.named("forbiddenApisMain_java11") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ tasks.withType(AbstractCompile).configureEach {
options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ tasks.named("compileTestJava", JavaCompile) {
options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
}

tasks.named("forbiddenApisMain", CheckForbiddenApis) {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
}

tasks.named("forbiddenApisMain", CheckForbiddenApis) {
it.failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ dependencies {
}
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ configurations.configureEach {
}
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
7 changes: 0 additions & 7 deletions dd-java-agent/agent-tooling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@ tasks.named("forbiddenApisJmh") {
ignoreFailures = true
}

tasks.named("forbiddenApisTest_java11") {
// it will fail due to missing JDK >= 9 classes
// java.lang.ClassNotFoundException: java.lang.invoke.StringConcatFactory
failOnMissingClasses = false
ignoreFailures = true
}

tasks.named("compileTestJava") {
dependsOn('generateTestClassNameTries')
}
Expand Down
4 changes: 2 additions & 2 deletions ...nt/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/UnknownArityExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package datadog.trace.agent.tooling.csi;

import java.util.UUID;
import datadog.trace.util.RandomUtils;
import java.util.function.Supplier;

public class UnknownArityExample implements Supplier<String> {

@Override
public String get() {
final String name = UUID.randomUUID().toString();
final String name = RandomUtils.randomUUID().toString();
final long height = Math.round(Math.random() * 200);
final double weight = Math.random() * 100;
final int age = (int) Math.round(Math.random() * 100);
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/exception-profiling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ dependencies {
}
}

tasks.named("forbiddenApisMain_java11") {
failOnMissingClasses = false
}

tasks.named("test", Test) {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/gradle-testing-5.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ dependencies {
compileOnly gradleApi()
compileOnly project(":dd-java-agent:instrumentation:junit:junit-4.10")
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@ repositories {
dependencies {
compileOnly gradleApi()
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@ repositories {
dependencies {
compileOnly gradleApi()
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ tasks.named("compileTestGroovy", GroovyCompile) {
configureCompiler(it, 11)
}

tasks.named("forbiddenApisMain_java11") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ testJvmConstraints {
}
}

tasks.named("forbiddenApisMain_java11") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ addTestSuiteExtendingForDir('ee10LatestDepForkedTest', 'ee10LatestDepTest', 'tes
}
}

tasks.named("forbiddenApisMain_java17") {
failOnMissingClasses = false
}

tasks.withType(GroovyCompile).configureEach {
configureCompiler(it, 17)
}
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/mule-4.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
}

tasks.named("forbiddenApisMain_java11") {
failOnMissingClasses = false
}

tasks.named("forkedTest", Test) {
testJvmConstraints {
maxJavaVersion = JavaVersion.VERSION_11
Expand Down
4 changes: 0 additions & 4 deletions dd-smoke-tests/appsec/springboot-security/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ tasks.named("jar", Jar) {
}
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}

// Use Java 17 to build application
tasks.withType(JavaCompile).configureEach {
configureCompiler(delegate, 17)
Expand Down
4 changes: 0 additions & 4 deletions dd-smoke-tests/iast-util/iast-util-11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,3 @@ dependencies {
tasks.named("compileJava", JavaCompile) {
configureCompiler(it, 11, JavaVersion.VERSION_11)
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}
4 changes: 0 additions & 4 deletions dd-smoke-tests/iast-util/iast-util-17/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,3 @@ dependencies {
tasks.named("compileJava", JavaCompile) {
configureCompiler(it, 17, JavaVersion.VERSION_17)
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}
4 changes: 0 additions & 4 deletions dd-smoke-tests/springboot-java-11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ tasks.named("compileJava", JavaCompile) {
configureCompiler(it, 11, JavaVersion.VERSION_11)
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}

tasks.withType(Test).configureEach {
dependsOn "bootJar"
def bootJarTask = tasks.named('bootJar', BootJar)
Expand Down
4 changes: 0 additions & 4 deletions dd-smoke-tests/springboot-java-17/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ tasks.named("compileJava", JavaCompile) {
configureCompiler(it, 17, JavaVersion.VERSION_17)
}

tasks.named("forbiddenApisMain") {
failOnMissingClasses = false
}

tasks.withType(Test).configureEach {
dependsOn "bootJar"
def bootJarTask = tasks.named('bootJar', BootJar)
Expand Down
4 changes: 0 additions & 4 deletions internal-api/internal-api-9/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ dependencies {
testImplementation(libs.slf4j)
}

tasks.forbiddenApisMain {
failOnMissingClasses = false
}

idea {
module {
jdkName = "11"
Expand Down
4 changes: 0 additions & 4 deletions products/feature-flagging/api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,3 @@ tasks.withType<JavaCompile>().configureEach {
tasks.withType<Javadoc>().configureEach {
javadocTool = javaToolchains.javadocToolFor(java.toolchain)
}

tasks.named<CheckForbiddenApis>("forbiddenApisMain") {
failOnMissingClasses = false
}
4 changes: 0 additions & 4 deletions utils/socket-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ dependencies {
testImplementation(files(sourceSets["main_java17"].output))
}

tasks.named<CheckForbiddenApis>("forbiddenApisMain_java17") {
failOnMissingClasses = false
}

fun AbstractCompile.configureCompiler(javaVersionInteger: Int, compatibilityVersion: JavaVersion? = null, unsetReleaseFlagReason: String? = null) {
(project.extra["configureCompiler"] as Closure<*>).call(this, javaVersionInteger, compatibilityVersion, unsetReleaseFlagReason)
}
Expand Down