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

adapt to work with event-bus #4482

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+32 −6
Draft

adapt to work with event-bus #4482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcdfe3e
deps: upgrade libraries to make it jdk21 compatible
nimatrueway Sep 27, 2024
9edf97d
deps: add event-bus-events-java and protobuf-java
nimatrueway Sep 27, 2024
5629aa4
feat: decode protobuf using hootsuite eventbus library
nimatrueway Sep 27, 2024
9de4107
conf: configure dev/staging
nimatrueway Sep 27, 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
10 changes: 10 additions & 0 deletions kafka-ui-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
</properties>

<dependencies>
<dependency>
<groupId>com.hootsuite</groupId>
<artifactId>event-bus-events-java</artifactId>
<version>20.26.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.28.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
Expand Down
12 changes: 8 additions & 4 deletions kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.provectus.kafka.ui.serdes.builtin;

import com.google.protobuf.UnknownFieldSet;
import com.hootsuite.eventbus.events.deserialize.EventListDeserializer;
import com.provectus.kafka.ui.exception.ValidationException;
import com.provectus.kafka.ui.serde.api.DeserializeResult;
import com.provectus.kafka.ui.serde.api.RecordHeaders;
import com.provectus.kafka.ui.serde.api.SchemaDescription;
import com.provectus.kafka.ui.serdes.BuiltInSerde;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.SneakyThrows;

public class ProtobufRawSerde implements BuiltInSerde {
Expand Down Expand Up @@ -48,12 +49,15 @@ public Deserializer deserializer(String topic, Target type) {
@Override
public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
try {
UnknownFieldSet unknownFields = UnknownFieldSet.parseFrom(data);
return new DeserializeResult(unknownFields.toString(), DeserializeResult.Type.STRING, Map.of());
var events = EventListDeserializer.deserialize(data);
var serialized = events.stream().map(e ->
e.getDescriptorForType().getName() + " {\n" + e.toString().replaceAll("(?m)^", " ") + "}"
).collect(Collectors.joining("\n"));
return new DeserializeResult(serialized, DeserializeResult.Type.STRING, Map.of());
} catch (Exception e) {
throw new ValidationException(e.getMessage());
}
}
};
}
}
}
12 changes: 12 additions & 0 deletions kafka-ui-api/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
auth:
type: DISABLED

server:
port: 8080

kafka:
clusters:
- name: dev
bootstrapServers: b-1.eventbusmskdevelopment.6x9wvy.c8.kafka.us-east-1.amazonaws.com:9092,b-2.eventbusmskdevelopment.6x9wvy.c8.kafka.us-east-1.amazonaws.com:9092,b-3.eventbusmskdevelopment.6x9wvy.c8.kafka.us-east-1.amazonaws.com:9092
defaultValueSerde: ProtobufDecodeRaw
- name: staging
bootstrapServers: b-1.eventbusmskstaging.gxfvi6.c2.kafka.us-east-1.amazonaws.com:9092,b-2.eventbusmskstaging.gxfvi6.c2.kafka.us-east-1.amazonaws.com:9092,b-3.eventbusmskstaging.gxfvi6.c2.kafka.us-east-1.amazonaws.com:9092
defaultValueSerde: ProtobufDecodeRaw

management:
endpoint:
info:
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<jackson.version>2.14.0</jackson.version>
<kafka-clients.version>3.5.0</kafka-clients.version>
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
<org.projectlombok.version>1.18.24</org.projectlombok.version>
<org.projectlombok.version>1.18.30</org.projectlombok.version>
<protobuf-java.version>3.23.3</protobuf-java.version>
<scala-lang.library.version>2.13.9</scala-lang.library.version>
<snakeyaml.version>2.0</snakeyaml.version>
<spring-boot.version>3.1.3</spring-boot.version>
<spring-boot.version>3.1.4</spring-boot.version>
<kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
<odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
<odd-oddrn-client.version>0.1.26</odd-oddrn-client.version>
Expand Down
Loading