Add size of project ID to key size

Author: PeteGillinElastic

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpCache.java

@@ -173,13 +173,12 @@ private record CacheKey(ProjectId projectId, String ip, String databasePath) {
         private static final long BASE_BYTES = RamUsageEstimator.shallowSizeOfInstance(CacheKey.class);
 
         private long sizeInBytes() {
-            return keySizeInBytes(ip, databasePath);
+            return keySizeInBytes(projectId, ip, databasePath);
         }
     }
 
     // visible for testing
-    static long keySizeInBytes(String ip, String databasePath) {
-        // TODO(pete): Add ProjectID size
-        return CacheKey.BASE_BYTES + RamUsageEstimator.sizeOf(ip) + RamUsageEstimator.sizeOf(databasePath);
+    static long keySizeInBytes(ProjectId projectId, String ip, String databasePath) {
+        return CacheKey.BASE_BYTES + projectId.sizeInBytes() + RamUsageEstimator.sizeOf(ip) + RamUsageEstimator.sizeOf(databasePath);
     }
 }

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java

@@ -54,8 +54,8 @@ public void testCachesAndEvictsResults_maxBytes() {
         String ip2 = "127.0.0.2";
         String databasePath2 = "path/to/db";
         FakeResponse response2 = new FakeResponse(222);
-        long totalSize = GeoIpCache.keySizeInBytes(ip1, databasePath1) + GeoIpCache.keySizeInBytes(ip2, databasePath2) + response1
-            .sizeInBytes() + response2.sizeInBytes();
+        long totalSize = GeoIpCache.keySizeInBytes(projectId, ip1, databasePath1) + GeoIpCache.keySizeInBytes(projectId, ip2, databasePath2)
+            + response1.sizeInBytes() + response2.sizeInBytes();
 
         GeoIpCache justBigEnoughCache = GeoIpCache.createGeoIpCacheWithMaxBytes(ByteSizeValue.ofBytes(totalSize));
         justBigEnoughCache.putIfAbsent(projectId, ip1, databasePath1, ip -> response1);

server/src/main/java/org/elasticsearch/cluster/metadata/ProjectId.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.cluster.metadata;
 
+import org.apache.lucene.util.RamUsageEstimator;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -27,6 +28,7 @@ public class ProjectId implements Writeable, ToXContent {
     public static final ProjectId DEFAULT = new ProjectId(DEFAULT_STRING);
     public static final Reader<ProjectId> READER = ProjectId::readFrom;
     private static final int MAX_LENGTH = 128;
+    private static final long BASE_BYTES_SIZE = RamUsageEstimator.shallowSizeOfInstance(ProjectId.class);
 
     private final String id;
 
@@ -113,4 +115,8 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hashCode(id);
     }
+
+    public long sizeInBytes() {
+        return BASE_BYTES_SIZE + RamUsageEstimator.sizeOf(id);
+    }
 }