Merge branch 'main' into serveroptimize

Signed-off-by: Karen X <karenxyr@gmail.com>

Author: karenyrx

CHANGELOG.md

@@ -15,12 +15,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add a dynamic setting to change skip_cache_factor and min_frequency for querycache ([#18351](https://github.com/opensearch-project/OpenSearch/issues/18351))
 - Add overload constructor for Translog to accept Channel Factory as a parameter ([#18918](https://github.com/opensearch-project/OpenSearch/pull/18918))
 - Add subdirectory-aware store module with recovery support ([#19132](https://github.com/opensearch-project/OpenSearch/pull/19132))
+- Field collapsing supports search_after ([#19261](https://github.com/opensearch-project/OpenSearch/pull/19261))
 - Add a dynamic cluster setting to control the enablement of the merged segment warmer ([#18929](https://github.com/opensearch-project/OpenSearch/pull/18929))
 - Publish transport-grpc-spi exposing QueryBuilderProtoConverter and QueryBuilderProtoConverterRegistry ([#18949](https://github.com/opensearch-project/OpenSearch/pull/18949))
 - Support system generated search pipeline. ([#19128](https://github.com/opensearch-project/OpenSearch/pull/19128))
 - Add `epoch_micros` date format ([#14669](https://github.com/opensearch-project/OpenSearch/issues/14669))
-- Grok processor supports capturing multiple values for same field name ([#18799](https://github.com/opensearch-project/OpenSearch/pull/18799)
+- Grok processor supports capturing multiple values for same field name ([#18799](https://github.com/opensearch-project/OpenSearch/pull/18799))
 - Upgrade opensearch-protobufs dependency to 0.13.0 and update transport-grpc module compatibility ([#19007](https://github.com/opensearch-project/OpenSearch/issues/19007))
+- Add new extensible method to DocRequest to specify type ([#19313](https://github.com/opensearch-project/OpenSearch/pull/19313))
 - Optimize gRPC transport thread management for improved throughput ([#19278](https://github.com/opensearch-project/OpenSearch/pull/19278))
 
 ### Changed
@@ -33,6 +35,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Remove cap on Java version used by forbidden APIs ([#19163](https://github.com/opensearch-project/OpenSearch/pull/19163))
 - Disable pruning for `doc_values` for the wildcard field mapper ([#18568](https://github.com/opensearch-project/OpenSearch/pull/18568))
 - Make all methods in Engine.Result public ([#19276](https://github.com/opensearch-project/OpenSearch/pull/19275))
+- Create and attach interclusterTest and yamlRestTest code coverage reports to gradle check task([#19165](https://github.com/opensearch-project/OpenSearch/pull/19165))
+- Optimized date histogram aggregations by preventing unnecessary object allocations in date rounding utils ([19088](https://github.com/opensearch-project/OpenSearch/pull/19088))
 
 ### Fixed
 - Fix unnecessary refreshes on update preparation failures ([#15261](https://github.com/opensearch-project/OpenSearch/issues/15261))
@@ -83,6 +87,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.code.gson:gson` from 2.13.1 to 2.13.2 ([#19290](https://github.com/opensearch-project/OpenSearch/pull/19290)) ([#19293](https://github.com/opensearch-project/OpenSearch/pull/19293))
 - Bump `actions/stale` from 9 to 10 ([#19292](https://github.com/opensearch-project/OpenSearch/pull/19292))
 - Bump `com.nimbusds:oauth2-oidc-sdk` from 11.25 to 11.28 ([#19291](https://github.com/opensearch-project/OpenSearch/pull/19291))
+- Bump `log4j2` from 2.21.0 to 2.25.1 ([#19184](https://github.com/opensearch-project/OpenSearch/pull/19184))
 
 ### Deprecated
 

gradle/code-coverage.gradle

@@ -52,14 +52,19 @@ allprojects {
         executionDataFiles.add("$buildDir/jacoco/javaRestTest.exec")
         sourceSetsList.add(sourceSets.javaRestTest)
       }
+      if (tasks.findByName('yamlRestTest')) {
+        executionDataFiles.add("$buildDir/jacoco/yamlRestTest.exec")
+        sourceSetsList.add(sourceSets.yamlRestTest)
+      }
       if (!executionDataFiles.isEmpty()) {
         executionData.setFrom(files(executionDataFiles).filter { it.exists() })
         sourceSets(*sourceSetsList)
       }
       onlyIf {
         file("$buildDir/jacoco/test.exec").exists() ||
           file("$buildDir/jacoco/internalClusterTest.exec").exists() ||
-          file("$buildDir/jacoco/javaRestTest.exec").exists()
+          file("$buildDir/jacoco/javaRestTest.exec").exists() ||
+          file("$buildDir/jacoco/yamlRestTest.exec").exists()
       }
     }
   }
@@ -71,17 +76,25 @@ if (System.getProperty("tests.coverage")) {
       testCodeCoverageReport(JacocoCoverageReport) {
         testSuiteName = "test"
       }
+      testCodeCoverageReportInternalClusterTest(JacocoCoverageReport) {
+        testSuiteName = "internalClusterTest"
+      }
       testCodeCoverageReportJavaRestTest(JacocoCoverageReport) {
         testSuiteName = "javaRestTest"
       }
+      testCodeCoverageReportYamlRestTest(JacocoCoverageReport) {
+        testSuiteName = "yamlRestTest"
+      }
     }
   }
 
   // Attach code coverage report task to Gradle check task
   project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME).configure {
     dependsOn(
       tasks.named('testCodeCoverageReport', JacocoReport),
-      tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport)
+      tasks.named('testCodeCoverageReportInternalClusterTest', JacocoReport),
+      tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport),
+      tasks.named('testCodeCoverageReportYamlRestTest', JacocoReport)
     )
   }
 }

gradle/libs.versions.toml

@@ -13,7 +13,9 @@ jackson_databind  = "2.18.2"
 snakeyaml         = "2.1"
 icu4j             = "77.1"
 supercsv          = "2.4.0"
-log4j             = "2.21.0"
+log4j             = "2.25.1"
+error_prone_annotations = "2.41.0"
+spotbugs_annotations = "4.9.4"
 slf4j             = "2.0.17"
 asm               = "9.7"
 jettison          = "1.5.4"

libs/core/licenses/log4j-api-2.21.0.jar.sha1

@@ -0,0 +1 @@
+c7acbbd6f110cd1457c628da46245e355b1ee57a

libs/core/licenses/log4j-api-2.25.1.jar.sha1

@@ -82,6 +82,26 @@ private DerivedFieldScript.LeafFactory compile(String expression, SearchLookup l
         return factory.newFactory(Collections.emptyMap(), lookup);
     }
 
+    public void testEmittingFloatField() throws IOException {
+        SearchLookup lookup = mock(SearchLookup.class);
+
+        // Mock LeafReaderContext
+        MemoryIndex index = new MemoryIndex();
+        LeafReaderContext leafReaderContext = index.createSearcher().getIndexReader().leaves().get(0);
+
+        LeafSearchLookup leafSearchLookup = mock(LeafSearchLookup.class);
+        when(lookup.getLeafSearchLookup(leafReaderContext)).thenReturn(leafSearchLookup);
+
+        // Script that emits a float value
+        DerivedFieldScript script = compile("emit(3.14f)", lookup).newInstance(leafReaderContext);
+        script.setDocument(1);
+        script.execute();
+
+        List<Object> result = script.getEmittedValues();
+        assertEquals(1, result.size());
+        assertEquals(3.14f, result.get(0));
+    }
+
     public void testEmittingDoubleField() throws IOException {
         // Mocking field value to be returned
         NumberFieldType fieldType = new NumberFieldType("test_double_field", NumberType.DOUBLE);

modules/lang-painless/src/test/java/org/opensearch/painless/DerivedFieldScriptTests.java

@@ -24,8 +24,11 @@ dependencies {
   api project('spi')
   compileOnly "com.google.code.findbugs:jsr305:3.0.2"
   runtimeOnly "com.google.guava:guava:${versions.guava}"
-  implementation "com.google.errorprone:error_prone_annotations:2.24.1"
-  implementation "com.google.guava:failureaccess:1.0.2"
+
+  compileOnly "com.github.spotbugs:spotbugs-annotations:${versions.spotbugs_annotations}"
+  compileOnly "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"
+  compileOnly "com.google.guava:failureaccess:1.0.2"
+
   implementation "io.grpc:grpc-api:${versions.grpc}"
   implementation "io.grpc:grpc-core:${versions.grpc}"
   implementation "io.grpc:grpc-netty-shaded:${versions.grpc}"