Netty OOM fix (#97)

hypertrace · Aug 20, 2021 · 040b336 · 040b336
1 parent c3fd8bd
commit 040b336
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...e-impl/src/main/java/org/hypertrace/gateway/service/common/AttributeMetadataProvider.java b/...e-impl/src/main/java/org/hypertrace/gateway/service/common/AttributeMetadataProvider.java
@@ -67,15 +67,22 @@ public AttributeMetadata load(
                             .addScopeString(scopeAndKeyPairBasedCacheKey.getDataKey().getKey())
                             .build());
 
+                AttributeMetadata result = null;
                 while (attributeMetadataIterator.hasNext()) {
                   AttributeMetadata metadata = attributeMetadataIterator.next();
+                  // metadata already found
+                  if (result != null) {
+                    continue;
+                  }
+                  // DON'T short-circuit the iterator.
+                  // Continue to iterate fully to avoid netty leak
                   if (metadata
                       .getKey()
                       .equals(scopeAndKeyPairBasedCacheKey.getDataKey().getValue())) {
-                    return metadata;
+                    result = metadata;
                   }
                 }
-                return null;
+                return result;
               }
             };
 

diff --git a/gateway-service/build.gradle.kts b/gateway-service/build.gradle.kts
@@ -23,10 +23,10 @@ dependencies {
   implementation("com.typesafe:config:1.4.1")
 
   constraints {
-    runtimeOnly("io.netty:netty-codec-http2:4.1.61.Final") {
+    runtimeOnly("io.netty:netty-codec-http2:4.1.63.Final") {
       because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1083991")
     }
-    runtimeOnly("io.netty:netty-handler-proxy:4.1.61.Final") {
+    runtimeOnly("io.netty:netty-handler-proxy:4.1.63.Final") {
       because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1083991")
     }
   }