@@ -133,7 +133,15 @@ public void parseRequestConfig(
133133 );
134134 platformArch .accept (
135135 modelListener .delegateFailureAndWrap (
136- (delegate , arch ) -> elserCase (inferenceEntityId , taskType , config , arch , serviceSettingsMap , modelListener )
136+ (delegate , arch ) -> elserCase (
137+ inferenceEntityId ,
138+ taskType ,
139+ config ,
140+ arch ,
141+ serviceSettingsMap ,
142+ modelListener ,
143+ true
144+ )
137145 )
138146 );
139147 } else {
@@ -148,7 +156,15 @@ public void parseRequestConfig(
148156 } else if (ElserModels .isValidModel (modelId )) {
149157 platformArch .accept (
150158 modelListener .delegateFailureAndWrap (
151- (delegate , arch ) -> elserCase (inferenceEntityId , taskType , config , arch , serviceSettingsMap , modelListener )
159+ (delegate , arch ) -> elserCase (
160+ inferenceEntityId ,
161+ taskType ,
162+ config ,
163+ arch ,
164+ serviceSettingsMap ,
165+ modelListener ,
166+ OLD_ELSER_SERVICE_NAME .equals (serviceName )
167+ )
152168 )
153169 );
154170 } else {
@@ -298,7 +314,8 @@ private void elserCase(
298314 Map <String , Object > config ,
299315 Set <String > platformArchitectures ,
300316 Map <String , Object > serviceSettingsMap ,
301- ActionListener <Model > modelListener
317+ ActionListener <Model > modelListener ,
318+ boolean isElserService
302319 ) {
303320 var esServiceSettingsBuilder = ElasticsearchInternalServiceSettings .fromRequestMap (serviceSettingsMap );
304321 final String defaultModelId = selectDefaultModelVariantBasedOnClusterArchitecture (
@@ -327,15 +344,17 @@ private void elserCase(
327344 }
328345 }
329346
330- DEPRECATION_LOGGER .warn (
331- DeprecationCategory .API ,
332- "inference_api_elser_service" ,
333- "The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
334- + " [model_id] set to [{}] in the [service_settings]" ,
335- OLD_ELSER_SERVICE_NAME ,
336- ElasticsearchInternalService .NAME ,
337- defaultModelId
338- );
347+ if (isElserService ) {
348+ DEPRECATION_LOGGER .warn (
349+ DeprecationCategory .API ,
350+ "inference_api_elser_service" ,
351+ "The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
352+ + " [model_id] set to [{}] in the [service_settings]" ,
353+ OLD_ELSER_SERVICE_NAME ,
354+ ElasticsearchInternalService .NAME ,
355+ defaultModelId
356+ );
357+ }
339358
340359 if (modelVariantDoesNotMatchArchitecturesAndIsNotPlatformAgnostic (platformArchitectures , esServiceSettingsBuilder .getModelId ())) {
341360 throw new IllegalArgumentException (
0 commit comments