Skip to content

Commit c965b09

Browse files
fix(deps): update errorproneversion to v2.41.0 (minor) (#14331)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 4efd3d2 commit c965b09

File tree

62 files changed

+175
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+175
-176
lines changed

custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
package com.google.errorprone.bugpatterns.checkreturnvalue;
77

88
import com.google.errorprone.ErrorProneFlags;
9+
import com.google.errorprone.bugpatterns.WellKnownKeep;
910

1011
public final class CanIgnoreReturnValueSuggesterFactory {
1112

1213
// calls package private constructor of CanIgnoreReturnValueSuggester
1314
public static CanIgnoreReturnValueSuggester createCanIgnoreReturnValueSuggester(
14-
ErrorProneFlags errorProneFlags) {
15-
return new CanIgnoreReturnValueSuggester(errorProneFlags);
15+
ErrorProneFlags errorProneFlags, WellKnownKeep wellKnownKeep) {
16+
return new CanIgnoreReturnValueSuggester(errorProneFlags, wellKnownKeep);
1617
}
1718

1819
private CanIgnoreReturnValueSuggesterFactory() {}

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.google.errorprone.ErrorProneFlags;
1313
import com.google.errorprone.VisitorState;
1414
import com.google.errorprone.bugpatterns.BugChecker;
15+
import com.google.errorprone.bugpatterns.WellKnownKeep;
1516
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
1617
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
1718
import com.google.errorprone.matchers.Description;
@@ -33,9 +34,10 @@ public class OtelCanIgnoreReturnValueSuggester extends BugChecker
3334
private final CanIgnoreReturnValueSuggester delegate;
3435

3536
@Inject
36-
OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags) {
37+
OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags, WellKnownKeep wellKnownKeep) {
3738
delegate =
38-
CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(errorProneFlags);
39+
CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(
40+
errorProneFlags, wellKnownKeep);
3941
}
4042

4143
public OtelCanIgnoreReturnValueSuggester() {

dependencyManagement/build.gradle.kts

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

3939
val autoServiceVersion = "1.1.1"
4040
val autoValueVersion = "1.11.0"
41-
val errorProneVersion = "2.40.0"
41+
val errorProneVersion = "2.41.0"
4242
val byteBuddyVersion = "1.17.6"
4343
val asmVersion = "9.8"
4444
val jmhVersion = "1.37"

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ private static void debugContextPropagation(Context context) {
139139
}
140140

141141
private static class Propagation {
142-
public final String carrierClassName;
143-
public final StackTraceElement[] location;
142+
final String carrierClassName;
143+
final StackTraceElement[] location;
144144

145-
public Propagation(String carrierClassName, StackTraceElement[] location) {
145+
Propagation(String carrierClassName, StackTraceElement[] location) {
146146
this.carrierClassName = carrierClassName;
147147
this.location = location;
148148
}

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaFlowWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public GraphStageLogic createLogic(Attributes attributes) {
7373
private class TracingLogic extends GraphStageLogic {
7474
private final Deque<TracingRequest> requests = new ArrayDeque<>();
7575

76-
public TracingLogic() {
76+
TracingLogic() {
7777
super(shape);
7878

7979
// server pulls response, pass response from user code to server

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
211211
private static class HttpResponseHandler implements ResponseHandler<Void> {
212212
private final HttpClientResult requestResult;
213213

214-
public HttpResponseHandler(HttpClientResult requestResult) {
214+
HttpResponseHandler(HttpClientResult requestResult) {
215215
this.requestResult = requestResult;
216216
}
217217

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void executeRequestWithCallback(SimpleHttpRequest request, URI uri, HttpClientRe
127127
private static class ResponseCallback implements FutureCallback<SimpleHttpResponse> {
128128
private final HttpClientResult httpClientResult;
129129

130-
public ResponseCallback(HttpClientResult httpClientResult) {
130+
ResponseCallback(HttpClientResult httpClientResult) {
131131
this.httpClientResult = httpClientResult;
132132
}
133133

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
234234
private static class ResponseHandler implements HttpClientResponseHandler<Void> {
235235
private final HttpClientResult httpClientResult;
236236

237-
public ResponseHandler(HttpClientResult httpClientResult) {
237+
ResponseHandler(HttpClientResult httpClientResult) {
238238
this.httpClientResult = httpClientResult;
239239
}
240240

instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ public String handleRequest(Integer input, Context context) {
177177
}
178178
}
179179

180-
@SuppressWarnings("UnusedMethod")
181-
private static class CustomType {
180+
static class CustomType {
182181
String key;
183182
String value;
184183

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private Object writeReplace() {
8585
}
8686

8787
private static class CallerClass extends SecurityManager {
88-
public static final CallerClass INSTANCE = new CallerClass();
88+
static final CallerClass INSTANCE = new CallerClass();
8989

9090
@Override
9191
public Class<?>[] getClassContext() {

0 commit comments

Comments
 (0)