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]>
open-telemetry · May 10, 2023 · 3122897 · 3122897
1 parent 24b65ab
commit 3122897
Show file tree

Hide file tree

Showing 37 changed files with 105 additions and 9 deletions.
diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -123,6 +123,10 @@ tasks {
  // Allow underscore in test-type method names
  disable("MemberName")
  }
+ if (project.path.endsWith(":testing") || name.contains("Test")) {
+ // This check causes too many failures, ignore the ones in tests
+ disable("CanIgnoreReturnValueSuggester")
+ }
  }
  }
  }

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -42,7 +42,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.0.1"
 val autoValueVersion = "1.10.1"
-val errorProneVersion = "2.18.0"
+val errorProneVersion = "2.19.0"
 val byteBuddyVersion = "1.14.4"
 val asmVersion = "9.5"
 val jmhVersion = "1.36"

diff --git a/...in/java/io/opentelemetry/instrumentation/api/instrumenter/http/ForwardedHeaderParser.java b/...in/java/io/opentelemetry/instrumentation/api/instrumenter/http/ForwardedHeaderParser.java
@@ -5,14 +5,15 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter.http;
 
+import java.util.Locale;
 import javax.annotation.Nullable;
 
 final class ForwardedHeaderParser {
 
  /** Extract proto (aka scheme) from "Forwarded" http header. */
  @Nullable
  static String extractProtoFromForwardedHeader(String forwarded) {
- int start = forwarded.toLowerCase().indexOf("proto=");
+ int start = forwarded.toLowerCase(Locale.ROOT).indexOf("proto=");
  if (start < 0) {
  return null;
  }
@@ -32,7 +33,7 @@ static String extractProtoFromForwardedProtoHeader(String forwardedProto) {
  /** Extract client IP address from "Forwarded" http header. */
  @Nullable
  static String extractClientIpFromForwardedHeader(String forwarded) {
- int start = forwarded.toLowerCase().indexOf("for=");
+ int start = forwarded.toLowerCase(Locale.ROOT).indexOf("for=");
  if (start < 0) {
  return null;
  }

diff --git a/...-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressors.java b/...-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressors.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
@@ -20,6 +21,7 @@ enum Noop implements SpanSuppressor {
  INSTANCE;
 
  @Override
+ @CanIgnoreReturnValue
  public Context storeInContext(Context context, SpanKind spanKind, Span span) {
  return context;
  }

diff --git a/...ry/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingRequestHandler.java b/...ry/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingRequestHandler.java
@@ -10,6 +10,7 @@
 import com.amazonaws.Response;
 import com.amazonaws.handlers.HandlerContextKey;
 import com.amazonaws.handlers.RequestHandler2;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
@@ -47,6 +48,7 @@ public void beforeRequest(Request<?> request) {
  }
 
  @Override
+ @CanIgnoreReturnValue
  public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
  if (SqsReceiveMessageRequestAccess.isInstance(request)) {
  if (!SqsReceiveMessageRequestAccess.getAttributeNames(request)

diff --git a/.../src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java b/.../src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java
@@ -18,6 +18,7 @@
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -838,7 +839,7 @@ private static SpanDataAssert assertClientSpan(
  equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"),
  satisfies(
  SemanticAttributes.DB_STATEMENT,
- stringAssert -> stringAssert.startsWith(verb.toLowerCase())),
+ stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
  equalTo(SemanticAttributes.DB_OPERATION, verb),
  equalTo(SemanticAttributes.DB_SQL_TABLE, "Value"));
  }

diff --git a/...javaagent/instrumentation/internal/lambda/InnerClassLambdaMetafactoryInstrumentation.java b/...javaagent/instrumentation/internal/lambda/InnerClassLambdaMetafactoryInstrumentation.java
@@ -7,6 +7,7 @@
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.AsmVisitorWrapper;
@@ -42,6 +43,7 @@ public int mergeWriter(int flags) {
  }
 
  @Override
+ @CanIgnoreReturnValue
  public int mergeReader(int flags) {
  return flags;
  }

diff --git a/.../io/opentelemetry/javaagent/instrumentation/internal/reflection/ClassInstrumentation.java b/.../io/opentelemetry/javaagent/instrumentation/internal/reflection/ClassInstrumentation.java
@@ -7,6 +7,7 @@
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.AsmVisitorWrapper;
@@ -41,6 +42,7 @@ public int mergeWriter(int flags) {
  }
 
  @Override
+ @CanIgnoreReturnValue
  public int mergeReader(int flags) {
  return flags;
  }

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/jaxrs/CompletionStageFinishCallback.java b/.../java/io/opentelemetry/javaagent/instrumentation/jaxrs/CompletionStageFinishCallback.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import java.util.function.BiFunction;
@@ -22,6 +23,7 @@ public CompletionStageFinishCallback(
  }
 
  @Override
+ @CanIgnoreReturnValue
  public T apply(T result, Throwable throwable) {
  instrumenter.end(context, handlerData, null, throwable);
  return result;

diff --git a/...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java b/...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java
@@ -9,6 +9,7 @@
 import static java.util.logging.Level.FINE;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DbSystemValues;
 import java.io.UnsupportedEncodingException;
@@ -36,6 +37,7 @@
 public enum JdbcConnectionUrlParser {
  GENERIC_URL_LIKE() {
  @Override
+ @CanIgnoreReturnValue
  DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  try {
  // Attempt generic parsing
@@ -78,6 +80,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  // see http:https://jtds.sourceforge.net/faq.html#urlFormat
  JTDS_URL_LIKE() {
  @Override
+ @CanIgnoreReturnValue
  DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  String serverName = "";
 
@@ -150,6 +153,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  CASE_INSENSITIVE);
 
  @Override
+ @CanIgnoreReturnValue
  DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  String serverName = "";
  Integer port = null;
@@ -361,6 +365,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  private final Pattern userPattern = Pattern.compile("\\(\\s*user\\s*=\\s*([^ )]+)\\s*\\)");
 
  @Override
+ @CanIgnoreReturnValue
  DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  int addressEnd = jdbcUrl.indexOf(",address=");
  if (addressEnd > 0) {
@@ -527,6 +532,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
 
  ORACLE_AT() {
  @Override
+ @CanIgnoreReturnValue
  DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  if (jdbcUrl.contains("@(description")) {
  return ORACLE_AT_DESCRIPTION.doParse(jdbcUrl, builder);
@@ -569,6 +575,7 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  Pattern.compile("\\(\\s*service_name\\s*=\\s*([^ )]+)\\s*\\)");
 
  @Override
+ @CanIgnoreReturnValue
  DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
  String[] atSplit = jdbcUrl.split("@", 2);
 

diff --git a/.../jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/JmxRule.java b/.../jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/JmxRule.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.jmx.yaml;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.instrumentation.jmx.engine.BeanAttributeExtractor;
 import io.opentelemetry.instrumentation.jmx.engine.BeanGroup;
 import io.opentelemetry.instrumentation.jmx.engine.MetricAttribute;
@@ -79,6 +80,7 @@ public void setPrefix(String prefix) {
  this.prefix = validatePrefix(prefix.trim());
  }
 
+ @CanIgnoreReturnValue
  private String validatePrefix(String prefix) {
  // Do not accept empty string.
  // While it is theoretically acceptable, it probably indicates a user error.
@@ -98,6 +100,7 @@ public void setMapping(Map<String, Metric> mapping) {
  this.mapping = validateAttributeMapping(mapping);
  }
 
+ @CanIgnoreReturnValue
  private static Map<String, Metric> validateAttributeMapping(Map<String, Metric> mapping) {
  if (mapping.isEmpty()) {
  throw new IllegalStateException("No MBean attributes specified");

diff --git a/...n/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/Metric.java b/...n/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/Metric.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.jmx.yaml;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.instrumentation.jmx.engine.MetricInfo;
 import javax.annotation.Nullable;
 
@@ -28,6 +29,7 @@ public void setMetric(String metric) {
  this.metric = validateMetricName(metric.trim());
  }
 
+ @CanIgnoreReturnValue
  private String validateMetricName(String name) {
  requireNonEmpty(name, "The metric name is empty");
  return name;

diff --git a/...rics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/MetricStructure.java b/...rics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/MetricStructure.java
@@ -5,11 +5,13 @@
 
 package io.opentelemetry.instrumentation.jmx.yaml;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.instrumentation.jmx.engine.MetricAttribute;
 import io.opentelemetry.instrumentation.jmx.engine.MetricAttributeExtractor;
 import io.opentelemetry.instrumentation.jmx.engine.MetricInfo;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -37,7 +39,7 @@ abstract class MetricStructure {
 
  public void setType(String t) {
  // Do not complain about case variations
- t = t.trim().toUpperCase();
+ t = t.trim().toUpperCase(Locale.ROOT);
  this.metricType = MetricInfo.Type.valueOf(t);
  }
 
@@ -49,6 +51,7 @@ public void setUnit(String unit) {
  this.unit = validateUnit(unit.trim());
  }
 
+ @CanIgnoreReturnValue
  private String validateUnit(String unit) {
  requireNonEmpty(unit, "Metric unit is empty");
  return unit;

diff --git a/...n/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingConsumerInterceptor.java b/...n/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingConsumerInterceptor.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.kafkaclients.v2_6;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import java.util.Map;
 import java.util.Objects;
@@ -27,6 +28,7 @@ public class TracingConsumerInterceptor<K, V> implements ConsumerInterceptor<K,
  private String clientId;
 
  @Override
+ @CanIgnoreReturnValue
  public ConsumerRecords<K, V> onConsume(ConsumerRecords<K, V> records) {
  telemetry.buildAndFinishSpan(records, consumerGroup, clientId);
  return records;

diff --git a/...n/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingProducerInterceptor.java b/...n/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingProducerInterceptor.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.kafkaclients.v2_6;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import java.util.Map;
 import java.util.Objects;
@@ -26,6 +27,7 @@ public class TracingProducerInterceptor<K, V> implements ProducerInterceptor<K,
  @Nullable private String clientId;
 
  @Override
+ @CanIgnoreReturnValue
  public ProducerRecord<K, V> onSend(ProducerRecord<K, V> producerRecord) {
  telemetry.buildAndInjectSpan(producerRecord, clientId);
  return producerRecord;

diff --git a/...main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/ResponseFutureWrapper.java b/...main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/ResponseFutureWrapper.java
@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.javaagent.instrumentation.play.v2_6.Play26Singletons.instrumenter;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.context.Context;
 import play.api.mvc.Result;
 import scala.concurrent.ExecutionContext;
@@ -21,13 +22,15 @@ public static Future<Result> wrap(
  return future.transform(
  new AbstractFunction1<Result, Result>() {
  @Override
+ @CanIgnoreReturnValue
  public Result apply(Result result) {
  instrumenter().end(context, null, null, null);
  return result;
  }
  },
  new AbstractFunction1<Throwable, Throwable>() {
  @Override
+ @CanIgnoreReturnValue
  public Throwable apply(Throwable throwable) {
  instrumenter().end(context, null, null, throwable);
  return throwable;

diff --git a/...esources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java b/...esources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java
@@ -9,6 +9,7 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import java.util.Locale;
 import javax.annotation.Nullable;
 
 /** Factory of a {@link Resource} which provides information about the current operating system. */
@@ -60,7 +61,7 @@ static Resource buildResource() {
 
  @Nullable
  private static String getOs(String os) {
- os = os.toLowerCase();
+ os = os.toLowerCase(Locale.ROOT);
  if (os.startsWith("windows")) {
  return ResourceAttributes.OsTypeValues.WINDOWS;
  } else if (os.startsWith("linux")) {

diff --git a/...ces/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java b/...ces/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java
@@ -15,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 /** Factory of a {@link Resource} which provides information about the current running process. */
@@ -72,7 +73,7 @@ private static Resource doBuildResource() {
  .append("bin")
  .append(File.separatorChar)
  .append("java");
- if (osName != null && osName.toLowerCase().startsWith("windows")) {
+ if (osName != null && osName.toLowerCase(Locale.ROOT).startsWith("windows")) {
  executablePath.append(".exe");
  }
 

diff --git a/.../src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java b/.../src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java
@@ -41,6 +41,7 @@ public static ContextPayload from(Context context) {
  return payload;
  }
 
+ @SuppressWarnings("BanSerializableRead")
  public static ContextPayload read(ObjectInput oi) throws IOException {
  try {
  Object object = oi.readObject();

diff --git a/...a/io/opentelemetry/instrumentation/spring/integration/v4_1/TracingChannelInterceptor.java b/...a/io/opentelemetry/instrumentation/spring/integration/v4_1/TracingChannelInterceptor.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.spring.integration.v4_1;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.ContextPropagators;
@@ -137,6 +138,7 @@ public boolean preReceive(MessageChannel messageChannel) {
  }
 
  @Override
+ @CanIgnoreReturnValue
  public Message<?> postReceive(Message<?> message, MessageChannel messageChannel) {
  return message;
  }
@@ -146,6 +148,7 @@ public void afterReceiveCompletion(
  Message<?> message, MessageChannel messageChannel, Exception e) {}
 
  @Override
+ @CanIgnoreReturnValue
  public Message<?> beforeHandle(
  Message<?> message, MessageChannel channel, MessageHandler handler) {