fix: split c8y JSON over MQTT messages using newline delimiter #3302
Conversation
This file contains 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
This reverts commit 6748f0e.
Bravo555
requested review from
didier-wenzek,
albinsuresh,
jarhodes314 and
rina23q
as code owners
Bravo555
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
Bravo555
changed the title
\n
Instead of using a function made for splitting smartrest, just split on \n since that function will unescape \" sequences which we want to do in smartrest but avoid in JSON over MQTT. Signed-off-by: Marcel Guzik <[email protected]>
Bravo555
force-pushed
the
fix/3297/c8y-devicecontrol-split-on-newlines
branch
from
b92b458 to
9eee7ce
Compare
reubenmiller
changed the title
\n
Bravo555
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
reubenmiller
changed the title
reubenmiller
added
theme:c8y
Robot Results
|
Codecov ReportAttention: Patch coverage is Additional details and impacted files📢 Thoughts on this report? Let us know! |
|
Given the nature of this PR I also verified it end-to-end just to be sure it works as expected. |
didier-wenzek
approved these changes
Dec 17, 2024
Comment on lines
635
to
+637
| // JSON over MQTT messages on c8y/devicecontrol/notifications can contain multiple operations in a single MQTT | ||
| // message, so split them | ||
| let operation_payloads = collect_c8y_messages(message.payload_str()?); | ||
| let operation_payloads = message.payload_str()?.lines(); |
There was a problem hiding this comment.
Okay - assuming that Cumulocity emits a batch of messages using JSON lines. A point I fail to find in Cumulocity docs.
There was a problem hiding this comment.
Unfortunately I don't think this is publicly documented.
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.
Proposed changes
#3301 was wrong: using a function meant for splitting Smartrest will mess up JSON over MQTT since that function will unescape " sequences which we want to do in Smartrest but avoid in JSON over MQTT. This PR undoes this function's rename and uses regular line splitting for JSON over MQTT.
Types of changes
Paste Link to the issue
Checklist
cargo fmtas mentioned in CODING_GUIDELINEScargo clippyas mentioned in CODING_GUIDELINESFurther comments