Merge branch 'main' into chat/timeout

Author: prwhelan

docs/changelog/127628.yaml

@@ -0,0 +1,5 @@
+pr: 127628
+summary: Ensure config reload on ..data symlink switch for CSI driver support
+area: Infra/Settings
+type: enhancement
+issues: []

docs/changelog/128298.yaml

@@ -0,0 +1,6 @@
+pr: 128298
+summary: Better handling of node ids from shutdown metadata (avoid NPE on already removed nodes)
+area: Infra/Node Lifecycle
+type: bug
+issues:
+ - 100201

docs/changelog/128314.yaml

@@ -0,0 +1,5 @@
+pr: 128314
+summary: Fix NPE in APMTracer through `RestController`
+area: Infra/REST API
+type: bug
+issues: []

docs/reference/elasticsearch/mapping-reference/object.md

@@ -11,7 +11,7 @@ JSON documents are hierarchical in nature: the document may contain inner object
 
 ```console
 PUT my-index-000001/_doc/1
-{ <1>
+{ // <1>
   "region": "US",
   "manager": { <2>
     "age":     30,

docs/reference/search-connectors/es-connectors-sharepoint-online.md

@@ -49,7 +49,7 @@ To get started, first log in to SharePoint Online and access your administrative
 
 Follow these steps:
 
-* Sign in to [https://portal.azure.com/](https://portal.azure.com/) and click on **Azure Active Directory**.
+* Sign in to [https://portal.azure.com/](https://portal.azure.com/) and click on **Microsoft Entra ID** (formerly Azure Active Directory).
 * Locate **App Registrations** and Click **New Registration**.
 * Give your app a name - like "Search".
 * Leave the **Redirect URIs** blank for now.
@@ -133,9 +133,9 @@ Refer to the following documentation for setting [SharePoint permissions](https:
 
 #### Granting `Sites.Selected` permissions [es-connectors-sharepoint-online-sites-selected-permissions-self-managed]
 
-To configure `Sites.Selected` permissions, follow these steps in the Azure Active Directory portal. These permissions enable precise access control to specific SharePoint sites.
+To configure `Sites.Selected` permissions, follow these steps in the Microsoft Entra ID (formerly Azure Active Directory) portal. These permissions enable precise access control to specific SharePoint sites.
 
-1. Sign in to the [Azure Active Directory portal](https://portal.azure.com/).
+1. Sign in to the [Microsoft Entra ID (formerly Azure Active Directory) portal](https://portal.azure.com/).
 2. Navigate to **App registrations** and locate the application created for the connector.
 3. Under **API permissions**, click **Add permission**.
 4. Select **Microsoft Graph** > **Application permissions**, then add `Sites.Selected`.
@@ -603,4 +603,4 @@ See [Troubleshooting](/reference/search-connectors/es-connectors-troubleshooting
 
 ### Security [es-connectors-sharepoint-online-client-security]
 
-See [Security](/reference/search-connectors/es-connectors-security.md).
+See [Security](/reference/search-connectors/es-connectors-security.md).

docs/release-notes/breaking-changes.md

@@ -12,6 +12,16 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
 
 % ## Next version [elasticsearch-nextversion-breaking-changes]
 
+```{applies_to}
+stack: coming 9.0.2
+```
+## 9.0.2 [elasticsearch-9.0.2-breaking-changes]
+
+Snapshot/Restore:
+* Make S3 custom query parameter optional [#128043](https://github.com/elastic/elasticsearch/pull/128043)
+
+
+
 ## 9.0.1 [elasticsearch-9.0.1-breaking-changes]
 
 No breaking changes in this version.

docs/release-notes/deprecations.md

@@ -16,6 +16,13 @@ To give you insight into what deprecated features you’re using, {{es}}:
 
 % ## Next version [elasticsearch-nextversion-deprecations]
 
+```{applies_to}
+stack: coming 9.0.2
+```
+## 9.0.2 [elasticsearch-9.0.2-deprecations]
+
+No deprecations in this version.
+
 ## 9.0.1 [elasticsearch-9.0.1-deprecations]
 
 No deprecations in this version.

docs/release-notes/index.md

@@ -20,6 +20,68 @@ To check for security updates, go to [Security announcements for the Elastic sta
 % ### Fixes [elasticsearch-next-fixes]
 % *
 
+```{applies_to}
+stack: coming 9.0.2
+```
+## 9.0.2 [elasticsearch-9.0.2-release-notes]
+
+### Features and enhancements [elasticsearch-9.0.2-features-enhancements]
+
+Authentication:
+* Http proxy support in JWT realm [#127337](https://github.com/elastic/elasticsearch/pull/127337) (issue: [#114956](https://github.com/elastic/elasticsearch/issues/114956))
+
+ES|QL:
+* Limit Replace function memory usage [#127924](https://github.com/elastic/elasticsearch/pull/127924)
+
+### Fixes [elasticsearch-9.0.2-fixes]
+
+Aggregations:
+* Fix a bug in `significant_terms` [#127975](https://github.com/elastic/elasticsearch/pull/127975)
+
+Audit:
+* Handle streaming request body in audit log [#127798](https://github.com/elastic/elasticsearch/pull/127798)
+
+Data streams:
+* Fix system data streams incorrectly showing up in the list of template validation problems [#128161](https://github.com/elastic/elasticsearch/pull/128161)
+
+Downsampling:
+* Downsampling does not consider passthrough fields as dimensions [#127752](https://github.com/elastic/elasticsearch/pull/127752) (issue: [#125156](https://github.com/elastic/elasticsearch/issues/125156))
+
+ES|QL:
+* Don't push down filters on the right hand side of an inlinejoin [#127383](https://github.com/elastic/elasticsearch/pull/127383)
+* ESQL: Avoid unintended attribute removal [#127563](https://github.com/elastic/elasticsearch/pull/127563) (issue: [#127468](https://github.com/elastic/elasticsearch/issues/127468))
+* ESQL: Fix alias removal in regex extraction with JOIN [#127687](https://github.com/elastic/elasticsearch/pull/127687) (issue: [#127467](https://github.com/elastic/elasticsearch/issues/127467))
+* ESQL: Keep `DROP` attributes when resolving field names [#127009](https://github.com/elastic/elasticsearch/pull/127009) (issue: [#126418](https://github.com/elastic/elasticsearch/issues/126418))
+* Ensure ordinal builder emit ordinal blocks [#127949](https://github.com/elastic/elasticsearch/pull/127949)
+* Fix union types in CCS [#128111](https://github.com/elastic/elasticsearch/pull/128111)
+
+Infra/Core:
+* Add missing `outbound_network` entitlement to x-pack-core [#126992](https://github.com/elastic/elasticsearch/pull/126992) (issue: [#127003](https://github.com/elastic/elasticsearch/issues/127003))
+* Check hidden frames in entitlements [#127877](https://github.com/elastic/elasticsearch/pull/127877)
+
+Infra/Scripting:
+* Avoid nested docs in painless execute api [#127991](https://github.com/elastic/elasticsearch/pull/127991) (issue: [#41004](https://github.com/elastic/elasticsearch/issues/41004))
+
+Machine Learning:
+* Append all data to Chat Completion buffer [#127658](https://github.com/elastic/elasticsearch/pull/127658)
+* Fix services API Google Vertex AI Rerank location field requirement [#127856](https://github.com/elastic/elasticsearch/pull/127856)
+
+Relevance:
+* Fix: Add `NamedWriteable` for `RuleQueryRankDoc` [#128153](https://github.com/elastic/elasticsearch/pull/128153) (issue: [#126071](https://github.com/elastic/elasticsearch/issues/126071))
+
+Security:
+* Remove dangling spaces wherever found [#127475](https://github.com/elastic/elasticsearch/pull/127475)
+
+Snapshot/Restore:
+* Add missing entitlement to `repository-azure` [#128047](https://github.com/elastic/elasticsearch/pull/128047) (issue: [#128046](https://github.com/elastic/elasticsearch/issues/128046))
+
+TSDB:
+* Skip the validation when retrieving the index mode during reindexing a time series data stream [#127824](https://github.com/elastic/elasticsearch/pull/127824)
+
+Vector Search:
+* [9.x] Revert "Enable madvise by default for all builds" [#127921](https://github.com/elastic/elasticsearch/pull/127921)
+
+
 ## 9.0.1 [elasticsearch-9.0.1-release-notes]
 
 ### Features and enhancements [elasticsearch-9.0.1-features-enhancements]

modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/tracing/APMTracer.java

@@ -304,6 +304,8 @@ private void setSpanAttributes(@Nullable Map<String, Object> spanAttributes, Spa
                     spanBuilder.setAttribute(key, (Double) value);
                 } else if (value instanceof Boolean) {
                     spanBuilder.setAttribute(key, (Boolean) value);
+                } else if (value == null) {
+                    throw new IllegalArgumentException("span attributes cannot have a null value");
                 } else {
                     throw new IllegalArgumentException(
                         "span attributes do not support value type of [" + value.getClass().getCanonicalName() + "]"

muted-tests.yml

@@ -396,9 +396,6 @@ tests:
 - class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2EnrichUnavailableRemotesIT
   method: testEsqlEnrichWithSkipUnavailable
   issue: https://github.com/elastic/elasticsearch/issues/127368
-- class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
-  method: testLookupExplosionNoFetch
-  issue: https://github.com/elastic/elasticsearch/issues/127365
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
   method: test {p0=ml/data_frame_analytics_cat_apis/Test cat data frame analytics all jobs with header}
   issue: https://github.com/elastic/elasticsearch/issues/127625
@@ -471,6 +468,12 @@ tests:
 - class: org.elasticsearch.ingest.geoip.GeoIpDownloaderCliIT
   method: testInvalidTimestamp
   issue: https://github.com/elastic/elasticsearch/issues/128284
+- class: org.elasticsearch.packaging.test.DockerTests
+  method: test120DockerLogsIncludeElasticsearchLogs
+  issue: https://github.com/elastic/elasticsearch/issues/128117
+- class: org.elasticsearch.packaging.test.TemporaryDirectoryConfigTests
+  method: test21AcceptsCustomPathInDocker
+  issue: https://github.com/elastic/elasticsearch/issues/128114
 
 # Examples:
 #