Skip to content

Commit aeade81

Browse files
fix(deps): update dependency com.google.errorprone:error_prone_core to v2.37.0 (#1805)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 4707618 commit aeade81

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ tasks {
7979
// cognitive load is dubious.
8080
disable("YodaCondition")
8181

82+
// We get this warning in modules that compile for old java versions
83+
disable("StringConcatToTextBlock")
84+
8285
if (name.contains("Jmh") || name.contains("Test")) {
8386
// Allow underscore in test-type method names
8487
disable("MemberName")

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
api("com.google.auto.value:auto-value:1.11.0")
2727
api("com.google.auto.value:auto-value-annotations:1.11.0")
2828
api("com.google.errorprone:error_prone_annotations:2.37.0")
29-
api("com.google.errorprone:error_prone_core:2.36.0")
29+
api("com.google.errorprone:error_prone_core:2.37.0")
3030
api("io.github.netmikey.logunit:logunit-jul:2.0.0")
3131
api("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
3232
api("io.prometheus:simpleclient:0.16.0")

jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/RecordingOptions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ private enum Option {
6666

6767
/* If the arg is null or an empty String, return the Option's default. */
6868
private static String normalize(String arg, Option option) {
69-
return arg == null || (arg = arg.trim()).isEmpty() ? option.defaultValue : arg;
69+
arg = arg == null ? "" : arg.trim();
70+
return arg.isEmpty() ? option.defaultValue : arg;
7071
}
7172

7273
/**

0 commit comments

Comments
 (0)