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

make protoc plugin compatiable for M1 chip & fix some tc #214

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

make protoc plugin compatiable for M1 chip & fix some tc #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ dependencies {
implementation(group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.1.0') {
exclude group: "log4j", module: "log4j"
exclude group: "org.slf4j", module: "slf4j-log4j12"
exclude group: "org.xerial.snappy", module: "snappy-java"
}
implementation group: 'com.gojek.parquet', name: 'parquet-protobuf', version: '1.11.9'
implementation 'com.gojek.parquet:parquet-hadoop:1.11.9'
Expand All @@ -103,6 +104,7 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation group: 'io.odpf', name: 'depot', version: '0.3.7'
implementation group: 'com.networknt', name: 'json-schema-validator', version: '1.0.59' exclude group: 'org.slf4j'
implementation 'org.xerial.snappy:snappy-java:1.1.8.4'

testImplementation group: 'junit', name: 'junit', version: '4.11'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
Expand All @@ -117,11 +119,19 @@ dependencies {
protobuf {
generatedFilesBaseDir = "$projectDir/src/generated"
protoc {
artifact = "com.google.protobuf:protoc:3.1.0"
if (osdetector.os == "osx") {
artifact = 'com.google.protobuf:protoc:3.1.0:osx-x86_64'
} else {
artifact = "com.google.protobuf:protoc:3.1.0"
}
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:1.0.3"
if (osdetector.os == "osx") {
artifact = 'io.grpc:protoc-gen-grpc-java:1.0.3:osx-x86_64'
} else {
artifact = "io.grpc:protoc-gen-grpc-java:1.0.3"
}
}
}
generateProtoTasks {
Expand Down
20 changes: 10 additions & 10 deletions src/test/java/io/odpf/firehose/serializer/MessageToJsonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public void shouldProperlySerializeEsbMessage() throws DeserializerException {
Base64.getDecoder().decode(logMessage.getBytes()), "sample-topic", 0, 100);
String actualOutput = messageToJson.serialize(message);
assertEquals(actualOutput, "{\"logMessage\":\"{\\\"uniqueDrivers\\\":\\\"3\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017, 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017, 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"s2Id\\\":\\\"3344472187078705152\\\"}\",\"topic\":\"sample-topic\",\"logKey\":\"{"
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017, 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017, 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"s2Id\\\":\\\"3344472187078705152\\\"}\"}");
}

Expand All @@ -50,8 +50,8 @@ public void shouldSerializeWhenKeyIsMissing() throws DeserializerException {
100);
String actualOutput = messageToJson.serialize(message);
assertEquals("{\"logMessage\":\"{\\\"uniqueDrivers\\\":\\\"3\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017, 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017, 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"s2Id\\\":\\\"3344472187078705152\\\"}\",\"topic\":\"sample-topic\"}", actualOutput);
}

Expand All @@ -64,8 +64,8 @@ public void shouldSerializeWhenKeyIsEmptyWithTimestampsAsSimpleDateFormatWhenFla

String actualOutput = messageToJson.serialize(message);
assertEquals("{\"logMessage\":\"{\\\"uniqueDrivers\\\":\\\"3\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017, 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017, 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"s2Id\\\":\\\"3344472187078705152\\\"}\",\"topic\":\"sample-topic\"}", actualOutput);
}

Expand Down Expand Up @@ -93,8 +93,8 @@ public void shouldWrappedSerializedJsonInArrayWithTimestampsAsSimpleDateFormatWh

String actualOutput = messageToJson.serialize(message);
assertEquals("[{\"logMessage\":\"{\\\"uniqueDrivers\\\":\\\"3\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"windowStartTime\\\":\\\"Mar 20, 2017, 10:54:00 AM\\\","
+ "\\\"windowEndTime\\\":\\\"Mar 20, 2017, 10:55:00 AM\\\",\\\"s2IdLevel\\\":13,\\\"vehicleType\\\":\\\"BIKE\\\","
+ "\\\"s2Id\\\":\\\"3344472187078705152\\\"}\",\"topic\":\"sample-topic\"}]", actualOutput);
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/odpf/firehose/sink/grpc/GrpcClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ public void setup() throws IOException {
headerTestInterceptor = new HeaderTestInterceptor();
headerTestInterceptor.setHeaderKeys(HEADER_KEYS);
ServerServiceDefinition serviceDefinition = ServerInterceptors.intercept(testGrpcService.bindService(), Arrays.asList(headerTestInterceptor));
server = ServerBuilder.forPort(5000)
server = ServerBuilder.forPort(5050)
.addService(serviceDefinition)
.build()
.start();
Map<String, String> config = new HashMap<>();
config.put("SINK_GRPC_SERVICE_HOST", "localhost");
config.put("SINK_GRPC_SERVICE_PORT", "5000");
config.put("SINK_GRPC_SERVICE_PORT", "5050");
config.put("SINK_GRPC_METHOD_URL", "io.odpf.firehose.consumer.TestServer/TestRpcMethod");
config.put("SINK_GRPC_RESPONSE_SCHEMA_PROTO_CLASS", "io.odpf.firehose.consumer.TestGrpcResponse");

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/odpf/firehose/sink/grpc/GrpcSinkFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void shouldCreateChannelPoolWithHostAndPort() throws IOException, Deseria
when(testGrpcService.bindService()).thenCallRealMethod();

Server server = ServerBuilder
.forPort(5000)
.forPort(5050)
.addService(testGrpcService.bindService())
.build()
.start();
Expand Down