Remove Inference Service feature flag conditionals

Author: demjened

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

@@ -93,7 +93,6 @@
 import org.elasticsearch.xpack.inference.services.cohere.CohereService;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceService;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceComponents;
-import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceFeature;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceSettings;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElasticsearchInternalService;
 import org.elasticsearch.xpack.inference.services.googleaistudio.GoogleAiStudioService;
@@ -209,14 +208,12 @@ public Collection<?> createComponents(PluginServices services) {
         var inferenceServices = new ArrayList<>(inferenceServiceExtensions);
         inferenceServices.add(this::getInferenceServiceFactories);
 
-        if (ElasticInferenceServiceFeature.ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG.isEnabled()) {
-            ElasticInferenceServiceSettings eisSettings = new ElasticInferenceServiceSettings(settings);
-            eisComponents.set(new ElasticInferenceServiceComponents(eisSettings.getEisGatewayUrl()));
+        ElasticInferenceServiceSettings eisSettings = new ElasticInferenceServiceSettings(settings);
+        eisComponents.set(new ElasticInferenceServiceComponents(eisSettings.getElasticInferenceServiceUrl()));
 
-            inferenceServices.add(
-                () -> List.of(context -> new ElasticInferenceService(httpFactory.get(), serviceComponents.get(), eisComponents.get()))
-            );
-        }
+        inferenceServices.add(
+            () -> List.of(context -> new ElasticInferenceService(httpFactory.get(), serviceComponents.get(), eisComponents.get()))
+        );
 
         var factoryContext = new InferenceServiceExtension.InferenceServiceFactoryContext(
             services.client(),

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceFeature.java

@@ -10,11 +10,12 @@
 import org.elasticsearch.common.util.FeatureFlag;
 
 /**
- * Elastic Inference Service (EIS) feature flag. When the feature is complete, this flag will be removed.
- * Enable feature via JVM option: `-Des.eis_feature_flag_enabled=true`.
+ * Elastic Inference Service feature flag. Not being used anymore, but we'll keep it until the controller is no longer
+ * passing -Des.elastic_inference_service_feature_flag_enabled=true at startup.
  */
 public class ElasticInferenceServiceFeature {
 
-    public static final FeatureFlag ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG = new FeatureFlag("eis");
+    @Deprecated
+    public static final FeatureFlag ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG = new FeatureFlag("elastic_inference_service");
 
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceSettings.java

@@ -14,20 +14,23 @@
 
 public class ElasticInferenceServiceSettings {
 
-    static final Setting<String> EIS_GATEWAY_URL = Setting.simpleString("xpack.inference.eis.gateway.url", Setting.Property.NodeScope);
+    static final Setting<String> ELASTIC_INFERENCE_SERVICE_URL = Setting.simpleString(
+        "xpack.inference.elastic.url",
+        Setting.Property.NodeScope
+    );
 
-    // Adjust this variable to be volatile, if the setting can be updated at some point in time
-    private final String eisGatewayUrl;
+    private final String elasticInferenceServiceUrl;
 
     public ElasticInferenceServiceSettings(Settings settings) {
-        eisGatewayUrl = EIS_GATEWAY_URL.get(settings);
+        elasticInferenceServiceUrl = ELASTIC_INFERENCE_SERVICE_URL.get(settings);
     }
 
     public static List<Setting<?>> getSettingsDefinitions() {
-        return List.of(EIS_GATEWAY_URL);
+        return List.of(ELASTIC_INFERENCE_SERVICE_URL);
     }
 
-    public String getEisGatewayUrl() {
-        return eisGatewayUrl;
+    public String getElasticInferenceServiceUrl() {
+        return elasticInferenceServiceUrl;
     }
+
 }