From 518070284e4148f57d82dbf2190651e41424b8cf Mon Sep 17 00:00:00 2001
From: Max Hniebergall <max.hniebergall@elastic.co>
Date: Thu, 10 Oct 2024 10:19:17 -0400
Subject: [PATCH] only return deprecation warning for elser service

---
 .../ElasticsearchInternalService.java         | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java
index 9f7be1eb96c22..876c893eaed84 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java
@@ -133,7 +133,15 @@ public void parseRequestConfig(
                     );
                     platformArch.accept(
                         modelListener.delegateFailureAndWrap(
-                            (delegate, arch) -> elserCase(inferenceEntityId, taskType, config, arch, serviceSettingsMap, modelListener)
+                            (delegate, arch) -> elserCase(
+                                inferenceEntityId,
+                                taskType,
+                                config,
+                                arch,
+                                serviceSettingsMap,
+                                modelListener,
+                                true
+                            )
                         )
                     );
                 } else {
@@ -148,7 +156,15 @@ public void parseRequestConfig(
             } else if (ElserModels.isValidModel(modelId)) {
                 platformArch.accept(
                     modelListener.delegateFailureAndWrap(
-                        (delegate, arch) -> elserCase(inferenceEntityId, taskType, config, arch, serviceSettingsMap, modelListener)
+                        (delegate, arch) -> elserCase(
+                            inferenceEntityId,
+                            taskType,
+                            config,
+                            arch,
+                            serviceSettingsMap,
+                            modelListener,
+                            OLD_ELSER_SERVICE_NAME.equals(serviceName)
+                        )
                     )
                 );
             } else {
@@ -298,7 +314,8 @@ private void elserCase(
         Map<String, Object> config,
         Set<String> platformArchitectures,
         Map<String, Object> serviceSettingsMap,
-        ActionListener<Model> modelListener
+        ActionListener<Model> modelListener,
+        boolean isElserService
     ) {
         var esServiceSettingsBuilder = ElasticsearchInternalServiceSettings.fromRequestMap(serviceSettingsMap);
         final String defaultModelId = selectDefaultModelVariantBasedOnClusterArchitecture(
@@ -327,15 +344,17 @@ private void elserCase(
             }
         }
 
-        DEPRECATION_LOGGER.warn(
-            DeprecationCategory.API,
-            "inference_api_elser_service",
-            "The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
-                + " [model_id] set to [{}] in the [service_settings]",
-            OLD_ELSER_SERVICE_NAME,
-            ElasticsearchInternalService.NAME,
-            defaultModelId
-        );
+        if (isElserService) {
+            DEPRECATION_LOGGER.warn(
+                DeprecationCategory.API,
+                "inference_api_elser_service",
+                "The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
+                    + " [model_id] set to [{}] in the [service_settings]",
+                OLD_ELSER_SERVICE_NAME,
+                ElasticsearchInternalService.NAME,
+                defaultModelId
+            );
+        }
 
         if (modelVariantDoesNotMatchArchitecturesAndIsNotPlatformAgnostic(platformArchitectures, esServiceSettingsBuilder.getModelId())) {
             throw new IllegalArgumentException(