From 23b07cb0b6caf48b45cde77bcc16226e9b4a6a3b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 13:53:10 -0800 Subject: [PATCH 1/2] Disable errorprone RequestExplicitNullMarking Currently not causing failures, but spamming warnings. Ported from https://github.com/open-telemetry/opentelemetry-java/pull/7890 --- .../src/main/kotlin/otel.errorprone-conventions.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts index e61bc3060358..1e80ce2f2103 100644 --- a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -124,6 +124,7 @@ tasks { // Requires adding compile dependency to JSpecify disable("AddNullMarkedToPackageInfo") + disable("RequireExplicitNullMarking") if (testLatestDeps) { // Some latest dep tests are compiled for java 17 although the base version uses an older From bd8cd29fef667babb32ddc800e16e4cf8503ac04 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 14:51:44 -0800 Subject: [PATCH 2/2] fix --- .../src/main/kotlin/otel.errorprone-conventions.gradle.kts | 1 - .../src/main/kotlin/otel.nullaway-conventions.gradle.kts | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts index 1e80ce2f2103..e61bc3060358 100644 --- a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -124,7 +124,6 @@ tasks { // Requires adding compile dependency to JSpecify disable("AddNullMarkedToPackageInfo") - disable("RequireExplicitNullMarking") if (testLatestDeps) { // Some latest dep tests are compiled for java 17 although the base version uses an older diff --git a/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts b/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts index 2b41ad72a6c0..7181778b53ef 100644 --- a/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts @@ -18,6 +18,10 @@ nullaway { tasks { withType().configureEach { + options.errorprone { + // workaround for https://github.com/google/error-prone/issues/5387 + check("RequireExplicitNullMarking", CheckSeverity.OFF) + } options.errorprone.nullaway { if (name.contains("test", ignoreCase = true)) { disable() @@ -30,4 +34,3 @@ tasks { } } } -