Skip to content
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

Jump to bottom

[Issue #45] [pulsar-client-kafka-compat] Handled Kafka record headers… #46

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

[Issue #45] [pulsar-client-kafka-compat] Handled Kafka record headers… #46

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea9c294
[Issue #45] [pulsar-client-kafka-compat] Handled Kafka record headers…
swamymavuri Mar 15, 2023
e62004b
Added long type to the checksumto the
swamymavuri Mar 15, 2023
f777f41
[Issue #45] [pulsar-client-kafka-compat] Added KafkaConsumerTest cases
swamymavuri Mar 21, 2023
18d09c4
Removed Hex encoding and decoding for headers
swamymavuri Mar 23, 2023
0ee92ca
Added Hex encoding and decoding for headers
swamymavuri Mar 23, 2023
499f6d9
Added licence header to the newly added file
swamymavuri Mar 23, 2023
9f6be3d
Verified added header properties with mockTypedMessageBuilder
swamymavuri Mar 26, 2023
93198bb
Added test cases with Mockito and testng with assertions
swamymavuri Mar 26, 2023
4673dff
Formattedlicence headers to pass the build
swamymavuri Mar 26, 2023
3d69fa1
Asserted Header Value
swamymavuri Apr 1, 2023
b5419f1
Merge branch 'apache:master' into master
swamymavuri Nov 27, 2023
9679855
Added Comments
swamymavuri Nov 27, 2023
de88cf2
Added Comments
swamymavuri Nov 27, 2023
050b0fb
Removed redundant mock
swamymavuri Nov 27, 2023
af7774d
Added Integration tests and changed to PularKafkaConsumer
swamymavuri Nov 27, 2023
fcdebaf
excluded kafka client dependency
swamymavuri Nov 27, 2023
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
10 changes: 9 additions & 1 deletion ...sar-client-kafka/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.PartitionInfo;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.header.Headers;
import org.apache.kafka.common.header.internals.RecordHeaders;
import org.apache.kafka.common.record.TimestampType;
import org.apache.kafka.common.serialization.Deserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
Expand All @@ -70,6 +72,7 @@
import org.apache.pulsar.client.util.MessageIdUtils;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.util.FutureUtil;
import org.bouncycastle.util.encoders.Hex;
swamymavuri marked this conversation as resolved.
Show resolved Hide resolved

@Slf4j
public class PulsarKafkaConsumer<K, V> implements Consumer<K, V>, MessageListener<byte[]> {
Expand Down Expand Up @@ -405,8 +408,13 @@ public ConsumerRecords<K, V> poll(long timeoutMillis) {
timestampType = TimestampType.CREATE_TIME;
}

Headers headers = new RecordHeaders();
if (msg.getProperties() != null) {
msg.getProperties().forEach((k, v) -> headers.add(k, Hex.decode(v)));
}

ConsumerRecord<K, V> consumerRecord = new ConsumerRecord<>(topic, partition, offset, timestamp,
timestampType, -1, msg.hasKey() ? msg.getKey().length() : 0, msg.getData().length, key, value);
timestampType, -1L, msg.hasKey() ? msg.getKey().length() : 0, msg.getData().length, key, value, headers);

records.computeIfAbsent(tp, k -> new ArrayList<>()).add(consumerRecord);

Expand Down
8 changes: 8 additions & 0 deletions ...sar-client-kafka/src/main/java/org/apache/kafka/clients/producer/PulsarKafkaProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;

import org.apache.commons.codec.binary.Hex;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this import used at all?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, while encoding the kafka record headers

import org.apache.kafka.clients.consumer.ConsumerGroupMetadata;
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
import org.apache.kafka.common.Cluster;
Expand Down Expand Up @@ -387,6 +388,13 @@ private int buildMessage(TypedMessageBuilder<byte[]> builder, ProducerRecord<K,
builder.property(KafkaMessageRouter.PARTITION_ID, Integer.toString(partition));
}

if (record.headers() != null) {
Map<String, String> headerProperties = new HashMap<>();
record.headers()
.forEach(header -> headerProperties.putIfAbsent(header.key(), Hex.encodeHexString(header.value())));
builder.properties(headerProperties);
}

return value.length;
}

Expand Down
10 changes: 9 additions & 1 deletion ...client-kafka/src/test/java/org/apache/kafka/clients/producer/PulsarKafkaProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import org.apache.kafka.clients.producer.internals.DefaultPartitioner;
import org.apache.kafka.common.PartitionInfo;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.header.Headers;
import org.apache.kafka.common.header.internals.RecordHeaders;
import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.pulsar.client.api.ClientBuilder;
import org.apache.pulsar.client.api.ProducerBuilder;
Expand Down Expand Up @@ -246,7 +248,13 @@ public void testPulsarKafkaSendAvro() throws PulsarClientException {
foo.setField2("field2");
foo.setField3(3);

pulsarKafkaProducer.send(new ProducerRecord<>("topic", 1,foo, bar));
Headers headers = new RecordHeaders();
String header1 = "header1";
String header2 = "header2";
headers.add(header1,header1.getBytes());
headers.add(header2,header2.getBytes());

pulsarKafkaProducer.send(new ProducerRecord<>("topic", 1,foo, bar, headers));
swamymavuri marked this conversation as resolved.
Show resolved Hide resolved

// Verify
verify(mockTypedMessageBuilder, times(1)).sendAsync();
Expand Down