diff --git a/backend/pkg/messages/messages.go b/backend/pkg/messages/messages.go index 28d83e896..b9cda43df 100644 --- a/backend/pkg/messages/messages.go +++ b/backend/pkg/messages/messages.go @@ -3011,18 +3011,16 @@ type ExceptionWithMeta struct { Name string Message string Payload string - Tags string Metadata string } func (msg *ExceptionWithMeta) Encode() []byte { - buf := make([]byte, 51+len(msg.Name)+len(msg.Message)+len(msg.Payload)+len(msg.Tags)+len(msg.Metadata)) + buf := make([]byte, 41+len(msg.Name)+len(msg.Message)+len(msg.Payload)+len(msg.Metadata)) buf[0] = 78 p := 1 p = WriteString(msg.Name, buf, p) p = WriteString(msg.Message, buf, p) p = WriteString(msg.Payload, buf, p) - p = WriteString(msg.Tags, buf, p) p = WriteString(msg.Metadata, buf, p) return buf[:p] } diff --git a/backend/pkg/messages/read-message.go b/backend/pkg/messages/read-message.go index 6610b0500..768f9297c 100644 --- a/backend/pkg/messages/read-message.go +++ b/backend/pkg/messages/read-message.go @@ -1303,9 +1303,6 @@ func DecodeExceptionWithMeta(reader io.Reader) (Message, error) { if msg.Payload, err = ReadString(reader); err != nil { return nil, err } - if msg.Tags, err = ReadString(reader); err != nil { - return nil, err - } if msg.Metadata, err = ReadString(reader); err != nil { return nil, err } diff --git a/ee/connectors/msgcodec/messages.py b/ee/connectors/msgcodec/messages.py index 23b1e6f61..c53e914c6 100644 --- a/ee/connectors/msgcodec/messages.py +++ b/ee/connectors/msgcodec/messages.py @@ -738,11 +738,10 @@ class AdoptedSSRemoveOwner(Message): class ExceptionWithMeta(Message): __id__ = 78 - def __init__(self, name, message, payload, tags, metadata): + def __init__(self, name, message, payload, metadata): self.name = name self.message = message self.payload = payload - self.tags = tags self.metadata = metadata diff --git a/ee/connectors/msgcodec/msgcodec.py b/ee/connectors/msgcodec/msgcodec.py index 329173412..1b94d8c99 100644 --- a/ee/connectors/msgcodec/msgcodec.py +++ b/ee/connectors/msgcodec/msgcodec.py @@ -660,7 +660,6 @@ class MessageCodec(Codec): name=self.read_string(reader), message=self.read_string(reader), payload=self.read_string(reader), - tags=self.read_string(reader), metadata=self.read_string(reader) ) diff --git a/frontend/app/player/MessageDistributor/messages/tracker.ts b/frontend/app/player/MessageDistributor/messages/tracker.ts index 7fcea573b..d55e20137 100644 --- a/frontend/app/player/MessageDistributor/messages/tracker.ts +++ b/frontend/app/player/MessageDistributor/messages/tracker.ts @@ -388,7 +388,6 @@ type TrExceptionWithMeta = [ name: string, message: string, payload: string, - tags: string, metadata: string, ] diff --git a/mobs/messages.rb b/mobs/messages.rb index 1eb3371cb..a115e8767 100644 --- a/mobs/messages.rb +++ b/mobs/messages.rb @@ -476,7 +476,6 @@ message 78, 'ExceptionWithMeta', :replayer => false do string 'Name' string 'Message' string 'Payload' - string 'Tags' string 'Metadata' end diff --git a/tracker/tracker/src/common/messages.gen.ts b/tracker/tracker/src/common/messages.gen.ts index ef080a04b..76cd224a1 100644 --- a/tracker/tracker/src/common/messages.gen.ts +++ b/tracker/tracker/src/common/messages.gen.ts @@ -446,7 +446,6 @@ export type ExceptionWithMeta = [ /*name:*/ string, /*message:*/ string, /*payload:*/ string, - /*tags:*/ string, /*metadata:*/ string, ] diff --git a/tracker/tracker/src/main/app/messages.gen.ts b/tracker/tracker/src/main/app/messages.gen.ts index 719bf1703..bab29dfb2 100644 --- a/tracker/tracker/src/main/app/messages.gen.ts +++ b/tracker/tracker/src/main/app/messages.gen.ts @@ -712,7 +712,6 @@ export function ExceptionWithMeta( name: string, message: string, payload: string, - tags: string, metadata: string, ): Messages.ExceptionWithMeta { return [ @@ -720,7 +719,6 @@ export function ExceptionWithMeta( name, message, payload, - tags, metadata, ] } diff --git a/tracker/tracker/src/main/index.ts b/tracker/tracker/src/main/index.ts index 723c92671..d2c97e072 100644 --- a/tracker/tracker/src/main/index.ts +++ b/tracker/tracker/src/main/index.ts @@ -285,13 +285,13 @@ export default class API { return } if (e instanceof Error) { - const msg = getExceptionMessage(e, [], tags, metadata) + const msg = getExceptionMessage(e, [], metadata) this.app.send(msg) } else if ( e instanceof ErrorEvent || ('PromiseRejectionEvent' in window && e instanceof PromiseRejectionEvent) ) { - const msg = getExceptionMessageFromEvent(e, undefined, tags, metadata) + const msg = getExceptionMessageFromEvent(e, undefined, metadata) if (msg != null) { this.app.send(msg) } diff --git a/tracker/tracker/src/main/modules/exception.ts b/tracker/tracker/src/main/modules/exception.ts index d51ead446..58cc401b7 100644 --- a/tracker/tracker/src/main/modules/exception.ts +++ b/tracker/tracker/src/main/modules/exception.ts @@ -30,52 +30,38 @@ function getDefaultStack(e: ErrorEvent): Array { export function getExceptionMessage( error: Error, fallbackStack: Array, - tags?: string[], metadata?: Record, ): Message { let stack = fallbackStack try { stack = ErrorStackParser.parse(error) } catch (e) {} - const metaPresent = metadata || tags + const metaPresent = !!metadata const method = metaPresent ? ExceptionWithMeta : JSException - return method( - error.name, - error.message, - JSON.stringify(stack), - JSON.stringify(tags), - JSON.stringify(metadata), - ) + return method(error.name, error.message, JSON.stringify(stack), JSON.stringify(metadata)) } export function getExceptionMessageFromEvent( e: ErrorEvent | PromiseRejectionEvent, context: typeof globalThis = window, - tags?: string[], metadata?: Record, ): Message | null { if (e instanceof ErrorEvent) { if (e.error instanceof Error) { - return getExceptionMessage(e.error, getDefaultStack(e), tags, metadata) + return getExceptionMessage(e.error, getDefaultStack(e), metadata) } else { let [name, message] = e.message.split(':') if (!message) { name = 'Error' message = e.message } - const metaPresent = metadata || tags + const metaPresent = !!metadata const method = metaPresent ? ExceptionWithMeta : JSException - return method( - name, - message, - JSON.stringify(getDefaultStack(e)), - JSON.stringify(tags), - JSON.stringify(metadata), - ) + return method(name, message, JSON.stringify(getDefaultStack(e)), JSON.stringify(metadata)) } } else if ('PromiseRejectionEvent' in context && e instanceof context.PromiseRejectionEvent) { if (e.reason instanceof Error) { - return getExceptionMessage(e.reason, [], tags, metadata) + return getExceptionMessage(e.reason, [], metadata) } else { let message: string try { @@ -83,15 +69,9 @@ export function getExceptionMessageFromEvent( } catch (_) { message = String(e.reason) } - const metaPresent = metadata || tags + const metaPresent = !!metadata const method = metaPresent ? ExceptionWithMeta : JSException - return method( - 'Unhandled Promise Rejection', - message, - '[]', - JSON.stringify(tags), - JSON.stringify(metadata), - ) + return method('Unhandled Promise Rejection', message, '[]', JSON.stringify(metadata)) } } return null diff --git a/tracker/tracker/src/webworker/MessageEncoder.gen.ts b/tracker/tracker/src/webworker/MessageEncoder.gen.ts index c2d960575..2c2942a07 100644 --- a/tracker/tracker/src/webworker/MessageEncoder.gen.ts +++ b/tracker/tracker/src/webworker/MessageEncoder.gen.ts @@ -231,7 +231,7 @@ export default class MessageEncoder extends PrimitiveEncoder { break case Messages.Type.ExceptionWithMeta: - return this.string(msg[1]) && this.string(msg[2]) && this.string(msg[3]) && this.string(msg[4]) && this.string(msg[5]) + return this.string(msg[1]) && this.string(msg[2]) && this.string(msg[3]) && this.string(msg[4]) break case Messages.Type.Zustand: