Cache by Strings rather than ZoneId and Locale (#95299)

Author: joegallo

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateProcessor.java

@@ -81,24 +81,24 @@ public final class DateProcessor extends AbstractProcessor {
         for (String format : formats) {
             DateFormat dateFormat = DateFormat.fromString(format);
             dateParsers.add((params) -> {
-                var documentZoneId = newDateTimeZone(params);
-                var documentLocale = newLocale(params);
+                var documentTimezone = timezone == null ? null : timezone.newInstance(params).execute();
+                var documentLocale = locale == null ? null : locale.newInstance(params).execute();
                 return Cache.INSTANCE.getOrCompute(
-                    new Cache.Key(format, documentZoneId, documentLocale),
-                    () -> dateFormat.getFunction(format, documentZoneId, documentLocale)
+                    new Cache.Key(format, documentTimezone, documentLocale),
+                    () -> dateFormat.getFunction(format, newDateTimeZone(documentTimezone), newLocale(documentLocale))
                 );
             });
         }
         this.outputFormat = outputFormat;
         formatter = DateFormatter.forPattern(this.outputFormat);
     }
 
-    private ZoneId newDateTimeZone(Map<String, Object> params) {
-        return timezone == null ? ZoneOffset.UTC : ZoneId.of(timezone.newInstance(params).execute());
+    private static ZoneId newDateTimeZone(String timezone) {
+        return timezone == null ? ZoneOffset.UTC : ZoneId.of(timezone);
     }
 
-    private Locale newLocale(Map<String, Object> params) {
-        return locale == null ? Locale.ROOT : LocaleUtils.parse(locale.newInstance(params).execute());
+    private static Locale newLocale(String locale) {
+        return locale == null ? Locale.ROOT : LocaleUtils.parse(locale);
     }
 
     @Override
@@ -255,6 +255,6 @@ Function<String, ZonedDateTime> getOrCompute(Key key, Supplier<Function<String,
             return fn;
         }
 
-        record Key(String format, ZoneId zoneId, Locale locale) {}
+        record Key(String format, String zoneId, String locale) {}
     }
 }

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java

@@ -349,8 +349,8 @@ public void testCacheIsEvictedAfterReachMaxCapacity() {
         Function<String, ZonedDateTime> zonedDateTimeFunction1 = str -> ZonedDateTime.now();
         Function<String, ZonedDateTime> zonedDateTimeFunction2 = str -> ZonedDateTime.now();
         var cache = new DateProcessor.Cache(1);
-        var key1 = new DateProcessor.Cache.Key("format-1", ZoneId.systemDefault(), Locale.ROOT);
-        var key2 = new DateProcessor.Cache.Key("format-2", ZoneId.systemDefault(), Locale.ROOT);
+        var key1 = new DateProcessor.Cache.Key("format-1", ZoneId.systemDefault().toString(), Locale.ROOT.toString());
+        var key2 = new DateProcessor.Cache.Key("format-2", ZoneId.systemDefault().toString(), Locale.ROOT.toString());
 
         when(supplier1.get()).thenReturn(zonedDateTimeFunction1);
         when(supplier2.get()).thenReturn(zonedDateTimeFunction2);