Bump errorProneVersion from 2.16 to 2.17.0 (#7489)

Bumps `errorProneVersion` from 2.16 to 2.17.0. Updates `error_prone_annotations` from 2.16 to 2.17.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/error-prone/releases">error_prone_annotations's releases</a>.</em></p> <blockquote> <h2>Error Prone 2.17.0</h2> <p>New Checkers:</p> <ul> <li><a href="https://errorprone.info/bugpattern/AvoidObjectArrays"><code>AvoidObjectArrays</code></a></li> <li><a href="https://errorprone.info/bugpattern/Finalize"><code>Finalize</code></a></li> <li><a href="https://errorprone.info/bugpattern/IgnoredPureGetter"><code>IgnoredPureGetter</code></a></li> <li><a href="https://errorprone.info/bugpattern/ProtoFieldNullComparison"><code>ImpossibleNullComparison</code></a></li> <li><a href="https://errorprone.info/bugpattern/MathAbsoluteNegative"><code>MathAbsoluteNegative</code></a></li> <li><a href="https://errorprone.info/bugpattern/NewFileSystem"><code>NewFileSystem</code></a></li> <li><a href="https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch"><code>StatementSwitchToExpressionSwitch</code></a></li> <li><a href="https://errorprone.info/bugpattern/UnqualifiedYield"><code>UnqualifiedYield</code></a></li> </ul> <p>Fixed issues: <a href="https://github-redirect.dependabot.com/google/error-prone/issues/2321">#2321</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3144">#3144</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3297">#3297</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3428">#3428</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3437">#3437</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3462">#3462</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3482">#3482</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3494">#3494</a></p> <p><strong>Full Changelog</strong>: <a href="https://github.com/google/error-prone/compare/v2.16...v2.17.0">https://github.com/google/error-prone/compare/v2.16...v2.17.0</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/google/error-prone/commit/27de40ba6008f967c01a55ec83c9127419bfe433"><code>27de40b</code></a> Release Error Prone 2.17.0</li> <li><a href="https://github.com/google/error-prone/commit/bcf4dcf764082def27ad14b47128fae52fe6fe46"><code>bcf4dcf</code></a> Optimize checks that report exactly the same fix in multiple diagnostics, lik...</li> <li><a href="https://github.com/google/error-prone/commit/8ddb7cbb05dc4b278836fd5019751c4e225323d9"><code>8ddb7cb</code></a> Record Error Prone initialization time</li> <li><a href="https://github.com/google/error-prone/commit/1d23141bd74663ad12e20534d062bef223df6efa"><code>1d23141</code></a> Do the expensive bit last in UnusedMethod.</li> <li><a href="https://github.com/google/error-prone/commit/e3602572b020ae24c617b02676caa1993fba753a"><code>e360257</code></a> Fix yet another NonCanonicalType crash</li> <li><a href="https://github.com/google/error-prone/commit/5768290a151ac8e76ed5a2593239fef2cfcadb44"><code>5768290</code></a> Make UnusedMethod recognize com.google.acai annotations, com.google.caliper.B...</li> <li><a href="https://github.com/google/error-prone/commit/7340bdf01ddbc43dd8aa4444af8eb97d28cd3f18"><code>7340bdf</code></a> Audit EP checks for argumentless mock().</li> <li><a href="https://github.com/google/error-prone/commit/b92c9b1b55502de311d0d379b1dc2d0b2293f96b"><code>b92c9b1</code></a> Rip out GuardedBy:CheckMemberReferences.</li> <li><a href="https://github.com/google/error-prone/commit/63fb30be3fb8dcda83ec339d769ddb9649ac3e6b"><code>63fb30b</code></a> Have InvalidLink provide a hint about erasure if it sees < in an invalid meth...</li> <li><a href="https://github.com/google/error-prone/commit/4a5fd7bd5a1fc9d1eadcb9e0b963a06d35a3f01b"><code>4a5fd7b</code></a> Suppress FieldCanBeLocal based on unused prefices.</li> <li>Additional commits viewable in <a href="https://github.com/google/error-prone/compare/v2.16...v2.17.0">compare view</a></li> </ul> </details> <br /> Updates `error_prone_core` from 2.16 to 2.17.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/error-prone/releases">error_prone_core's releases</a>.</em></p> <blockquote> <h2>Error Prone 2.17.0</h2> <p>New Checkers:</p> <ul> <li><a href="https://errorprone.info/bugpattern/AvoidObjectArrays"><code>AvoidObjectArrays</code></a></li> <li><a href="https://errorprone.info/bugpattern/Finalize"><code>Finalize</code></a></li> <li><a href="https://errorprone.info/bugpattern/IgnoredPureGetter"><code>IgnoredPureGetter</code></a></li> <li><a href="https://errorprone.info/bugpattern/ProtoFieldNullComparison"><code>ImpossibleNullComparison</code></a></li> <li><a href="https://errorprone.info/bugpattern/MathAbsoluteNegative"><code>MathAbsoluteNegative</code></a></li> <li><a href="https://errorprone.info/bugpattern/NewFileSystem"><code>NewFileSystem</code></a></li> <li><a href="https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch"><code>StatementSwitchToExpressionSwitch</code></a></li> <li><a href="https://errorprone.info/bugpattern/UnqualifiedYield"><code>UnqualifiedYield</code></a></li> </ul> <p>Fixed issues: <a href="https://github-redirect.dependabot.com/google/error-prone/issues/2321">#2321</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3144">#3144</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3297">#3297</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3428">#3428</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3437">#3437</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3462">#3462</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3482">#3482</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3494">#3494</a></p> <p><strong>Full Changelog</strong>: <a href="https://github.com/google/error-prone/compare/v2.16...v2.17.0">https://github.com/google/error-prone/compare/v2.16...v2.17.0</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/google/error-prone/commit/27de40ba6008f967c01a55ec83c9127419bfe433"><code>27de40b</code></a> Release Error Prone 2.17.0</li> <li><a href="https://github.com/google/error-prone/commit/bcf4dcf764082def27ad14b47128fae52fe6fe46"><code>bcf4dcf</code></a> Optimize checks that report exactly the same fix in multiple diagnostics, lik...</li> <li><a href="https://github.com/google/error-prone/commit/8ddb7cbb05dc4b278836fd5019751c4e225323d9"><code>8ddb7cb</code></a> Record Error Prone initialization time</li> <li><a href="https://github.com/google/error-prone/commit/1d23141bd74663ad12e20534d062bef223df6efa"><code>1d23141</code></a> Do the expensive bit last in UnusedMethod.</li> <li><a href="https://github.com/google/error-prone/commit/e3602572b020ae24c617b02676caa1993fba753a"><code>e360257</code></a> Fix yet another NonCanonicalType crash</li> <li><a href="https://github.com/google/error-prone/commit/5768290a151ac8e76ed5a2593239fef2cfcadb44"><code>5768290</code></a> Make UnusedMethod recognize com.google.acai annotations, com.google.caliper.B...</li> <li><a href="https://github.com/google/error-prone/commit/7340bdf01ddbc43dd8aa4444af8eb97d28cd3f18"><code>7340bdf</code></a> Audit EP checks for argumentless mock().</li> <li><a href="https://github.com/google/error-prone/commit/b92c9b1b55502de311d0d379b1dc2d0b2293f96b"><code>b92c9b1</code></a> Rip out GuardedBy:CheckMemberReferences.</li> <li><a href="https://github.com/google/error-prone/commit/63fb30be3fb8dcda83ec339d769ddb9649ac3e6b"><code>63fb30b</code></a> Have InvalidLink provide a hint about erasure if it sees < in an invalid meth...</li> <li><a href="https://github.com/google/error-prone/commit/4a5fd7bd5a1fc9d1eadcb9e0b963a06d35a3f01b"><code>4a5fd7b</code></a> Suppress FieldCanBeLocal based on unused prefices.</li> <li>Additional commits viewable in <a href="https://github.com/google/error-prone/compare/v2.16...v2.17.0">compare view</a></li> </ul> </details> <br /> Updates `error_prone_test_helpers` from 2.16 to 2.17.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/error-prone/releases">error_prone_test_helpers's releases</a>.</em></p> <blockquote> <h2>Error Prone 2.17.0</h2> <p>New Checkers:</p> <ul> <li><a href="https://errorprone.info/bugpattern/AvoidObjectArrays"><code>AvoidObjectArrays</code></a></li> <li><a href="https://errorprone.info/bugpattern/Finalize"><code>Finalize</code></a></li> <li><a href="https://errorprone.info/bugpattern/IgnoredPureGetter"><code>IgnoredPureGetter</code></a></li> <li><a href="https://errorprone.info/bugpattern/ProtoFieldNullComparison"><code>ImpossibleNullComparison</code></a></li> <li><a href="https://errorprone.info/bugpattern/MathAbsoluteNegative"><code>MathAbsoluteNegative</code></a></li> <li><a href="https://errorprone.info/bugpattern/NewFileSystem"><code>NewFileSystem</code></a></li> <li><a href="https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch"><code>StatementSwitchToExpressionSwitch</code></a></li> <li><a href="https://errorprone.info/bugpattern/UnqualifiedYield"><code>UnqualifiedYield</code></a></li> </ul> <p>Fixed issues: <a href="https://github-redirect.dependabot.com/google/error-prone/issues/2321">#2321</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3144">#3144</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3297">#3297</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3428">#3428</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3437">#3437</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3462">#3462</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3482">#3482</a>, <a href="https://github-redirect.dependabot.com/google/error-prone/issues/3494">#3494</a></p> <p><strong>Full Changelog</strong>: <a href="https://github.com/google/error-prone/compare/v2.16...v2.17.0">https://github.com/google/error-prone/compare/v2.16...v2.17.0</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/google/error-prone/commit/27de40ba6008f967c01a55ec83c9127419bfe433"><code>27de40b</code></a> Release Error Prone 2.17.0</li> <li><a href="https://github.com/google/error-prone/commit/bcf4dcf764082def27ad14b47128fae52fe6fe46"><code>bcf4dcf</code></a> Optimize checks that report exactly the same fix in multiple diagnostics, lik...</li> <li><a href="https://github.com/google/error-prone/commit/8ddb7cbb05dc4b278836fd5019751c4e225323d9"><code>8ddb7cb</code></a> Record Error Prone initialization time</li> <li><a href="https://github.com/google/error-prone/commit/1d23141bd74663ad12e20534d062bef223df6efa"><code>1d23141</code></a> Do the expensive bit last in UnusedMethod.</li> <li><a href="https://github.com/google/error-prone/commit/e3602572b020ae24c617b02676caa1993fba753a"><code>e360257</code></a> Fix yet another NonCanonicalType crash</li> <li><a href="https://github.com/google/error-prone/commit/5768290a151ac8e76ed5a2593239fef2cfcadb44"><code>5768290</code></a> Make UnusedMethod recognize com.google.acai annotations, com.google.caliper.B...</li> <li><a href="https://github.com/google/error-prone/commit/7340bdf01ddbc43dd8aa4444af8eb97d28cd3f18"><code>7340bdf</code></a> Audit EP checks for argumentless mock().</li> <li><a href="https://github.com/google/error-prone/commit/b92c9b1b55502de311d0d379b1dc2d0b2293f96b"><code>b92c9b1</code></a> Rip out GuardedBy:CheckMemberReferences.</li> <li><a href="https://github.com/google/error-prone/commit/63fb30be3fb8dcda83ec339d769ddb9649ac3e6b"><code>63fb30b</code></a> Have InvalidLink provide a hint about erasure if it sees < in an invalid meth...</li> <li><a href="https://github.com/google/error-prone/commit/4a5fd7bd5a1fc9d1eadcb9e0b963a06d35a3f01b"><code>4a5fd7b</code></a> Suppress FieldCanBeLocal based on unused prefices.</li> <li>Additional commits viewable in <a href="https://github.com/google/error-prone/compare/v2.16...v2.17.0">compare view</a></li> </ul> </details> <br /> You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mateusz Rzeszutek <[email protected]>
open-telemetry · Jan 3, 2023 · 0a045e3 · 0a045e3
1 parent d4d623d
commit 0a045e3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 3 deletions.
diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -112,6 +112,9 @@ tasks {
         // with older APIs.
         disable("InconsistentOverloads")
 
+        // lots of low level APIs use arrays
+        disable("AvoidObjectArrays")
+
         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
@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.0.1"
 val autoValueVersion = "1.10.1"
-val errorProneVersion = "2.16"
+val errorProneVersion = "2.17.0"
 val byteBuddyVersion = "1.12.20"
 val asmVersion = "9.4"
 val jmhVersion = "1.36"

diff --git a/...api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanLinksBuilder.java b/...api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanLinksBuilder.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
@@ -19,6 +20,7 @@ public interface SpanLinksBuilder {
    * @return this.
    * @see SpanBuilder#addLink(SpanContext)
    */
+  @CanIgnoreReturnValue
   SpanLinksBuilder addLink(SpanContext spanContext);
 
   /**
@@ -29,5 +31,6 @@ public interface SpanLinksBuilder {
    * @return this.
    * @see SpanBuilder#addLink(SpanContext)
    */
+  @CanIgnoreReturnValue
   SpanLinksBuilder addLink(SpanContext spanContext, Attributes attributes);
 }
diff --git a/...pi/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanStatusBuilder.java b/...pi/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanStatusBuilder.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.StatusCode;
 
@@ -24,6 +25,7 @@ public interface SpanStatusBuilder {
    * @return this.
    * @see Span#setStatus(StatusCode)
    */
+  @CanIgnoreReturnValue
   default SpanStatusBuilder setStatus(StatusCode statusCode) {
     return setStatus(statusCode, "");
   }
@@ -42,5 +44,6 @@ default SpanStatusBuilder setStatus(StatusCode statusCode) {
    * @return this.
    * @see Span#setStatus(StatusCode, String)
    */
+  @CanIgnoreReturnValue
   SpanStatusBuilder setStatus(StatusCode statusCode, String description);
 }
diff --git a/...ain/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java b/...ain/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java
@@ -7,6 +7,7 @@
 
 import static java.util.Collections.emptyList;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.logs.GlobalLoggerProvider;
 import io.opentelemetry.api.logs.LogRecordBuilder;
 import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.ContextDataAccessor;
@@ -61,12 +62,14 @@ static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B>
      * or removed in the future, so only enable this if you know you do not require attributes
      * filled by this instrumentation to be stable across versions.
      */
+    @CanIgnoreReturnValue
     public B setCaptureExperimentalAttributes(boolean captureExperimentalAttributes) {
       this.captureExperimentalAttributes = captureExperimentalAttributes;
       return asBuilder();
     }
 
     /** Sets whether log4j {@link MapMessage} attributes should be copied to logs. */
+    @CanIgnoreReturnValue
     public B setCaptureMapMessageAttributes(boolean captureMapMessageAttributes) {
       this.captureMapMessageAttributes = captureMapMessageAttributes;
       return asBuilder();
@@ -77,12 +80,14 @@ public B setCaptureMapMessageAttributes(boolean captureMapMessageAttributes) {
      *
      * @param captureMarkerAttribute To enable or disable the marker attribute
      */
+    @CanIgnoreReturnValue
     public B setCaptureMarkerAttribute(boolean captureMarkerAttribute) {
       this.captureMarkerAttribute = captureMarkerAttribute;
       return asBuilder();
     }
 
     /** Configures the {@link ThreadContext} attributes that will be copied to logs. */
+    @CanIgnoreReturnValue
     public B setCaptureContextDataAttributes(String captureContextDataAttributes) {
       this.captureContextDataAttributes = captureContextDataAttributes;
       return asBuilder();

diff --git a/.../src/main/java/io/opentelemetry/javaagent/tooling/bootstrap/BootstrapPackagesBuilder.java b/.../src/main/java/io/opentelemetry/javaagent/tooling/bootstrap/BootstrapPackagesBuilder.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.tooling.bootstrap;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.Collection;
 
 /**
@@ -21,6 +22,7 @@ public interface BootstrapPackagesBuilder {
    *
    * @return {@code this}
    */
+  @CanIgnoreReturnValue
   BootstrapPackagesBuilder add(String classNameOrPrefix);
 
   /**
@@ -29,5 +31,6 @@ public interface BootstrapPackagesBuilder {
    *
    * @return {@code this}
    */
+  @CanIgnoreReturnValue
   BootstrapPackagesBuilder addAll(Collection<String> classNamesOrPrefixes);
 }
diff --git a/muzzle/src/test/java/io/opentelemetry/instrumentation/TestHelperClasses.java b/muzzle/src/test/java/io/opentelemetry/instrumentation/TestHelperClasses.java
@@ -45,7 +45,7 @@ public interface AnotherHelperInterface extends HelperInterface {
 
     Object clone();
 
-    @SuppressWarnings("checkstyle:NoFinalizer")
+    @SuppressWarnings({"checkstyle:NoFinalizer", "Finalize"})
     void finalize();
   }
 

diff --git a/muzzle/src/test/java/io/opentelemetry/test/AnotherTestInterface.java b/muzzle/src/test/java/io/opentelemetry/test/AnotherTestInterface.java
@@ -18,6 +18,6 @@ public interface AnotherTestInterface extends TestInterface {
 
   Object clone();
 
-  @SuppressWarnings("checkstyle:NoFinalizer")
+  @SuppressWarnings({"checkstyle:NoFinalizer", "Finalize"})
   void finalize();
 }