Skip to content

Commit d713bf3

Browse files
Update errorprone packages to v2.50.0 (#2914)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
1 parent 0b6c2c2 commit d713bf3

3 files changed

Lines changed: 10 additions & 14 deletions

File tree

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,12 @@ static void fetchMetadata(
103103
logArnBuilder
104104
.getLogGroupArn()
105105
.ifPresent(
106-
logGroupArn -> {
107-
attrBuilders.put(AWS_LOG_GROUP_ARNS, singletonList(logGroupArn));
108-
});
106+
logGroupArn -> attrBuilders.put(AWS_LOG_GROUP_ARNS, singletonList(logGroupArn)));
109107

110108
logArnBuilder
111109
.getLogStreamArn()
112110
.ifPresent(
113-
logStreamArn -> {
114-
attrBuilders.put(AWS_LOG_STREAM_ARNS, singletonList(logStreamArn));
115-
});
111+
logStreamArn -> attrBuilders.put(AWS_LOG_STREAM_ARNS, singletonList(logStreamArn)));
116112
} catch (IOException e) {
117113
logger.log(WARNING, "Can't get ECS metadata", e);
118114
}
@@ -126,13 +122,13 @@ private static Optional<String> getRegion(@Nullable String arn) {
126122
return getArnPart(arn, ArnPart.REGION);
127123
}
128124

129-
private static enum ArnPart {
125+
private enum ArnPart {
130126
REGION(3),
131127
ACCOUNT(4);
132128

133129
final int partIndex;
134130

135-
private ArnPart(int partIndex) {
131+
ArnPart(int partIndex) {
136132
this.partIndex = partIndex;
137133
}
138134
}
@@ -151,9 +147,7 @@ private static Optional<String> getArnPart(@Nullable String arn, ArnPart arnPart
151147
return Optional.of(arnParts[arnPart.partIndex]);
152148
}
153149

154-
// Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
155-
@SuppressWarnings("deprecation")
156-
static void parseResponse(
150+
private static void parseResponse(
157151
JsonParser parser, AttributesBuilder attrBuilders, LogArnBuilder logArnBuilder)
158152
throws IOException {
159153
if (!parser.isExpectedStartObjectToken()) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ tasks {
7979
disable("AddNullMarkedToClass")
8080
disable("AddNullMarkedToPackageInfo")
8181

82+
disable("ReferenceEquality")
83+
8284
if (name.contains("Jmh") || name.contains("Test")) {
8385
// Allow underscore in test-type method names
8486
disable("MemberName")

dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ dependencies {
2727
api("com.google.auto.service:auto-service-annotations:1.1.1")
2828
api("com.google.auto.value:auto-value:1.11.1")
2929
api("com.google.auto.value:auto-value-annotations:1.11.1")
30-
api("com.google.errorprone:error_prone_annotations:2.49.0")
31-
api("com.google.errorprone:error_prone_core:2.49.0")
32-
api("com.google.errorprone:error_prone_test_helpers:2.49.0")
30+
api("com.google.errorprone:error_prone_annotations:2.50.0")
31+
api("com.google.errorprone:error_prone_core:2.50.0")
32+
api("com.google.errorprone:error_prone_test_helpers:2.50.0")
3333
api("io.github.netmikey.logunit:logunit-jul:2.0.0")
3434
api("io.opentelemetry.proto:opentelemetry-proto:1.10.0-alpha")
3535
api("io.prometheus:simpleclient:0.16.0")

0 commit comments

Comments
 (0)