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
addressing review comments
  • Loading branch information
@ankitk-me
ankitk-me committed Jul 16, 2024
commit 6ff7bc0c913a7fa500f52c1c1eb4b55e378d1ef9
25 changes: 23 additions & 2 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 @@ -90,6 +90,7 @@ public final class GrpcKafkaProxyFactory implements GrpcKafkaStreamFactory
new Varuint32FW.Builder().wrap(new UnsafeBuffer(new byte[1024 * 8]), 0, 1024 * 8);;

private final OctetsFW emptyRO = new OctetsFW().wrap(new UnsafeBuffer(0L, 0), 0, 0);
private final Array32FW<KafkaHeaderFW> emptyHeaderRO = new Array32FW<>(new KafkaHeaderFW());

private final BeginFW beginRO = new BeginFW();
private final DataFW dataRO = new DataFW();
Expand Down Expand Up @@ -582,7 +583,17 @@ protected void onKafkaData(
final KafkaDataExFW kafkaDataEx =
dataEx != null && dataEx.typeId() == kafkaTypeId ? extension.get(kafkaDataExRO::tryWrap) : null;

doGrpcBegin(traceId, authorization, 0L, kafkaDataEx.merged().fetch().headers());
if (kafkaDataEx != null &&
kafkaDataEx.merged() != null &&
kafkaDataEx.merged().fetch() != null &&
kafkaDataEx.merged().fetch().headers() != null)
{
doGrpcBegin(traceId, authorization, 0L, kafkaDataEx.merged().fetch().headers());
}
else
{
doGrpcBegin(traceId, authorization, 0L, emptyHeaderRO);
}
}

doGrpcData(traceId, authorization, budgetId, reserved, flags, buffer, offset, length);
Expand Down Expand Up @@ -1380,7 +1391,17 @@ protected void onKafkaData(
{
if (!GrpcKafkaState.replyOpening(state))
{
doGrpcBegin(traceId, authorization, 0L, kafkaDataEx.merged().fetch().headers());
if (kafkaDataEx != null &&
kafkaDataEx.merged() != null &&
kafkaDataEx.merged().fetch() != null &&
kafkaDataEx.merged().fetch().headers() != null)
{
doGrpcBegin(traceId, authorization, 0L, kafkaDataEx.merged().fetch().headers());
}
else
{
doGrpcBegin(traceId, authorization, 0L, emptyHeaderRO);
}
}

if (GrpcKafkaState.replyClosing(state))
Expand Down
2 changes: 1 addition & 1 deletion .../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 @@ -36,7 +36,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion .../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 @@ -35,7 +35,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -35,7 +35,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -34,7 +34,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...o/aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/bidi.stream.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ write flush
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...o/aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/bidi.stream.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ read ${grpc:protobuf()
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/client.stream.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/client.stream.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/server.stream.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/server.stream.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...ipts/io/aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...ipts/io/aklivity/zilla/specs/binding/grpc/kafka/streams/grpc/produce/unary.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

write ${grpc:protobuf()
Expand Down
4 changes: 2 additions & 2 deletions ...-grpc.spec/src/main/java/io/aklivity/zilla/specs/binding/grpc/internal/GrpcFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public GrpcBeginExBuilder metadataBase64(
return metadata("BASE64", name, value);
}

public GrpcBeginExBuilder metadata(
private GrpcBeginExBuilder metadata(
String type,
String name,
String value)
Expand Down Expand Up @@ -238,7 +238,7 @@ public GrpcBeginExMatcherBuilder metadataBase64(
return metadata("BASE64", name, value);
}

public GrpcBeginExMatcherBuilder metadata(
private GrpcBeginExMatcherBuilder metadata(
String type,
String name,
String value)
Expand Down
2 changes: 1 addition & 1 deletion ...cripts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/bidi.stream.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ write flush
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...cripts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/bidi.stream.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ read ${grpc:protobuf()
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}
write flush

Expand Down
2 changes: 1 addition & 1 deletion ...ipts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/client.stream.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...ipts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/client.stream.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}
write flush

Expand Down
2 changes: 1 addition & 1 deletion ...livity/zilla/specs/binding/kafka/grpc/streams/grpc/retry.on.unavailable.server/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...livity/zilla/specs/binding/kafka/grpc/streams/grpc/retry.on.unavailable.server/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}
write flush

Expand Down
2 changes: 1 addition & 1 deletion ...ipts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/server.stream.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...ipts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/server.stream.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}
write flush

Expand Down
2 changes: 1 addition & 1 deletion ...main/scripts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/unary.rpc/client.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ write close
read zilla:begin.ext ${grpc:matchBeginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}

read ${grpc:protobuf()
Expand Down
2 changes: 1 addition & 1 deletion ...main/scripts/io/aklivity/zilla/specs/binding/kafka/grpc/streams/grpc/unary.rpc/server.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ read closed
write zilla:begin.ext ${grpc:beginEx()
.typeId(zilla:id("grpc"))
.metadata("custom", "value")
.metadata("BASE64", "customProperty", "dGVzdA==")
.metadataBase64("customProperty", "dGVzdA==")
.build()}
write flush

Expand Down