diff --git a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java index 559c6200bc19..55e1d0bfcee0 100644 --- a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java +++ b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java @@ -15,10 +15,10 @@ import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester; import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory; import com.google.errorprone.matchers.Description; -import com.google.inject.Inject; import com.sun.source.tree.ClassTree; import com.sun.source.tree.MethodTree; import com.sun.source.util.TreePath; +import javax.inject.Inject; @AutoService(BugChecker.class) @BugPattern( diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 0098b3a67e92..cbb039693883 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -40,7 +40,7 @@ val DEPENDENCY_BOMS = listOf( val autoServiceVersion = "1.1.1" val autoValueVersion = "1.11.0" -val errorProneVersion = "2.29.2" +val errorProneVersion = "2.30.0" val byteBuddyVersion = "1.14.18" val asmVersion = "9.7" val jmhVersion = "1.37" diff --git a/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseDbRequest.java b/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseDbRequest.java index 4c174dde2dab..1afe12768aa2 100644 --- a/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseDbRequest.java +++ b/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseDbRequest.java @@ -16,13 +16,13 @@ public abstract class ClickHouseDbRequest { private static final SqlStatementSanitizer sanitizer = SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled()); - public static ClickHouseDbRequest create(String host, Integer port, String dbName, String sql) { + public static ClickHouseDbRequest create(String host, int port, String dbName, String sql) { return new AutoValue_ClickHouseDbRequest(host, port, dbName, sanitizer.sanitize(sql)); } public abstract String getHost(); - public abstract Integer getPort(); + public abstract int getPort(); public abstract String getDbName(); diff --git a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java index de18ece3011a..d0dbee2bb1d0 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java @@ -35,6 +35,7 @@ import java.net.URI; import java.util.Collections; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -103,7 +104,7 @@ private Future doSendRequest(Request request, URI uri) { protected void configure(HttpClientTestOptions.Builder optionsBuilder) { optionsBuilder.setSingleConnectionFactory( (host, port) -> { - URI uri = URI.create(String.format("http://%s:%d", host, port)); + URI uri = URI.create(String.format(Locale.ROOT, "http://%s:%d", host, port)); Service svc = getClient(uri, ClientType.SINGLE_CONN); return (path, headers) -> { // this is synchronized bc so is the Netty one; diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/Customer.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/Customer.java index cac701b9e950..27d780b22951 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/Customer.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/Customer.java @@ -5,6 +5,7 @@ package spring.jpa; +import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; import javax.persistence.Entity; @@ -55,7 +56,8 @@ public void setLastName(String lastName) { @Override public String toString() { - return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); + return String.format( + Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); } @Override diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/Customer.java b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/Customer.java index c98d8046d583..966098c7d03e 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/Customer.java +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/Customer.java @@ -9,6 +9,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; @@ -55,7 +56,8 @@ public void setLastName(String lastName) { @Override public String toString() { - return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); + return String.format( + Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); } @Override diff --git a/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbRequest.java b/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbRequest.java index 36ed4967b0a3..560993c266d4 100644 --- a/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbRequest.java +++ b/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbRequest.java @@ -18,13 +18,13 @@ public abstract class InfluxDbRequest { SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled()); public static InfluxDbRequest create( - String host, Integer port, String dbName, String operation, String sql) { + String host, int port, String dbName, String operation, String sql) { return new AutoValue_InfluxDbRequest(host, port, dbName, operation, sanitizer.sanitize(sql)); } public abstract String getHost(); - public abstract Integer getPort(); + public abstract int getPort(); public abstract String getDbName(); diff --git a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/spring/jpa/JpaCustomer.java b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/spring/jpa/JpaCustomer.java index f5288a98bd9d..e11bfe8053bc 100644 --- a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/spring/jpa/JpaCustomer.java +++ b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/spring/jpa/JpaCustomer.java @@ -5,6 +5,7 @@ package spring.jpa; +import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; import javax.persistence.Entity; @@ -55,7 +56,8 @@ public void setLastName(String lastName) { @Override public String toString() { - return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); + return String.format( + Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); } @Override diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/repository/Customer.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/repository/Customer.java index 2c1762a89566..e1229ff4fd5e 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/repository/Customer.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/repository/Customer.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0.repository; +import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; import org.springframework.data.annotation.Id; @@ -49,7 +50,8 @@ public void setLastName(String lastName) { @Override public String toString() { - return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); + return String.format( + Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); } @Override diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/test/java/spring/jpa/JpaCustomer.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/test/java/spring/jpa/JpaCustomer.java index 37e2f237c649..447399d961c6 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/test/java/spring/jpa/JpaCustomer.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/test/java/spring/jpa/JpaCustomer.java @@ -9,6 +9,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; @@ -55,7 +56,8 @@ public void setLastName(String lastName) { @Override public String toString() { - return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); + return String.format( + Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName); } @Override