Repository navigation
fix: parse SHIP messages correctly in live TCP and logtail sources - #1
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
During live capture (TCP log server and log tail sources), SHIP-level messages such as
connectionHello,messageProtocolHandshake,accessMethods, andconnectionClosewere not being parsed correctly.Both
source_tcp.goandsource_logtail.gohardcodedShipMsgType: ShipMsgTypeDataon every incoming message and exclusively calledParseSpineFromJSONto decode the payload.ParseSpineFromJSONonly succeeds when the top-level JSON key is"datagram"— the bare SPINE format logged by eebus-go. SHIP-level messages have different top-level keys, so they always fell through to the error branch and were emitted with the wrong type and a misleadingParseError: "could not parse SPINE datagram from log line".SPINE data messages worked correctly because eebus-go primarily logs bare
{"datagram":{...}}payloads, whichParseSpineFromJSONhandles fine.Solution
Removed the hardcoded
ShipMsgTypefrom message initialization. The parsing logic now follows a two-step fallback:ParseSpineFromJSON— if it succeeds, setShipMsgTypetoShipMsgTypeDataParseShipFromJSON, which correctly classifies all SHIP message types and still extracts any embedded SPINE payload when presentShipMsgTypeUnknownand a parse errorThis mirrors the approach already used correctly in
ImportEEBusHubLogFileinstore/logimport.go.Files Changed
internal/capture/source_logtail.go— fixedprocessLineinternal/capture/source_tcp.go— fixedemitMessage