Skip to content

grpc custom metadata passthrough implementation #1097

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
jfallows merged 14 commits into from
Jul 16, 2024
Merged

grpc custom metadata passthrough implementation #1097

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1830d79
grpc custom metadata passthrough implementation
ankitk-me Jun 13, 2024
cf715fc
script update & extract and pass response metadata implementation update
ankitk-me Jun 25, 2024
94959b2
race condition fix
ankitk-me Jun 26, 2024
ca5030a
Make the scripts deterministic
akrambek Jun 26, 2024
eae0881
Produce IT fix
ankitk-me Jun 26, 2024
609b18f
kafka-grpc metadata pass through
ankitk-me Jun 28, 2024
50a36d8
addressing review comment
ankitk-me Jun 29, 2024
fbad7fa
GrpcFunctions matcher bug fix & binary metadata IT
ankitk-me Jul 4, 2024
2cbff6c
addressing review comments
ankitk-me Jul 9, 2024
0d7af5b
`grpc-kafka` fetch changes
ankitk-me Jul 10, 2024
44e97f4
Prevent overwrite of write buffer when encoding progress
jfallows Jul 16, 2024
6ff7bc0
addressing review comments
ankitk-me Jul 16, 2024
9b85d7f
adding EMPTY_HEADERS constant
ankitk-me Jul 16, 2024
7f42557
build fix
ankitk-me Jul 16, 2024
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
Prev Previous commit
Next Next commit
grpc-kafka fetch changes
  • Loading branch information
@ankitk-me
ankitk-me committed Jul 10, 2024
commit 0d7af5b2b8a6fa3176e5ecf61ba81fe375f2e45c
62 changes: 59 additions & 3 deletions ...a/io/aklivity/zilla/runtime/binding/grpc/kafka/internal/stream/GrpcKafkaProxyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,11 @@ protected void onKafkaAbort(
long traceId,
long authorization)
{
if (!GrpcKafkaState.replyOpening(state))
{
doGrpcBegin(traceId, authorization, 0L, emptyRO);
}

cleanup(traceId, authorization);
}

Expand Down Expand Up @@ -569,6 +574,15 @@ protected void onKafkaData(
int length,
OctetsFW extension)
{
if (!GrpcKafkaState.replyOpening(state))
{
final ExtensionFW dataEx = extension.get(extensionRO::tryWrap);
final KafkaDataExFW kafkaDataEx =
dataEx != null && dataEx.typeId() == kafkaTypeId ? extension.get(kafkaDataExRO::tryWrap) : null;

doGrpcBegin(traceId, authorization, 0L, kafkaDataEx.merged().fetch().headers());
Comment thread
ankitk-me marked this conversation as resolved.
Outdated
}

doGrpcData(traceId, authorization, budgetId, reserved, flags, buffer, offset, length);
}

Expand Down Expand Up @@ -623,6 +637,50 @@ private void doGrpcBegin(
traceId, authorization, affinity, extension);
}

private void doGrpcBegin(
long traceId,
long authorization,
long affinity,
Array32FW<KafkaHeaderFW> headers)
{
state = GrpcKafkaState.openingReply(state);

Array32FW.Builder<GrpcMetadataFW.Builder, GrpcMetadataFW> builder =
grpcMetadataRW.wrap(metaBuffer, 0, metaBuffer.capacity());

headers.forEach(h ->
{
final OctetsFW name = h.name();
final DirectBuffer buffer = name.buffer();
final int offset = name.offset();
final int limit = name.limit();
buffer.getBytes(offset, headerPrefix);
buffer.getBytes(limit - BIN_SUFFIX.length, headerSuffix);
if (Arrays.equals(META_PREFIX, headerPrefix))
{
final GrpcType type = Arrays.equals(BIN_SUFFIX, headerSuffix) ? BASE64 : TEXT;
final int nameLen = type == BASE64
? h.nameLen() - META_PREFIX_LENGTH - BIN_SUFFIX_LENGTH
: h.nameLen() - META_PREFIX_LENGTH;
builder.item(m -> m
.type(t -> t.set(type))
.nameLen(nameLen)
.name(name.value(), META_PREFIX_LENGTH, nameLen)
.valueLen(h.valueLen())
.value(h.value()));
}
});

GrpcBeginExFW beginEx = grpcBeginExRW
.wrap(extBuffer, 0, extBuffer.capacity())
.typeId(grpcTypeId)
.metadata(builder.build())
.build();

doBegin(grpc, originId, routedId, replyId, replySeq, replyAck, replyMax,
traceId, authorization, affinity, beginEx);
}

private void doGrpcData(
long traceId,
long authorization,
Expand Down Expand Up @@ -865,8 +923,6 @@ private void onKafkaBegin(
int lenSize = len.sizeof();
replyPad = result.fieldId().sizeof() + lenSize + partitions.sizeof();
}

delegate.onKafkaBegin(traceId, authorization, extension);
}

private void onKafkaData(
Expand Down Expand Up @@ -939,7 +995,7 @@ private void onKafkaData(
}

int length = encodeProgress - encodeOffset;
delegate.onKafkaData(traceId, authorization, budgetId, reserved, flags,
delegate.onKafkaData(traceId, authorization, budgetId, reserved + length, flags,
encodeBuffer, encodeOffset, length, extension);
}
}
Expand Down
1 change: 1 addition & 0 deletions ...a/specs/binding/grpc/kafka/streams/grpc/fetch/client.sent.read.abort.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
connect "zilla://streams/grpc0"
option zilla:window 8192
option zilla:transmission "half-duplex"
option zilla:update "proactive"

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
Expand Down
1 change: 1 addition & 0 deletions .../specs/binding/grpc/kafka/streams/grpc/fetch/client.sent.write.abort.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
connect "zilla://streams/grpc0"
option zilla:window 8192
option zilla:transmission "half-duplex"
option zilla:update "proactive"

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
Expand Down
1 change: 1 addition & 0 deletions ...illa/specs/binding/grpc/kafka/streams/grpc/fetch/reject.request.body.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
connect "zilla://streams/grpc0"
option zilla:window 8192
option zilla:transmission "half-duplex"
option zilla:update "proactive"

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
Expand Down
7 changes: 7 additions & 0 deletions .../aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/fetch/reliable.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
connect "zilla://streams/grpc0"
option zilla:window 8192
option zilla:transmission "half-duplex"
option zilla:update "proactive"

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
Expand All @@ -32,6 +33,12 @@ write flush

write close

read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
Comment thread
ankitk-me marked this conversation as resolved.
Outdated
.build()}

read ${grpc:protobuf()
.string(1, "Hello World")
.bytes(32767, grpc_kafka:messageId()
Expand Down
6 changes: 6 additions & 0 deletions .../aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/fetch/reliable.unary.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ read zilla:data.empty

read closed

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
.string(1, "Hello World")
.bytes(32767, grpc_kafka:messageId()
Expand Down
7 changes: 7 additions & 0 deletions ...klivity/zilla/specs/binding/grpc/kafka/streams/grpc/fetch/unreliable.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
connect "zilla://streams/grpc0"
option zilla:window 8192
option zilla:transmission "half-duplex"
option zilla:update "proactive"

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
Expand All @@ -31,6 +32,12 @@ write flush

write close

read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
.string(1, "Hello World")
.bytes(32767, grpc_kafka:messageId()
Expand Down
6 changes: 6 additions & 0 deletions ...klivity/zilla/specs/binding/grpc/kafka/streams/grpc/fetch/unreliable.unary.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ read zilla:data.empty

read closed

write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
.string(1, "Hello World")
.bytes(32767, grpc_kafka:messageId()
Expand Down
2 changes: 2 additions & 0 deletions ...aklivity/zilla/specs/binding/grpc/kafka/streams/kafka/fetch/reliable.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ read zilla:data.ext ${kafka:matchDataEx()
.progress(0, 2)
.progress(1, 1)
.key("test")
.header("meta:custom", "value")
.header("meta:customProperty-bin", "dGVzdA==")
.build()
.build()}
read ${grpc:protobuf()
Expand Down
2 changes: 2 additions & 0 deletions ...aklivity/zilla/specs/binding/grpc/kafka/streams/kafka/fetch/reliable.unary.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ write zilla:data.ext ${kafka:dataEx()
.progress(0, 2)
.progress(1, 1)
.key("test")
.header("meta:custom", "value")
.header("meta:customProperty-bin", "dGVzdA==")
.build()
.build()}
write ${grpc:protobuf()
Expand Down
2 changes: 2 additions & 0 deletions ...livity/zilla/specs/binding/grpc/kafka/streams/kafka/fetch/unreliable.unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ read zilla:data.ext ${kafka:matchDataEx()
.progress(0, 2)
.progress(1, 1)
.key("test")
.header("meta:custom", "value")
.header("meta:customProperty-bin", "dGVzdA==")
.build()
.build()}
read ${grpc:protobuf()
Expand Down
2 changes: 2 additions & 0 deletions ...livity/zilla/specs/binding/grpc/kafka/streams/kafka/fetch/unreliable.unary.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ write zilla:data.ext ${kafka:dataEx()
.progress(0, 2)
.progress(1, 1)
.key("test")
.header("meta:custom", "value")
.header("meta:customProperty-bin", "dGVzdA==")
.build()
.build()}
write ${grpc:protobuf()
Expand Down