Skip to content

Upgrade IAST Error Prone and NullAway #12642

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

Open
bric3 wants to merge 3 commits into
base: master
Choose a base branch
from
+26 −27
Open

Upgrade IAST Error Prone and NullAway #12642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18820b3
chore: upgrade IAST Error Prone and NullAway
bric3 Sep 25, 2026
2db9c35
refactor: use default compiler for IAST
bric3 Sep 25, 2026
e68a3a5
fix: Preserve existing IAST nullable annotations
bric3 Sep 25, 2026
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
9 changes: 3 additions & 6 deletions dd-java-agent/agent-iast/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ plugins {
id 'dd-trace-java.module.product-subsystem'
}

tasks.named("compileJava", JavaCompile) {
configureCompiler(it, 11, JavaVersion.VERSION_1_8, "Error Prone 2.23.0 / NullAway 0.10.15 are incompatible with JDK 25 javac")
}

// First version with Mac M1 support
def grpcVersion = '1.42.2'
protobuf {
Expand Down Expand Up @@ -66,8 +62,8 @@ dependencies {
jmh project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')

compileOnly('org.jetbrains:annotations:24.0.0')
errorprone('com.uber.nullaway:nullaway:0.10.15')
errorprone('com.google.errorprone:error_prone_core:2.23.0')
errorprone('com.uber.nullaway:nullaway:0.14.2')
errorprone('com.google.errorprone:error_prone_core:2.50.0')
}

tasks.named("shadowJar", ShadowJar) {
Expand Down Expand Up @@ -117,6 +113,7 @@ tasks.named("forbiddenApisJmh") {

tasks.withType(JavaCompile).configureEach {
if (name == 'compileJava') {
options.compilerArgs.add('--should-stop=ifError=FLOW')
options.errorprone {
check("NullAway", CheckSeverity.ERROR)
option("NullAway:AnnotatedPackages", "com.datadog.iast")
Expand Down
38 changes: 19 additions & 19 deletions dd-java-agent/agent-iast/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
# To regenerate this file, run: ./gradlew :dd-java-agent:agent-iast:dependencies --write-locks
aopalliance:aopalliance:1.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
cafe.cryptography:curve25519-elisabeth:0.1.0=jmh,jmhCompileProtoPath,jmhRuntimeClasspath
cafe.cryptography:ed25519-elisabeth:0.1.0=jmh,jmhCompileProtoPath,jmhRuntimeClasspath
ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
Expand Down Expand Up @@ -37,39 +36,39 @@ com.google.android:annotations:4.1.1.4=jmhRuntimeClasspath,testCompileProtoPath,
com.google.api.grpc:proto-google-common-protos:2.0.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileProtoPath,errorprone,jmhAnnotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileProtoPath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.code.gson:gson:2.14.0=spotbugs
com.google.code.gson:gson:2.8.6=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_annotations:2.48.0=spotbugs
com.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_annotations:2.9.0=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_type_annotations:2.23.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.errorprone:javac:9+181-r4173-1=errorproneJavac
com.google.guava:failureaccess:1.0.1=annotationProcessor,errorprone,jmhAnnotationProcessor,jmhRuntimeClasspath,testAnnotationProcessor,testCompileProtoPath,testRuntimeClasspath
com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.guava:failureaccess:1.0.1=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.guava:guava:30.1.1-android=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.inject:guice:5.1.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jmhAnnotationProcessor,jmhRuntimeClasspath,testAnnotationProcessor,testCompileProtoPath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.protobuf:protobuf-java:3.18.2=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.protobuf:protobuf-java:4.33.2=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.google.protobuf:protoc:3.17.3=protobufToolsLocator_protoc
com.google.re2j:re2j:1.8=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.squareup.moshi:moshi:1.11.0=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.squareup.okio:okio:1.17.5=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.thoughtworks.qdox:qdox:1.12.1=codenarc
com.uber.nullaway:nullaway:0.10.15=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.uber.nullaway:nullaway:0.14.2=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
com.vaadin.external.google:android-json:0.0.20131108.vaadin1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
commons-fileupload:commons-fileupload:1.5=jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
commons-io:commons-io:2.11.0=jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
commons-io:commons-io:2.21.0=spotbugs
de.thetaphi:forbiddenapis:3.10=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
io.grpc:grpc-api:1.42.2=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
io.grpc:grpc-context:1.42.2=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
Expand Down Expand Up @@ -97,8 +96,8 @@ org.apache.logging.log4j:log4j-api:2.26.1=spotbugs
org.apache.logging.log4j:log4j-core:2.26.1=spotbugs
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.checkerframework:checker-compat-qual:2.5.5=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.checkerframework:dataflow-nullaway:3.39.0=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.checkerframework:checker-qual:4.2.3=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.checkerframework:dataflow-nullaway:4.2.3=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.codehaus.groovy:groovy-ant:3.0.23=codenarc
org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
Expand All @@ -121,6 +120,7 @@ org.jacoco:org.jacoco.report:0.8.15=jacocoAnt
org.jctools:jctools-core-jdk11:4.0.6=jmh,jmhCompileProtoPath,jmhRuntimeClasspath
org.jctools:jctools-core:4.0.6=jmh,jmhCompileProtoPath,jmhRuntimeClasspath
org.jetbrains:annotations:24.0.0=compileClasspath,compileProtoPath,jmhCompileClasspath
org.jspecify:jspecify:1.0.1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
Expand All @@ -146,7 +146,7 @@ org.ow2.asm:asm-tree:9.7.1=jmh,jmhCompileProtoPath
org.ow2.asm:asm-util:9.10.1=spotbugs
org.ow2.asm:asm-util:9.7.1=jmh,jmhCompileProtoPath,jmhRuntimeClasspath
org.ow2.asm:asm:9.10.1=compileClasspath,compileProtoPath,jacocoAnt,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor
org.skyscreamer:jsonassert:1.5.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
org.slf4j:jcl-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
org.slf4j:jul-to-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
Expand Down
6 changes: 4 additions & 2 deletions dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/Iterators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ public static <E> Iterator<E> of(@Nonnull final E head, @Nullable final E[] tail

@SuppressWarnings("unchecked")
@Nonnull
public static <E> Iterator<E> of(@Nullable final E... items) {
public static <E> Iterator<E> of(
final @org.jetbrains.annotations.Nullable E @org.jetbrains.annotations.Nullable ... items) {
return items == null || items.length == 0 ? empty() : new ArrayIterator<>(items);
}

@Nonnull
public static Iterator<?> join(@Nullable final Iterator<?>... iterators) {
public static Iterator<?> join(
final Iterator<?> @org.jetbrains.annotations.Nullable ... iterators) {
return iterators == null || iterators.length == 0 ? empty() : new JoinIterator(iterators);
}

Expand Down
Loading