diff --git a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts index 267a268b3..1dfc48318 100644 --- a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -79,6 +79,9 @@ tasks { // cognitive load is dubious. disable("YodaCondition") + // We get this warning in modules that compile for old java versions + disable("StringConcatToTextBlock") + if (name.contains("Jmh") || name.contains("Test")) { // Allow underscore in test-type method names disable("MemberName") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 0476e27c2..08fe0cb96 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { api("com.google.auto.value:auto-value:1.11.0") api("com.google.auto.value:auto-value-annotations:1.11.0") api("com.google.errorprone:error_prone_annotations:2.37.0") - api("com.google.errorprone:error_prone_core:2.36.0") + api("com.google.errorprone:error_prone_core:2.37.0") api("io.github.netmikey.logunit:logunit-jul:2.0.0") api("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha") api("io.prometheus:simpleclient:0.16.0") diff --git a/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/RecordingOptions.java b/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/RecordingOptions.java index 5c97262ef..4c95d9ec9 100644 --- a/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/RecordingOptions.java +++ b/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/RecordingOptions.java @@ -66,7 +66,8 @@ private enum Option { /* If the arg is null or an empty String, return the Option's default. */ private static String normalize(String arg, Option option) { - return arg == null || (arg = arg.trim()).isEmpty() ? option.defaultValue : arg; + arg = arg == null ? "" : arg.trim(); + return arg.isEmpty() ? option.defaultValue : arg; } /**