@@ -247,7 +247,7 @@ object ProtocolMarshaller {
247247 deserializeLiveInstrument(value.getJsonObject(" liveInstrument" )),
248248 value.let {
249249 if (it.getValue(" occurredAt" ) is String ) {
250- Instant .fromEpochMilliseconds (value.getString(" occurredAt" ).toLong( ))
250+ Instant .parse (value.getString(" occurredAt" ))
251251 } else if (it.getValue(" occurredAt" ) is Number ) {
252252 Instant .fromEpochMilliseconds(value.getLong(" occurredAt" ))
253253 } else {
@@ -303,7 +303,7 @@ object ProtocolMarshaller {
303303 value.getString(" traceId" ),
304304 value.let {
305305 if (it.getValue(" occurredAt" ) is String ) {
306- Instant .fromEpochMilliseconds (value.getString(" occurredAt" ).toLong( ))
306+ Instant .parse (value.getString(" occurredAt" ))
307307 } else if (it.getValue(" occurredAt" ) is Number ) {
308308 Instant .fromEpochMilliseconds(value.getLong(" occurredAt" ))
309309 } else {
@@ -331,7 +331,7 @@ object ProtocolMarshaller {
331331 LogOrderType .valueOf(value.getString(" orderType" )),
332332 value.let {
333333 if (it.getValue(" timestamp" ) is String ) {
334- Instant .fromEpochMilliseconds (value.getString(" occurredAt " ).toLong( ))
334+ Instant .parse (value.getString(" timestamp " ))
335335 } else if (it.getValue(" timestamp" ) is Number ) {
336336 Instant .fromEpochMilliseconds(value.getLong(" timestamp" ))
337337 } else {
@@ -363,7 +363,7 @@ object ProtocolMarshaller {
363363 value.getString(" logId" ),
364364 value.let {
365365 if (it.getValue(" occurredAt" ) is String ) {
366- Instant .fromEpochMilliseconds (value.getString(" occurredAt" ).toLong( ))
366+ Instant .parse (value.getString(" occurredAt" ))
367367 } else if (it.getValue(" occurredAt" ) is Number ) {
368368 Instant .fromEpochMilliseconds(value.getLong(" occurredAt" ))
369369 } else {
@@ -389,7 +389,7 @@ object ProtocolMarshaller {
389389 return Log (
390390 value.let {
391391 if (it.getValue(" timestamp" ) is String ) {
392- Instant .fromEpochMilliseconds (value.getString(" occurredAt " ).toLong( ))
392+ Instant .parse (value.getString(" timestamp " ))
393393 } else if (it.getValue(" timestamp" ) is Number ) {
394394 Instant .fromEpochMilliseconds(value.getLong(" timestamp" ))
395395 } else {
0 commit comments