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 2 commits
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
25 changes: 21 additions & 4 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 @@ -17,8 +17,11 @@
import static io.aklivity.zilla.runtime.binding.grpc.kafka.internal.config.GrpcKafkaWithProduceResult.META_PREFIX;
import static io.aklivity.zilla.runtime.binding.grpc.kafka.internal.types.KafkaCapabilities.FETCH_ONLY;
import static io.aklivity.zilla.runtime.binding.grpc.kafka.internal.types.KafkaCapabilities.PRODUCE_ONLY;
import static io.aklivity.zilla.runtime.binding.grpc.kafka.internal.types.stream.GrpcType.BASE64;
import static io.aklivity.zilla.runtime.binding.grpc.kafka.internal.types.stream.GrpcType.TEXT;
import static java.time.Instant.now;

import java.util.Arrays;
import java.util.function.LongUnaryOperator;

import org.agrona.DirectBuffer;
Expand Down Expand Up @@ -67,6 +70,11 @@ public final class GrpcKafkaProxyFactory implements GrpcKafkaStreamFactory
{
private static final String GRPC_TYPE_NAME = "grpc";
private static final String KAFKA_TYPE_NAME = "kafka";
private static final int META_PREFIX_LENGTH = 5;
private static final byte[] HEADER_META_PREFIX = new byte[5];
private static final byte[] META_PREFIX = "meta:".getBytes();
private static final byte[] HEADER_BIN_SUFFIX = new byte[4];
private static final byte[] BIN_SUFFIX = "-bin".getBytes();

private static final int DATA_FLAG_INIT = 0x02;
private static final int DATA_FLAG_FIN = 0x01;
Expand Down Expand Up @@ -1421,11 +1429,20 @@ private void doGrpcBegin(

headers.forEach(h ->
{
if (META_PREFIX.equals(h.name().value().getStringWithoutLengthUtf8(0, 5)))
final OctetsFW name = h.name();
final int offset = name.offset();
final int limit = name.limit();

name.buffer().getBytes(offset, HEADER_META_PREFIX);
name.buffer().getBytes(limit - BIN_SUFFIX.length, HEADER_BIN_SUFFIX);

if (Arrays.equals(META_PREFIX, HEADER_META_PREFIX))
{
builder.item(m -> m.type(t -> t.set(GrpcType.TEXT))
.nameLen(h.nameLen() - 5)
.name(h.name().value(), 5, h.nameLen() - 5)
final GrpcType type = Arrays.equals(BIN_SUFFIX, HEADER_BIN_SUFFIX) ? BASE64 : TEXT;

builder.item(m -> m.type(t -> t.set(type))
.nameLen(h.nameLen() - META_PREFIX_LENGTH)
.name(h.name().value(), META_PREFIX_LENGTH, h.nameLen() - META_PREFIX_LENGTH)
.valueLen(h.valueLen())
.value(h.value()));
}
Expand Down
7 changes: 5 additions & 2 deletions .../io/aklivity/zilla/runtime/binding/kafka/grpc/internal/config/KafkaGrpcBindingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import java.util.List;
import java.util.Optional;

import org.agrona.MutableDirectBuffer;

import io.aklivity.zilla.runtime.binding.kafka.grpc.config.KafkaGrpcOptionsConfig;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.stream.KafkaGrpcFetchHeaderHelper;
import io.aklivity.zilla.runtime.engine.config.BindingConfig;
Expand All @@ -35,7 +37,8 @@ public final class KafkaGrpcBindingConfig
public final List<KafkaGrpcRouteConfig> routes;

public KafkaGrpcBindingConfig(
BindingConfig binding)
BindingConfig binding,
MutableDirectBuffer metaBuffer)
{
this.id = binding.id;
this.entryId = binding.entryId;
Expand All @@ -45,6 +48,6 @@ public KafkaGrpcBindingConfig(
.orElse(DEFAULT);
this.routes = binding.routes.stream().map(r -> new KafkaGrpcRouteConfig(options, r))
.collect(toList());
this.helper = new KafkaGrpcFetchHeaderHelper(options.correlation);
this.helper = new KafkaGrpcFetchHeaderHelper(options.correlation, metaBuffer);
}
}
41 changes: 40 additions & 1 deletion ...aklivity/zilla/runtime/binding/kafka/grpc/internal/stream/KafkaGrpcFetchHeaderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,42 @@
*/
package io.aklivity.zilla.runtime.binding.kafka.grpc.internal.stream;

import static io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.stream.GrpcType.BASE64;
import static io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.stream.GrpcType.TEXT;

import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;

import org.agrona.MutableDirectBuffer;

import io.aklivity.zilla.runtime.binding.kafka.grpc.config.KafkaGrpcCorrelationConfig;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.Array32FW;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.KafkaHeaderFW;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.KafkaOffsetFW;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.OctetsFW;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.stream.GrpcMetadataFW;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.stream.GrpcType;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.stream.KafkaDataExFW;
import io.aklivity.zilla.runtime.binding.kafka.grpc.internal.types.stream.KafkaMergedFetchDataExFW;

public final class KafkaGrpcFetchHeaderHelper
{
private static final int META_PREFIX_LENGTH = 5;
private static final byte[] HEADER_META_PREFIX = new byte[5];
private static final byte[] META_PREFIX = "meta:".getBytes();
private static final byte[] HEADER_BIN_SUFFIX = new byte[4];
private static final byte[] BIN_SUFFIX = "-bin".getBytes();

Comment thread
ankitk-me marked this conversation as resolved.
Outdated
private final Map<OctetsFW, Consumer<OctetsFW>> visitors;
private final OctetsFW serviceRO = new OctetsFW();
private final OctetsFW methodRO = new OctetsFW();
private final OctetsFW replyToRO = new OctetsFW();
private final OctetsFW correlatedIdRO = new OctetsFW();
private final Array32FW.Builder<GrpcMetadataFW.Builder, GrpcMetadataFW> grpcMetadataRW =
new Array32FW.Builder<>(new GrpcMetadataFW.Builder(), new GrpcMetadataFW());
private final MutableDirectBuffer metaBuffer;

public int partitionId;
public long partitionOffset;
Expand All @@ -41,10 +58,13 @@ public final class KafkaGrpcFetchHeaderHelper
public OctetsFW method;
public OctetsFW replyTo;
public OctetsFW correlationId;
public Array32FW<GrpcMetadataFW> metadata;

public KafkaGrpcFetchHeaderHelper(
KafkaGrpcCorrelationConfig correlation)
KafkaGrpcCorrelationConfig correlation,
MutableDirectBuffer metaBuffer)
{
this.metaBuffer = metaBuffer;
Map<OctetsFW, Consumer<OctetsFW>> visitors = new HashMap<>();
visitors.put(new OctetsFW().wrap(correlation.service.value(),
0, correlation.service.length()), this::visitService);
Expand All @@ -65,6 +85,8 @@ public void visit(
replyTo = null;
correlationId = null;

grpcMetadataRW.wrap(metaBuffer, 0, metaBuffer.capacity());

if (dataEx != null)
{
final KafkaMergedFetchDataExFW kafkaMergedFetchDataEx = dataEx.merged().fetch();
Expand All @@ -76,6 +98,8 @@ public void visit(

headers.forEach(this::dispatch);
}

metadata = grpcMetadataRW.build();
}

public boolean resolved()
Expand All @@ -90,11 +114,26 @@ private boolean dispatch(
{
final OctetsFW name = header.name();
final OctetsFW value = header.value();
final int offset = name.offset();
final int limit = name.limit();

name.buffer().getBytes(offset, HEADER_META_PREFIX);
name.buffer().getBytes(limit - BIN_SUFFIX.length, HEADER_BIN_SUFFIX);

Comment thread
ankitk-me marked this conversation as resolved.
final Consumer<OctetsFW> visitor = visitors.get(name);
if (visitor != null)
{
visitor.accept(value);
}
else if (Arrays.equals(META_PREFIX, HEADER_META_PREFIX))
{
final GrpcType type = Arrays.equals(BIN_SUFFIX, HEADER_BIN_SUFFIX) ? BASE64 : TEXT;
Comment thread
ankitk-me marked this conversation as resolved.
Outdated
grpcMetadataRW.item(m -> m.type(t -> t.set(type))
.nameLen(header.nameLen() - META_PREFIX_LENGTH)
.name(name.value(), META_PREFIX_LENGTH, header.nameLen() - META_PREFIX_LENGTH)
.valueLen(header.valueLen())
.value(value));
}
Comment thread
ankitk-me marked this conversation as resolved.

return service != null &&
method != null &&
Expand Down
Loading