Skip to content

Commit d480f15

Browse files
fix(deps): update errorproneversion to v2.30.0 (main) (minor) (#11991)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 33d6686 commit d480f15

File tree

10 files changed

+23
-12
lines changed

10 files changed

+23
-12
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
1616
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
1717
import com.google.errorprone.matchers.Description;
18-
import com.google.inject.Inject;
1918
import com.sun.source.tree.ClassTree;
2019
import com.sun.source.tree.MethodTree;
2120
import com.sun.source.util.TreePath;
21+
import javax.inject.Inject;
2222

2323
@AutoService(BugChecker.class)
2424
@BugPattern(

dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ val DEPENDENCY_BOMS = listOf(
4040

4141
val autoServiceVersion = "1.1.1"
4242
val autoValueVersion = "1.11.0"
43-
val errorProneVersion = "2.29.2"
43+
val errorProneVersion = "2.30.0"
4444
val byteBuddyVersion = "1.14.18"
4545
val asmVersion = "9.7"
4646
val jmhVersion = "1.37"

instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseDbRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ public abstract class ClickHouseDbRequest {
1616
private static final SqlStatementSanitizer sanitizer =
1717
SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());
1818

19-
public static ClickHouseDbRequest create(String host, Integer port, String dbName, String sql) {
19+
public static ClickHouseDbRequest create(String host, int port, String dbName, String sql) {
2020
return new AutoValue_ClickHouseDbRequest(host, port, dbName, sanitizer.sanitize(sql));
2121
}
2222

2323
public abstract String getHost();
2424

25-
public abstract Integer getPort();
25+
public abstract int getPort();
2626

2727
public abstract String getDbName();
2828

instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.net.URI;
3636
import java.util.Collections;
3737
import java.util.HashSet;
38+
import java.util.Locale;
3839
import java.util.Map;
3940
import java.util.Set;
4041
import java.util.concurrent.ConcurrentHashMap;
@@ -103,7 +104,7 @@ private Future<Response> doSendRequest(Request request, URI uri) {
103104
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
104105
optionsBuilder.setSingleConnectionFactory(
105106
(host, port) -> {
106-
URI uri = URI.create(String.format("http://%s:%d", host, port));
107+
URI uri = URI.create(String.format(Locale.ROOT, "http://%s:%d", host, port));
107108
Service<Request, Response> svc = getClient(uri, ClientType.SINGLE_CONN);
108109
return (path, headers) -> {
109110
// this is synchronized bc so is the Netty one;

instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/Customer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package spring.jpa;
77

8+
import java.util.Locale;
89
import java.util.Objects;
910
import javax.annotation.Nullable;
1011
import javax.persistence.Entity;
@@ -55,7 +56,8 @@ public void setLastName(String lastName) {
5556

5657
@Override
5758
public String toString() {
58-
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
59+
return String.format(
60+
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
5961
}
6062

6163
@Override

instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/Customer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import jakarta.persistence.GeneratedValue;
1010
import jakarta.persistence.GenerationType;
1111
import jakarta.persistence.Id;
12+
import java.util.Locale;
1213
import java.util.Objects;
1314
import javax.annotation.Nullable;
1415

@@ -55,7 +56,8 @@ public void setLastName(String lastName) {
5556

5657
@Override
5758
public String toString() {
58-
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
59+
return String.format(
60+
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
5961
}
6062

6163
@Override

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public abstract class InfluxDbRequest {
1818
SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());
1919

2020
public static InfluxDbRequest create(
21-
String host, Integer port, String dbName, String operation, String sql) {
21+
String host, int port, String dbName, String operation, String sql) {
2222
return new AutoValue_InfluxDbRequest(host, port, dbName, operation, sanitizer.sanitize(sql));
2323
}
2424

2525
public abstract String getHost();
2626

27-
public abstract Integer getPort();
27+
public abstract int getPort();
2828

2929
public abstract String getDbName();
3030

instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/spring/jpa/JpaCustomer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package spring.jpa;
77

8+
import java.util.Locale;
89
import java.util.Objects;
910
import javax.annotation.Nullable;
1011
import javax.persistence.Entity;
@@ -55,7 +56,8 @@ public void setLastName(String lastName) {
5556

5657
@Override
5758
public String toString() {
58-
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
59+
return String.format(
60+
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
5961
}
6062

6163
@Override

instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/repository/Customer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0.repository;
77

8+
import java.util.Locale;
89
import java.util.Objects;
910
import javax.annotation.Nullable;
1011
import org.springframework.data.annotation.Id;
@@ -49,7 +50,8 @@ public void setLastName(String lastName) {
4950

5051
@Override
5152
public String toString() {
52-
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
53+
return String.format(
54+
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
5355
}
5456

5557
@Override

instrumentation/spring/spring-data/spring-data-3.0/testing/src/test/java/spring/jpa/JpaCustomer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import jakarta.persistence.GeneratedValue;
1010
import jakarta.persistence.GenerationType;
1111
import jakarta.persistence.Id;
12+
import java.util.Locale;
1213
import java.util.Objects;
1314
import javax.annotation.Nullable;
1415

@@ -55,7 +56,8 @@ public void setLastName(String lastName) {
5556

5657
@Override
5758
public String toString() {
58-
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
59+
return String.format(
60+
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
5961
}
6062

6163
@Override

0 commit comments

Comments
 (0)