Skip to content

Commit 3122897

Browse files
Bump errorProneVersion from 2.18.0 to 2.19.0 (#8459)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 24b65ab commit 3122897

File tree

37 files changed

+105
-9
lines changed

37 files changed

+105
-9
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ tasks {
123123
// Allow underscore in test-type method names
124124
disable("MemberName")
125125
}
126+
if (project.path.endsWith(":testing") || name.contains("Test")) {
127+
// This check causes too many failures, ignore the ones in tests
128+
disable("CanIgnoreReturnValueSuggester")
129+
}
126130
}
127131
}
128132
}

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ val DEPENDENCY_BOMS = listOf(
4242

4343
val autoServiceVersion = "1.0.1"
4444
val autoValueVersion = "1.10.1"
45-
val errorProneVersion = "2.18.0"
45+
val errorProneVersion = "2.19.0"
4646
val byteBuddyVersion = "1.14.4"
4747
val asmVersion = "9.5"
4848
val jmhVersion = "1.36"

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/ForwardedHeaderParser.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
package io.opentelemetry.instrumentation.api.instrumenter.http;
77

8+
import java.util.Locale;
89
import javax.annotation.Nullable;
910

1011
final class ForwardedHeaderParser {
1112

1213
/** Extract proto (aka scheme) from "Forwarded" http header. */
1314
@Nullable
1415
static String extractProtoFromForwardedHeader(String forwarded) {
15-
int start = forwarded.toLowerCase().indexOf("proto=");
16+
int start = forwarded.toLowerCase(Locale.ROOT).indexOf("proto=");
1617
if (start < 0) {
1718
return null;
1819
}
@@ -32,7 +33,7 @@ static String extractProtoFromForwardedProtoHeader(String forwardedProto) {
3233
/** Extract client IP address from "Forwarded" http header. */
3334
@Nullable
3435
static String extractClientIpFromForwardedHeader(String forwarded) {
35-
int start = forwarded.toLowerCase().indexOf("for=");
36+
int start = forwarded.toLowerCase(Locale.ROOT).indexOf("for=");
3637
if (start < 0) {
3738
return null;
3839
}

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressors.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.instrumentation.api.instrumenter;
77

8+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
89
import io.opentelemetry.api.trace.Span;
910
import io.opentelemetry.api.trace.SpanKind;
1011
import io.opentelemetry.context.Context;
@@ -20,6 +21,7 @@ enum Noop implements SpanSuppressor {
2021
INSTANCE;
2122

2223
@Override
24+
@CanIgnoreReturnValue
2325
public Context storeInContext(Context context, SpanKind spanKind, Span span) {
2426
return context;
2527
}

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingRequestHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.amazonaws.Response;
1111
import com.amazonaws.handlers.HandlerContextKey;
1212
import com.amazonaws.handlers.RequestHandler2;
13+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1314
import io.opentelemetry.context.Context;
1415
import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
1516
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
@@ -47,6 +48,7 @@ public void beforeRequest(Request<?> request) {
4748
}
4849

4950
@Override
51+
@CanIgnoreReturnValue
5052
public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
5153
if (SqsReceiveMessageRequestAccess.isInstance(request)) {
5254
if (!SqsReceiveMessageRequestAccess.getAttributeNames(request)

instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
1919
import java.util.Arrays;
2020
import java.util.List;
21+
import java.util.Locale;
2122
import java.util.concurrent.atomic.AtomicReference;
2223
import java.util.function.BiConsumer;
2324
import java.util.function.Function;
@@ -838,7 +839,7 @@ private static SpanDataAssert assertClientSpan(
838839
equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"),
839840
satisfies(
840841
SemanticAttributes.DB_STATEMENT,
841-
stringAssert -> stringAssert.startsWith(verb.toLowerCase())),
842+
stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
842843
equalTo(SemanticAttributes.DB_OPERATION, verb),
843844
equalTo(SemanticAttributes.DB_SQL_TABLE, "Value"));
844845
}

instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/InnerClassLambdaMetafactoryInstrumentation.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99

10+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1011
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1112
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1213
import net.bytebuddy.asm.AsmVisitorWrapper;
@@ -42,6 +43,7 @@ public int mergeWriter(int flags) {
4243
}
4344

4445
@Override
46+
@CanIgnoreReturnValue
4547
public int mergeReader(int flags) {
4648
return flags;
4749
}

instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ClassInstrumentation.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99

10+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1011
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1112
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1213
import net.bytebuddy.asm.AsmVisitorWrapper;
@@ -41,6 +42,7 @@ public int mergeWriter(int flags) {
4142
}
4243

4344
@Override
45+
@CanIgnoreReturnValue
4446
public int mergeReader(int flags) {
4547
return flags;
4648
}

instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/CompletionStageFinishCallback.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jaxrs;
77

8+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
89
import io.opentelemetry.context.Context;
910
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1011
import java.util.function.BiFunction;
@@ -22,6 +23,7 @@ public CompletionStageFinishCallback(
2223
}
2324

2425
@Override
26+
@CanIgnoreReturnValue
2527
public T apply(T result, Throwable throwable) {
2628
instrumenter.end(context, handlerData, null, throwable);
2729
return result;

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static java.util.logging.Level.FINE;
1010
import static java.util.regex.Pattern.CASE_INSENSITIVE;
1111

12+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1213
import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo;
1314
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DbSystemValues;
1415
import java.io.UnsupportedEncodingException;
@@ -36,6 +37,7 @@
3637
public enum JdbcConnectionUrlParser {
3738
GENERIC_URL_LIKE() {
3839
@Override
40+
@CanIgnoreReturnValue
3941
DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
4042
try {
4143
// Attempt generic parsing
@@ -78,6 +80,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
7880
// see http://jtds.sourceforge.net/faq.html#urlFormat
7981
JTDS_URL_LIKE() {
8082
@Override
83+
@CanIgnoreReturnValue
8184
DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
8285
String serverName = "";
8386

@@ -150,6 +153,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
150153
CASE_INSENSITIVE);
151154

152155
@Override
156+
@CanIgnoreReturnValue
153157
DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
154158
String serverName = "";
155159
Integer port = null;
@@ -361,6 +365,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
361365
private final Pattern userPattern = Pattern.compile("\\(\\s*user\\s*=\\s*([^ )]+)\\s*\\)");
362366

363367
@Override
368+
@CanIgnoreReturnValue
364369
DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
365370
int addressEnd = jdbcUrl.indexOf(",address=");
366371
if (addressEnd > 0) {
@@ -527,6 +532,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
527532

528533
ORACLE_AT() {
529534
@Override
535+
@CanIgnoreReturnValue
530536
DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
531537
if (jdbcUrl.contains("@(description")) {
532538
return ORACLE_AT_DESCRIPTION.doParse(jdbcUrl, builder);
@@ -569,6 +575,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
569575
Pattern.compile("\\(\\s*service_name\\s*=\\s*([^ )]+)\\s*\\)");
570576

571577
@Override
578+
@CanIgnoreReturnValue
572579
DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
573580
String[] atSplit = jdbcUrl.split("@", 2);
574581

0 commit comments

Comments
 (0)