Merge branch 'main' into test/die-with-dignity-pid6

.buildkite/pipelines/periodic-platform-support.yml

@@ -27,7 +27,7 @@ steps:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}
           diskSizeGb: 350
-          machineType: custom-32-98304
+          machineType: n1-standard-32
         env: {}
   - group: platform-support-windows
     steps:
@@ -50,7 +50,7 @@ steps:
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-32-98304
+          machineType: n1-standard-32
           diskType: pd-ssd
           diskSizeGb: 350
         env:

.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part1.yml

@@ -34,6 +34,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'build-benchmark'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part2.yml

@@ -34,6 +34,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'build-benchmark'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots-windows.yml

@@ -29,6 +29,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots.yml

@@ -26,6 +26,7 @@
           black-list-labels:
             - '>test-mute'
             - 'test-full-bwc'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

.ci/jobs.t/elastic+elasticsearch+pull-request+cloud-deploy.yml

@@ -26,6 +26,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'cloud-deploy'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+docs-check.yml

@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+eql-correctness.yml

@@ -25,6 +25,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml

@@ -23,6 +23,8 @@
             - build-tools/.*
             - build-tools-internal/.*
             - plugins/examples/.*
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+full-bwc.yml

@@ -27,6 +27,7 @@
             - 'test-full-bwc'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml

@@ -27,6 +27,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix.yml

@@ -28,6 +28,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-nojdk.yml

@@ -32,6 +32,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample-nojdk.yml

@@ -31,6 +31,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml

@@ -30,6 +30,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml

@@ -32,6 +32,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml

@@ -29,6 +29,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml

@@ -27,6 +27,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-windows.yml

@@ -28,6 +28,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml

@@ -27,6 +27,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-windows.yml

@@ -28,6 +28,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-fips.yml

@@ -28,6 +28,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-windows.yml

@@ -29,6 +29,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+part-3.yml

@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
           black-list-target-branches:
             - 6.8
             - 7.17

.ci/jobs.t/elastic+elasticsearch+pull-request+precommit.yml

@@ -20,6 +20,8 @@
           cancel-builds-on-update: true
           white-list-labels:
             - '>test-mute'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+release-tests.yml

@@ -25,6 +25,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'test-release'
+          black-list-labels:
+            - 'buildkite-opt-in'
           black-list-target-branches:
             - 7.15
             - 6.8

.ci/jobs.t/elastic+elasticsearch+pull-request+rest-compatibility.yml

@@ -28,6 +28,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/templates.t/pull-request-gradle-unix.yml

@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

server/src/main/java/org/elasticsearch/Build.java

@@ -14,10 +14,12 @@
 import org.elasticsearch.core.Booleans;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.internal.BuildExtension;
+import org.elasticsearch.plugins.ExtensionLoader;
 
 import java.io.IOException;
 import java.net.URL;
 import java.security.CodeSource;
+import java.util.ServiceLoader;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
@@ -41,12 +43,8 @@ private static class CurrentHolder {
 
         // finds the pluggable current build, or uses the local build as a fallback
         private static Build findCurrent() {
-            var buildExtension = BuildExtension.load();
-            if (buildExtension == null) {
-                return findLocalBuild();
-            }
-            var build = buildExtension.getCurrentBuild();
-            return build;
+            var buildExtension = ExtensionLoader.loadSingleton(ServiceLoader.load(BuildExtension.class), () -> Build::findLocalBuild);
+            return buildExtension.getCurrentBuild();
         }
     }
 

server/src/main/java/org/elasticsearch/TransportVersion.java

@@ -12,8 +12,10 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.internal.VersionExtension;
+import org.elasticsearch.plugins.ExtensionLoader;
 
 import java.io.IOException;
+import java.util.ServiceLoader;
 
 /**
  * Represents the version of the wire protocol used to communicate between a pair of ES nodes.
@@ -109,7 +111,7 @@ private static class CurrentHolder {
 
         // finds the pluggable current version, or uses the given fallback
         private static TransportVersion findCurrent() {
-            var versionExtension = VersionExtension.load();
+            var versionExtension = ExtensionLoader.loadSingleton(ServiceLoader.load(VersionExtension.class), () -> null);
             if (versionExtension == null) {
                 return TransportVersions.LATEST_DEFINED;
             }

server/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -510,6 +510,7 @@ public class ActionModule extends AbstractModule {
     private final ThreadPool threadPool;
     private final ReservedClusterStateService reservedClusterStateService;
     private final boolean serverlessEnabled;
+    private final RestExtension restExtension;
 
     public ActionModule(
         Settings settings,
@@ -525,7 +526,8 @@ public ActionModule(
         SystemIndices systemIndices,
         Tracer tracer,
         ClusterService clusterService,
-        List<ReservedClusterStateHandler<?>> reservedStateHandlers
+        List<ReservedClusterStateHandler<?>> reservedStateHandlers,
+        RestExtension restExtension
     ) {
         this.settings = settings;
         this.indexNameExpressionResolver = indexNameExpressionResolver;
@@ -572,6 +574,7 @@ public ActionModule(
             restController = new RestController(restInterceptor, nodeClient, circuitBreakerService, usageService, tracer);
         }
         reservedClusterStateService = new ReservedClusterStateService(clusterService, reservedStateHandlers);
+        this.restExtension = restExtension;
     }
 
     private static <T> T getRestServerComponent(
@@ -851,15 +854,10 @@ private static ActionFilters setupActionFilters(List<ActionPlugin> actionPlugins
 
     public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
         List<AbstractCatAction> catActions = new ArrayList<>();
-        var restExtension = RestExtension.load(() -> new RestExtension() {
-            @Override
-            public Predicate<AbstractCatAction> getCatActionsFilter() {
-                return action -> true;
-            }
-        });
         Predicate<AbstractCatAction> catActionsFilter = restExtension.getCatActionsFilter();
+        Predicate<RestHandler> restFilter = restExtension.getActionsFilter();
         Consumer<RestHandler> registerHandler = handler -> {
-            if (shouldKeepRestHandler(handler)) {
+            if (restFilter.test(handler)) {
                 if (handler instanceof AbstractCatAction catAction && catActionsFilter.test(catAction)) {
                     catActions.add(catAction);
                 }
@@ -1066,16 +1064,6 @@ public Predicate<AbstractCatAction> getCatActionsFilter() {
         registerHandler.accept(new RestDeleteSynonymRuleAction());
     }
 
-    /**
-     * This method is used to determine whether a RestHandler ought to be kept in memory or not. Returns true if serverless mode is
-     * disabled, or if there is any ServlerlessScope annotation on the RestHandler.
-     * @param handler
-     * @return
-     */
-    private boolean shouldKeepRestHandler(final RestHandler handler) {
-        return serverlessEnabled == false || handler.getServerlessScope() != null;
-    }
-
     @Override
     protected void configure() {
         bind(ActionFilters.class).toInstance(actionFilters);

server/src/main/java/org/elasticsearch/index/IndexVersion.java

@@ -15,6 +15,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Assertions;
 import org.elasticsearch.internal.VersionExtension;
+import org.elasticsearch.plugins.ExtensionLoader;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 
@@ -25,6 +26,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NavigableMap;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -154,7 +156,7 @@ private static class CurrentHolder {
 
         // finds the pluggable current version, or uses the given fallback
         private static IndexVersion findCurrent(IndexVersion fallback) {
-            var versionExtension = VersionExtension.load();
+            var versionExtension = ExtensionLoader.loadSingleton(ServiceLoader.load(VersionExtension.class), () -> null);
             if (versionExtension == null) {
                 return fallback;
             }