Merge pull request #2178 from dhilpipre/fix_grpc_netty

added checks for GRPC because it expects ASCIIString
newrelic · Dec 23, 2024 · f0f8e55 · f0f8e55
2 parents 221cf21 + 3cd9554
commit f0f8e55
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/...y-4.1.16/src/main/java/com/agent/instrumentation/netty4116/Http2RequestHeaderWrapper.java b/...y-4.1.16/src/main/java/com/agent/instrumentation/netty4116/Http2RequestHeaderWrapper.java
@@ -15,6 +15,7 @@
 import io.netty.handler.codec.http.cookie.Cookie;
 import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
 import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.util.AsciiString;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,12 +29,14 @@
 
 public class Http2RequestHeaderWrapper extends ExtendedRequest {
     private static final Pattern URL_REPLACEMENT_PATTERN = Pattern.compile("(?i)%(?![\\da-f]{2})");
+    private static final String GRPC_HEADER_UTIL_CLASS = "io.grpc.netty.GrpcHttp2HeadersUtils.GrpcHttp2RequestHeaders";
     private final Set<Cookie> cookies;
     private final Map<String, List<String>> parameters;
     private final Http2Headers http2Headers;
     private final CharSequence method;
     private final CharSequence path;
     private final CharSequence authority;
+    private final boolean isGRPCHttp2;
 
     public Http2RequestHeaderWrapper(Http2Headers http2Headers) {
         super();
@@ -43,6 +46,7 @@ public Http2RequestHeaderWrapper(Http2Headers http2Headers) {
         this.authority = getAuthorityHeader();
         this.cookies = getCookies();
         this.parameters = getParameters();
+        this.isGRPCHttp2 = http2Headers.getClass().getName().equals(GRPC_HEADER_UTIL_CLASS);
     }
 
     private Map<String, List<String>> getParameters() {
@@ -124,6 +128,13 @@ public String getRequestURI() {
     @Override
     public String getHeader(String name) {
         try {
+
+            if(isGRPCHttp2) {
+                // GRPC HTTP2 expects an AsciiString
+                AsciiString asciiString = new AsciiString(name);
+                return http2Headers.get(asciiString).toString();
+
+            }
             // HTTP/2 only supports lowercase headers
             String lowerCaseHeaderName = name.toLowerCase();
             if (lowerCaseHeaderName.equals(HttpHeaderNames.HOST.toString())) {
@@ -134,7 +145,10 @@ public String getHeader(String name) {
                 return http2Headers.get(lowerCaseHeaderName).toString();
             }
         } catch (Exception e) {
-            AgentBridge.getAgent().getLogger().log(Level.FINER, e, "Unable to get Http2Headers header: {0}", e.getMessage());
+            String errorMsg = e.getMessage();
+            if(!errorMsg.equals("AsciiString expected. Was: java.lang.String")) {
+                AgentBridge.getAgent().getLogger().log(Level.FINER, e, "Unable to get Http2Headers header: {0}", e.getMessage());
+            }
         }
         return null;
     }
@@ -205,12 +219,19 @@ public String getHost() {
     public List<String> getHeaders(String name) {
         List<String> headers = new ArrayList<>();
         try {
-            // HTTP/2 only supports lowercase headers
-            String lowerCaseHeaderName = name.toLowerCase();
-            List<CharSequence> allHeaders = http2Headers.getAll(lowerCaseHeaderName);
+        	List<CharSequence> allHeaders = Collections.emptyList();
+            if (!isGRPCHttp2) {
+                // HTTP/2 only supports lowercase headers
+                String lowerCaseHeaderName = name.toLowerCase();
+                allHeaders = http2Headers.getAll(lowerCaseHeaderName);
+            } else {
+                // GRPC only accepts AsciiString
+                AsciiString asciiName = new AsciiString(name);
+                allHeaders = http2Headers.getAll(asciiName);                
+            }
             for (CharSequence header : allHeaders) {
                 headers.add(header.toString());
-            }
+            } 
         } catch (Exception e) {
             AgentBridge.getAgent().getLogger().log(Level.FINER, e, "Unable to get Http2Headers headers: {0}", e.getMessage());
         }