Skip to content

adding support for authority header in gRPC sink #26

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

adding support for authority header in gRPC sink #26

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e420fb
updating protobuf modules
ankurs Nov 14, 2023
62aca60
adding support for authority header in gRPC sink
ankurs Nov 15, 2023
a81827c
updating version
ankurs Nov 16, 2023
e4f77fc
Merge branch 'main' of github.com:goto/firehose into feat/grpc-authority
ankurs Dec 14, 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
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' }
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.7"
classpath "org.ajoberstar:gradle-git:1.6.0"
}
Expand All @@ -14,7 +14,7 @@ plugins {
id 'idea'
id 'checkstyle'
id 'jacoco'
id "com.google.protobuf" version "0.8.17"
id "com.google.protobuf" version "0.9.4"
id 'nebula.ospackage' version '8.6.3'
id 'io.franzbecker.gradle-lombok' version '1.14'
id 'maven-publish'
Expand Down Expand Up @@ -58,8 +58,8 @@ private Properties loadEnv() {
def mainClassName = "com.gotocompany.firehose.launch.Main"

dependencies {
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.1.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.1.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.25.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.25.0'
implementation group: 'com.datadoghq', name: 'java-dogstatsd-client', version: '2.13.0'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.2'
implementation group: 'org.aeonbits.owner', name: 'owner', version: '1.0.9'
Expand Down Expand Up @@ -117,11 +117,11 @@ dependencies {
protobuf {
generatedFilesBaseDir = "$projectDir/src/generated"
protoc {
artifact = "com.google.protobuf:protoc:3.1.0"
artifact = "com.google.protobuf:protoc:3.25.0"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:1.0.3"
artifact = "io.grpc:protoc-gen-grpc-java:1.59.0"
}
}
generateProtoTasks {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/gotocompany/firehose/config/GrpcSinkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ public interface GrpcSinkConfig extends AppConfig {
@Config.Key("SINK_GRPC_RESPONSE_SCHEMA_PROTO_CLASS")
String getSinkGrpcResponseSchemaProtoClass();

@Config.Key("SINK_GRPC_SERVICE_AUTHORITY")
String getSinkGrpcServiceAuthority();
}
4 changes: 2 additions & 2 deletions src/main/java/com/gotocompany/firehose/sink/grpc/GrpcSinkFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class GrpcSinkFactory {
public static AbstractSink create(Map<String, String> configuration, StatsDReporter statsDReporter, StencilClient stencilClient) {
GrpcSinkConfig grpcConfig = ConfigFactory.create(GrpcSinkConfig.class, configuration);
FirehoseInstrumentation firehoseInstrumentation = new FirehoseInstrumentation(statsDReporter, GrpcSinkFactory.class);
String grpcSinkConfig = String.format("\n\tService host: %s\n\tService port: %s\n\tMethod url: %s\n\tResponse proto schema: %s",
grpcConfig.getSinkGrpcServiceHost(), grpcConfig.getSinkGrpcServicePort(), grpcConfig.getSinkGrpcMethodUrl(), grpcConfig.getSinkGrpcResponseSchemaProtoClass());
String grpcSinkConfig = String.format("\n\tService host: %s\n\tService port: %s\n\tAuthority: %s\n\tMethod url: %s\n\tResponse proto schema: %s",
grpcConfig.getSinkGrpcServiceHost(), grpcConfig.getSinkGrpcServicePort(), grpcConfig.getSinkGrpcServiceAuthority(), grpcConfig.getSinkGrpcMethodUrl(), grpcConfig.getSinkGrpcResponseSchemaProtoClass());
firehoseInstrumentation.logDebug(grpcSinkConfig);

ManagedChannel managedChannel = ManagedChannelBuilder.forAddress(grpcConfig.getSinkGrpcServiceHost(), grpcConfig.getSinkGrpcServicePort()).usePlaintext().build();
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/gotocompany/firehose/sink/grpc/client/GrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,17 @@ public DynamicMessage execute(byte[] logMessage, Headers headers) {

Channel decoratedChannel = ClientInterceptors.intercept(managedChannel,
MetadataUtils.newAttachHeadersInterceptor(metadata));
CallOptions co = CallOptions.DEFAULT;
if (grpcSinkConfig.getSinkGrpcServiceAuthority() != null && !grpcSinkConfig.getSinkGrpcServiceAuthority().isEmpty()) {
co = co.withAuthority(grpcSinkConfig.getSinkGrpcServiceAuthority());
}
byte[] response = ClientCalls.blockingUnaryCall(
decoratedChannel,
MethodDescriptor.newBuilder(marshaller, marshaller)
.setType(MethodDescriptor.MethodType.UNARY)
.setFullMethodName(grpcSinkConfig.getSinkGrpcMethodUrl())
.build(),
CallOptions.DEFAULT,
co,
logMessage);

dynamicMessage = stencilClient.parse(grpcSinkConfig.getSinkGrpcResponseSchemaProtoClass(), response);
Expand Down