Skip to content

Commit c2bf95c

Browse files
fix(deps): update errorprone packages to v2.44.0 (#2421)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 89a7086 commit c2bf95c

File tree

26 files changed

+43
-45
lines changed

26 files changed

+43
-45
lines changed

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/DockerHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99

1010
import java.io.BufferedReader;
1111
import java.io.FileNotFoundException;
12-
import java.io.FileReader;
1312
import java.io.IOException;
13+
import java.nio.file.Files;
14+
import java.nio.file.Paths;
1415
import java.util.logging.Logger;
1516

1617
class DockerHelper {
@@ -35,9 +36,8 @@ class DockerHelper {
3536
*
3637
* @return docker container ID. Empty string if it can`t be found.
3738
*/
38-
@SuppressWarnings("DefaultCharset")
3939
public String getContainerId() {
40-
try (BufferedReader br = new BufferedReader(new FileReader(cgroupPath))) {
40+
try (BufferedReader br = Files.newBufferedReader(Paths.get(cgroupPath))) {
4141
String line;
4242
while ((line = br.readLine()) != null) {
4343
if (line.length() > CONTAINER_ID_LENGTH) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import io.opentelemetry.sdk.resources.Resource;
1616
import io.opentelemetry.sdk.resources.ResourceBuilder;
1717

18-
public class AwsResourceDetector implements ComponentProvider<Resource> {
18+
public class AwsResourceDetector implements ComponentProvider {
1919

2020
@Override
2121
public Class<Resource> getType() {

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayComponentProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
1111
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1212

13-
public class AwsXrayComponentProvider implements ComponentProvider<TextMapPropagator> {
13+
public class AwsXrayComponentProvider implements ComponentProvider {
1414
@Override
1515
public Class<TextMapPropagator> getType() {
1616
return TextMapPropagator.class;

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaComponentProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.contrib.awsxray.propagator.AwsXrayLambdaPropagator;
1111
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1212

13-
public class AwsXrayLambdaComponentProvider implements ComponentProvider<TextMapPropagator> {
13+
public class AwsXrayLambdaComponentProvider implements ComponentProvider {
1414
@Override
1515
public Class<TextMapPropagator> getType() {
1616
return TextMapPropagator.class;

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureResourceDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.sdk.resources.Resource;
1212
import io.opentelemetry.sdk.resources.ResourceBuilder;
1313

14-
public final class AzureResourceDetector implements ComponentProvider<Resource> {
14+
public final class AzureResourceDetector implements ComponentProvider {
1515

1616
@Override
1717
public Class<Resource> getType() {

baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageLogRecordComponentProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
import io.opentelemetry.sdk.internal.IncludeExcludePredicate;
1212
import io.opentelemetry.sdk.logs.LogRecordProcessor;
1313

14-
@SuppressWarnings("rawtypes")
1514
@AutoService(ComponentProvider.class)
16-
public class BaggageLogRecordComponentProvider implements ComponentProvider<LogRecordProcessor> {
15+
public class BaggageLogRecordComponentProvider implements ComponentProvider {
1716
@Override
1817
public String getName() {
1918
return "baggage";

baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageSpanComponentProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
import io.opentelemetry.sdk.internal.IncludeExcludePredicate;
1212
import io.opentelemetry.sdk.trace.SpanProcessor;
1313

14-
@SuppressWarnings("rawtypes")
1514
@AutoService(ComponentProvider.class)
16-
public class BaggageSpanComponentProvider implements ComponentProvider<SpanProcessor> {
15+
public class BaggageSpanComponentProvider implements ComponentProvider {
1716
@Override
1817
public String getName() {
1918
return "baggage";

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ tasks {
8383
if (name.contains("Jmh") || name.contains("Test")) {
8484
// Allow underscore in test-type method names
8585
disable("MemberName")
86+
disable("SuppressWarningsWithoutExplanation")
8687
}
8788

8889
option("NullAway:CustomContractAnnotations", "io.opentelemetry.api.internal.Contract")

cel-sampler/src/main/java/io/opentelemetry/contrib/sampler/cel/internal/CelBasedSamplerComponentProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
2222
* at any time.
2323
*/
24-
public final class CelBasedSamplerComponentProvider implements ComponentProvider<Sampler> {
24+
public final class CelBasedSamplerComponentProvider implements ComponentProvider {
2525

2626
private static final String ACTION_RECORD_AND_SAMPLE = "RECORD_AND_SAMPLE";
2727
private static final String ACTION_DROP = "DROP";

cloudfoundry-resources/src/main/java/io/opentelemetry/contrib/cloudfoundry/resources/CloudFoundryResourceDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.resources.Resource;
1111

12-
public final class CloudFoundryResourceDetector implements ComponentProvider<Resource> {
12+
public final class CloudFoundryResourceDetector implements ComponentProvider {
1313

1414
@Override
1515
public Class<Resource> getType() {

0 commit comments

Comments
 (0)