Added parsing of binaryheaders in RequestContext

Author: Mohit Agarwal

grpc-client-utils/src/main/java/org/hypertrace/core/grpcutils/client/RequestContextAsCreds.java

@@ -9,6 +9,7 @@
 import org.slf4j.LoggerFactory;
 
 import static io.grpc.Metadata.ASCII_STRING_MARSHALLER;
+import static io.grpc.Metadata.BINARY_BYTE_MARSHALLER;
 
 public abstract class RequestContextAsCreds extends CallCredentials {
   private static Logger LOGGER = LoggerFactory.getLogger(RequestContextAsCreds.class);
@@ -31,7 +32,12 @@ protected void applyRequestContext(MetadataApplier applier, RequestContext reque
       for (Map.Entry<String, String> entry : requestContext.getAll().entrySet()) {
         // Exclude null headers
         if (entry.getValue() != null) {
-          metadata.put(Metadata.Key.of(entry.getKey(), ASCII_STRING_MARSHALLER), entry.getValue());
+          String key = entry.getKey();
+          if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
+            metadata.put(Metadata.Key.of(entry.getKey(), BINARY_BYTE_MARSHALLER), entry.getValue().getBytes());
+          } else {
+            metadata.put(Metadata.Key.of(entry.getKey(), ASCII_STRING_MARSHALLER), entry.getValue());
+          }
         }
       }
     }

grpc-server-utils/src/main/java/org/hypertrace/core/grpcutils/server/RequestContextServerInterceptor.java

@@ -9,6 +9,8 @@
 import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.core.grpcutils.context.RequestContextConstants;
 
+import java.nio.charset.StandardCharsets;
+
 /**
  * Interceptor which intercepts the request headers to extract request context and sets it in the context so that the
  * server logic can use the context and they can be passed onto other downstream services.
@@ -41,7 +43,14 @@ RequestContext createRequestContextFromMetadata(Metadata metadata) {
             RequestContextConstants.HEADER_PREFIXES_TO_BE_PROPAGATED.stream()
                 .anyMatch(prefix -> k.toLowerCase().startsWith(prefix.toLowerCase())))
         .forEach(k -> {
-          String value = metadata.get(Metadata.Key.of(k, Metadata.ASCII_STRING_MARSHALLER));
+          String value;
+          //check if key ends with binary suffix
+          if (k.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
+            byte[] bytes = metadata.get(Metadata.Key.of(k, Metadata.BINARY_BYTE_MARSHALLER));
+            value = new String(bytes, StandardCharsets.UTF_8);
+          } else {
+            value = metadata.get(Metadata.Key.of(k, Metadata.ASCII_STRING_MARSHALLER));
+          }
           // The value could be null or empty for some keys so validate that.
           if (value != null && !value.isEmpty()) {
             requestContext.add(k, value);