Skip to content

Handle reserved budget in HTTP end frame #1430

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 10 commits into from
Mar 12, 2025
Merged

Handle reserved budget in HTTP end frame #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c03c848
WIP
akrambek Mar 11, 2025
b8772a4
Support client side
akrambek Mar 11, 2025
b7d4e4d
Fix assertion typo
akrambek Mar 11, 2025
0ed74ff
WIP
akrambek Mar 11, 2025
c34600a
WIP
akrambek Mar 12, 2025
d2caf6f
Fix lua decoding
akrambek Mar 12, 2025
c5604b5
Clean up
akrambek Mar 12, 2025
25f0d7d
Revert the naming
akrambek Mar 12, 2025
aea340a
Fix typo
akrambek Mar 12, 2025
2e74750
Applied feedback
akrambek Mar 12, 2025
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
12 changes: 11 additions & 1 deletion ...dump/src/main/resources/io/aklivity/zilla/runtime/command/dump/internal/airline/zilla.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,11 +859,13 @@ function zilla_protocol.dissector(buffer, pinfo, tree)
handle_data_frame(buffer, next_offset, tree, subtree, sequence, acknowledge, maximum, pinfo, info, protocol_type)
elseif frame_type_id == FLUSH_ID then
handle_flush_frame(buffer, next_offset, subtree, pinfo, info)
elseif frame_type_id == END_ID then
handle_end_frame(buffer, next_offset, subtree, pinfo, info)
elseif frame_type_id == WINDOW_ID then
handle_window_frame(buffer, next_offset, subtree, sequence, acknowledge, maximum, pinfo, info)
elseif frame_type_id == SIGNAL_ID then
handle_signal_frame(buffer, next_offset, subtree, pinfo, info)
elseif frame_type_id == END_ID or frame_type_id == ABORT_ID or frame_type_id == RESET_ID or frame_type_id == CHALLENGE_ID then
elseif frame_type_id == ABORT_ID or frame_type_id == RESET_ID or frame_type_id == CHALLENGE_ID then
handle_extension(buffer, subtree, pinfo, info, next_offset, frame_type_id)
end
end
Expand Down Expand Up @@ -919,6 +921,14 @@ function handle_flush_frame(buffer, offset, subtree, pinfo, info)
handle_extension(buffer, subtree, pinfo, info, offset + 12, FLUSH_ID)
end

function handle_end_frame(buffer, offset, subtree, pinfo, info)
local slice_budget_id = buffer(offset, 8)
local slice_reserved = buffer(offset + 8, 4)
subtree:add_le(fields.budget_id, slice_budget_id)
subtree:add_le(fields.reserved, slice_reserved)
handle_extension(buffer, subtree, pinfo, info, offset + 12, END_ID)
end

function handle_window_frame(buffer, offset, subtree, sequence, acknowledge, maximum, pinfo, info)
local slice_budget_id = buffer(offset, 8)
local slice_padding = buffer(offset + 8, 4)
Expand Down
18 changes: 11 additions & 7 deletions .../zilla/runtime/command/dump/internal/AmqpLinkNetworkIT_shouldExchangeAttachAsReceiver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,10 +765,10 @@ Zilla Frame
Payload
Advanced Message Queuing Protocol

Frame 22: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 22: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 1625, Ack: 1470, Len: 120
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 1625, Ack: 1470, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Expand All @@ -792,18 +792,20 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000016
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

Frame 23: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 1745, Ack: 1470, Len: 137
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 1757, Ack: 1470, Len: 137
Zilla Frame
Frame Type ID: 0x40000002
Frame Type: WINDOW
Protocol Type ID: 0x112dc182
Protocol Type: amqp
Worker: 0
Offset: 0x00000910
Offset: 0x00000918
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: net0
Expand All @@ -827,17 +829,17 @@ Zilla Frame
Progress: 0
Progress/Maximum: 0/8192

Frame 24: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 24: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1470, Ack: 1882, Len: 120
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1470, Ack: 1894, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Protocol Type ID: 0x112dc182
Protocol Type: amqp
Worker: 0
Offset: 0x00000970
Offset: 0x00000978
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: net0
Expand All @@ -854,4 +856,6 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000018
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

14 changes: 9 additions & 5 deletions ...lla/runtime/command/dump/internal/AmqpStreamApplicationIT_shouldConnectAsReceiverOnly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ Zilla Frame
Progress: 0
Progress/Maximum: 0/8192

Frame 5: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 5: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 288, Ack: 289, Len: 120
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 288, Ack: 289, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Expand All @@ -169,18 +169,20 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000005
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

Frame 6: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 6: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 289, Ack: 408, Len: 120
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 289, Ack: 420, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x000001f0
Offset: 0x000001f8
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -197,4 +199,6 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000006
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

22 changes: 13 additions & 9 deletions ...lla/runtime/command/dump/internal/FileSystemApplicationIT_shouldReadFileExtensionOnly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ Zilla Frame
Progress: 0
Progress/Maximum: 0/8192

Frame 3: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 3: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 315, Ack: 1, Len: 120
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 315, Ack: 1, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Expand All @@ -115,18 +115,20 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000003
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

Frame 4: 261 bytes on wire (2088 bits), 261 bytes captured (2088 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 435, Len: 187
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 447, Len: 187
Zilla Frame
Frame Type ID: 0x00000001
Frame Type: BEGIN
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000138
Offset: 0x00000140
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand Down Expand Up @@ -172,17 +174,17 @@ Zilla Frame
Tag:
Timeout: 0

Frame 5: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 5: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 188, Ack: 435, Len: 120
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 188, Ack: 447, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x000001c8
Offset: 0x000001d0
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -199,18 +201,20 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000005
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

Frame 6: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 308, Ack: 435, Len: 137
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 320, Ack: 447, Len: 137
Zilla Frame
Frame Type ID: 0x40000002
Frame Type: WINDOW
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000218
Offset: 0x00000228
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand Down
42 changes: 23 additions & 19 deletions ...command/dump/internal/GrpcServerStreamRpcApplicationIT_shouldEstablishServerStreamRpc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ Zilla Frame
Length: 13
Payload

Frame 4: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 4: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 509, Ack: 1, Len: 120
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 509, Ack: 1, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Expand All @@ -154,18 +154,20 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x8000000000000004
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

Frame 5: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:2, Dst: fe80::3f3f:0:0:3
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 629, Ack: 1, Len: 137
Transmission Control Protocol, Src Port: 0, Dst Port: 7114, Seq: 641, Ack: 1, Len: 137
Zilla Frame
Frame Type ID: 0x40000002
Frame Type: WINDOW
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x000001d8
Offset: 0x000001e0
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -192,14 +194,14 @@ Zilla Frame
Frame 6: 202 bytes on wire (1616 bits), 202 bytes captured (1616 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 766, Len: 128
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 1, Ack: 778, Len: 128
Zilla Frame
Frame Type ID: 0x00000001
Frame Type: BEGIN
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000238
Offset: 0x00000240
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -221,14 +223,14 @@ Zilla Frame
Frame 7: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 129, Ack: 766, Len: 137
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 129, Ack: 778, Len: 137
Zilla Frame
Frame Type ID: 0x40000002
Frame Type: WINDOW
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000290
Offset: 0x00000298
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -255,14 +257,14 @@ Zilla Frame
Frame 8: 225 bytes on wire (1800 bits), 225 bytes captured (1800 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 266, Ack: 766, Len: 151
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 266, Ack: 778, Len: 151
Zilla Frame
Frame Type ID: 0x00000002
Frame Type: DATA
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x000002f0
Offset: 0x000002f8
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand Down Expand Up @@ -295,14 +297,14 @@ Zilla Frame
Frame 9: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 417, Ack: 766, Len: 137
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 417, Ack: 778, Len: 137
Zilla Frame
Frame Type ID: 0x40000002
Frame Type: WINDOW
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000360
Offset: 0x00000368
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -329,14 +331,14 @@ Zilla Frame
Frame 10: 225 bytes on wire (1800 bits), 225 bytes captured (1800 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 554, Ack: 766, Len: 151
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 554, Ack: 778, Len: 151
Zilla Frame
Frame Type ID: 0x00000002
Frame Type: DATA
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x000003c0
Offset: 0x000003c8
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand Down Expand Up @@ -366,17 +368,17 @@ Zilla Frame
Length: 14
Payload

Frame 11: 194 bytes on wire (1552 bits), 194 bytes captured (1552 bits)
Frame 11: 206 bytes on wire (1648 bits), 206 bytes captured (1648 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 705, Ack: 766, Len: 120
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 705, Ack: 778, Len: 132
Zilla Frame
Frame Type ID: 0x00000003
Frame Type: END
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000430
Offset: 0x00000438
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand All @@ -393,18 +395,20 @@ Zilla Frame
Timestamp: 0x0000000000000000
Trace ID: 0x800000000000000b
Authorization: 0x0000000000000000
Budget ID: 0x0000000000000000
Reserved: 0

Frame 12: 211 bytes on wire (1688 bits), 211 bytes captured (1688 bits)
Ethernet II, Src: Send_00 (20:53:45:4e:44:00), Dst: Receive_00 (20:52:45:43:56:00)
Internet Protocol Version 6, Src: fe80::3f3f:0:0:3, Dst: fe80::3f3f:0:0:2
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 825, Ack: 766, Len: 137
Transmission Control Protocol, Src Port: 7114, Dst Port: 0, Seq: 837, Ack: 778, Len: 137
Zilla Frame
Frame Type ID: 0x40000002
Frame Type: WINDOW
Protocol Type ID: 0x00000000
Protocol Type:
Worker: 0
Offset: 0x00000480
Offset: 0x00000490
Origin ID: 0x0000000100000002
Origin Namespace: test
Origin Binding: app0
Expand Down
Loading