Skip to content

Commit b0c71bd

Browse files
fix(deps): update errorprone packages to v2.47.0 (#2617)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
1 parent 48d486d commit b0c71bd

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ 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.46.0")
31-
api("com.google.errorprone:error_prone_core:2.46.0")
30+
api("com.google.errorprone:error_prone_annotations:2.47.0")
31+
api("com.google.errorprone:error_prone_core:2.47.0")
3232
api("io.github.netmikey.logunit:logunit-jul:2.0.0")
3333
api("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
3434
api("io.prometheus:simpleclient:0.16.0")

processors/src/main/java/io/opentelemetry/contrib/eventbridge/EventToSpanEventBridge.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.opentelemetry.sdk.logs.LogRecordProcessor;
1818
import io.opentelemetry.sdk.logs.ReadWriteLogRecord;
1919
import io.opentelemetry.sdk.logs.data.LogRecordData;
20-
import io.opentelemetry.sdk.logs.data.internal.ExtendedLogRecordData;
2120
import java.io.ByteArrayOutputStream;
2221
import java.io.IOException;
2322
import java.nio.charset.StandardCharsets;
@@ -76,10 +75,7 @@ public static EventToSpanEventBridge create() {
7675
@Override
7776
public void onEmit(Context context, ReadWriteLogRecord logRecord) {
7877
LogRecordData logRecordData = logRecord.toLogRecordData();
79-
if (!(logRecordData instanceof ExtendedLogRecordData)) {
80-
return;
81-
}
82-
String eventName = ((ExtendedLogRecordData) logRecordData).getEventName();
78+
String eventName = logRecordData.getEventName();
8379
if (eventName == null) {
8480
return;
8581
}
@@ -101,6 +97,8 @@ public void onEmit(Context context, ReadWriteLogRecord logRecord) {
10197
TimeUnit.NANOSECONDS);
10298
}
10399

100+
// since we are targeting Java 8 we can't use the ByteArrayOutputStream.toString(Charset)
101+
@SuppressWarnings("JdkObsolete")
104102
private static Attributes toSpanEventAttributes(LogRecordData logRecord) {
105103
AttributesBuilder builder = logRecord.getAttributes().toBuilder();
106104

0 commit comments

Comments
 (0)