Skip to content

Fallback to using ThrowableModel if serializing exception to bytes fails #2334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2023
Merged

Fallback to using ThrowableModel if serializing exception to bytes fails #2334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions ...rumentation/util/JavaSerializerWrapper.kt → ...strumentation/util/ThrowableSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import java.io.InputStream
import java.io.ObjectInputStream
import java.io.ObjectOutputStream
import java.io.ObjectStreamClass
import java.lang.RuntimeException

class ThrowableSerializer : Serializer<Throwable>() {
companion object {
Expand All @@ -29,7 +28,7 @@ class ThrowableSerializer : Serializer<Throwable>() {
val message: String?,
val stackTrace: Array<StackTraceElement>,
val cause: ThrowableModel?,
val serializedException: ByteArray,
val serializedExceptionBytes: ByteArray?,
)

override fun write(kryo: Kryo, output: Output, throwable: Throwable?) {
Expand All @@ -38,33 +37,44 @@ class ThrowableSerializer : Serializer<Throwable>() {
message = message,
stackTrace = stackTrace,
cause = cause?.toModel(),
serializedException = ByteArrayOutputStream().use { byteOutputStream ->
val objectOutputStream = ObjectOutputStream(byteOutputStream)
objectOutputStream.writeObject(this)
objectOutputStream.flush()
byteOutputStream.toByteArray()
serializedExceptionBytes = try {
ByteArrayOutputStream().use { byteOutputStream ->
val objectOutputStream = ObjectOutputStream(byteOutputStream)
objectOutputStream.writeObject(this)
objectOutputStream.flush()
byteOutputStream.toByteArray()
}
} catch (e: Throwable) {
if (loggedUnserializableExceptionClassIds.add(this::class.java.id)) {
logger.warn { "Failed to serialize ${this::class.java.id} to bytes, cause: $e" }
logger.warn { "Constructing ThrowableModel with serializedExceptionBytes = null" }
}
null
}
)
kryo.writeObject(output, throwable?.toModel())
}

override fun read(kryo: Kryo, input: Input, type: Class<out Throwable>): Throwable? {
fun ThrowableModel.toThrowable(): Throwable = try {
ByteArrayInputStream(this.serializedException).use { byteInputStream ->
val objectInputStream = IgnoringUidWrappingObjectInputStream(byteInputStream, kryo.classLoader)
objectInputStream.readObject() as Throwable
}
} catch (e: Throwable) {
if (loggedUnserializableExceptionClassIds.add(this.classId)) {
logger.warn { "Failed to deserialize ${this.classId} from bytes, cause: $e" }
logger.warn { "Falling back to constructing throwable instance from ThrowableModel" }
fun ThrowableModel.toThrowable(): Throwable {
val throwableFromBytes = this.serializedExceptionBytes?.let { bytes ->
try {
ByteArrayInputStream(bytes).use { byteInputStream ->
val objectInputStream = IgnoringUidWrappingObjectInputStream(byteInputStream, kryo.classLoader)
objectInputStream.readObject() as Throwable
}
} catch (e: Throwable) {
if (loggedUnserializableExceptionClassIds.add(this.classId)) {
logger.warn { "Failed to deserialize ${this.classId} from bytes, cause: $e" }
logger.warn { "Falling back to constructing throwable instance from ThrowableModel" }
}
null
}
}

val cause = cause?.toThrowable()
when {
RuntimeException::class.java.isAssignableFrom(classId.jClass) -> RuntimeException(message, cause)
Error::class.java.isAssignableFrom(classId.jClass) -> Error(message, cause)
else -> Exception(message, cause)
return throwableFromBytes ?: when {
RuntimeException::class.java.isAssignableFrom(classId.jClass) -> RuntimeException(message, cause?.toThrowable())
Error::class.java.isAssignableFrom(classId.jClass) -> Error(message, cause?.toThrowable())
else -> Exception(message, cause?.toThrowable())
}.also {
it.stackTrace = stackTrace
}
Expand Down