Merge branch 'main' into test-assertions

Author: breskeby

.editorconfig

@@ -209,7 +209,9 @@ indent_size = 4
 max_line_length = 140
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
-ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
+# The first '@*,' is a workaround for https://youtrack.jetbrains.com/issue/IDEA-368382/Auto-import-puts-java-imports-first-even-when-Editor-Code-style-Java-Import-layout-puts-them-last
+# it should be removed once that is fixed
+ij_java_imports_layout = @*,*,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
 
 [*.json]
 indent_size = 2

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/JarApiComparisonTask.java

@@ -111,7 +111,11 @@ private String getPath() {
         List<String> classNames() throws IOException {
             Pattern classEnding = Pattern.compile(".*\\.class$");
             try (JarFile jf = new JarFile(this.path)) {
-                return jf.stream().map(ZipEntry::getName).filter(classEnding.asMatchPredicate()).collect(Collectors.toList());
+                return jf.stream()
+                    .map(ZipEntry::getName)
+                    .filter(classEnding.asMatchPredicate())
+                    .filter(c -> c.startsWith("org/elasticsearch/logging/internal/") == false)
+                    .collect(Collectors.toList());
             }
         }
 

build-tools-internal/version.properties

@@ -29,7 +29,7 @@ opensaml = 4.3.0
 
 # client dependencies
 httpclient        = 4.5.14
-httpcore          = 4.4.13
+httpcore          = 4.4.16
 httpasyncclient   = 4.1.5
 commonslogging    = 1.2
 commonscodec      = 1.15

docs/changelog/121548.yaml

@@ -0,0 +1,5 @@
+pr: 121548
+summary: Adding support for specifying embedding type to Jina AI service settings
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/122762.yaml

@@ -0,0 +1,6 @@
+pr: 122762
+summary: "ESQL: Remove estimated row size assertion"
+area: ES|QL
+type: bug
+issues:
+  - 121535

docs/changelog/123630.yaml

@@ -0,0 +1,6 @@
+pr: 123630
+summary: Limit number of suppressed S3 deletion errors
+area: Snapshot/Restore
+type: bug
+issues:
+ - 123354

docs/images/token-graph-dns-synonym-ex2.svg

@@ -25,7 +25,7 @@ The `flatten_graph` filter uses Lucene’s [FlattenGraphFilter](https://lucene.a
 
 To see how the `flatten_graph` filter works, you first need to produce a token graph containing multi-position tokens.
 
-The following [analyze API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-analyze) request uses the `synonym_graph` filter to add `dns` as a multi-position synonym for `domain name system` in the text `domain name system is fragile`:
+The following [analyze API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-analyze) request uses the `synonym_graph` filter to add `internet phonebook` as a multi-position synonym for `domain name system` in the text `domain name system is fragile`:
 
 ```console
 GET /_analyze
@@ -34,17 +34,17 @@ GET /_analyze
   "filter": [
     {
       "type": "synonym_graph",
-      "synonyms": [ "dns, domain name system" ]
+      "synonyms": [ "internet phonebook, domain name system" ]
     }
   ],
   "text": "domain name system is fragile"
 }
 ```
 
-The filter produces the following token graph with `dns` as a multi-position token.
+The filter produces the following token graph with `internet phonebook` as a multi-position token.
 
-:::{image} ../../../images/token-graph-dns-synonym-ex.svg
-:alt: token graph dns synonym ex
+:::{image} ../../../images/token-graph-dns-synonym-ex2.svg
+:alt: token graph dns synonym example
 :::
 
 Indexing does not support token graphs containing multi-position tokens. To make this token graph suitable for indexing, it needs to be flattened.
@@ -58,7 +58,7 @@ GET /_analyze
   "filter": [
     {
       "type": "synonym_graph",
-      "synonyms": [ "dns, domain name system" ]
+      "synonyms": [ "internet phonebook, domain name system" ]
     },
     "flatten_graph"
   ],
@@ -68,8 +68,8 @@ GET /_analyze
 
 The filter produces the following flattened token graph, which is suitable for indexing.
 
-:::{image} ../../../images/token-graph-dns-invalid-ex.svg
-:alt: token graph dns invalid ex
+:::{image} ../../../images/token-graph-dns-synonym-flattened-ex2.svg
+:alt: token graph dns flattened example
 :::
 
 

docs/images/token-graph-dns-synonym-flattened-ex2.svg

@@ -19,7 +19,7 @@ docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5"
 forbiddenApis = "de.thetaphi:forbiddenapis:3.8"
 gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.18.1"
 hamcrest = "org.hamcrest:hamcrest:2.1"
-httpcore = "org.apache.httpcomponents:httpcore:4.4.12"
+httpcore = "org.apache.httpcomponents:httpcore:4.4.16"
 httpclient = "org.apache.httpcomponents:httpclient:4.5.14"
 idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4"
 javaparser = "com.github.javaparser:javaparser-core:3.18.0"