Skip to content

Commit ba24333

Browse files
davidkyledavidkyle
committed
Remove model_id attribute
1 parent efd41a4 commit ba24333

File tree

6 files changed

+24
-33
lines changed

6 files changed

+24
-33
lines changed

‎server/src/main/java/org/elasticsearch/inference/telemetry/InferenceStats.java‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,11 @@ public static InferenceStats create(MeterRegistry meterRegistry) {
4949
);
5050
}
5151

52-
public static Map<String, Object> modelAttributes(Model model) {
53-
var modelAttributesMap = new HashMap<String, Object>();
54-
modelAttributesMap.put("service", model.getConfigurations().getService());
55-
modelAttributesMap.put("task_type", model.getTaskType().toString());
56-
57-
if (Objects.nonNull(model.getServiceSettings().modelId())) {
58-
modelAttributesMap.put("model_id", model.getServiceSettings().modelId());
59-
}
60-
61-
return modelAttributesMap;
52+
public static Map<String, Object> serviceAttributes(Model model) {
53+
return Map.of("service", model.getConfigurations().getService(), "task_type", model.getTaskType().toString());
6254
}
6355

64-
public static Map<String, Object> modelAttributes(UnparsedModel model) {
56+
public static Map<String, Object> serviceAttributes(UnparsedModel model) {
6557
return Map.of("service", model.service(), "task_type", model.taskType().toString());
6658
}
6759

@@ -77,9 +69,9 @@ public static Map<String, Object> responseAttributes(@Nullable Throwable throwab
7769
return Map.of("error.type", throwable.getClass().getSimpleName());
7870
}
7971

80-
public static Map<String, Object> modelAndResponseAttributes(Model model, @Nullable Throwable throwable) {
72+
public static Map<String, Object> serviceAndResponseAttributes(Model model, @Nullable Throwable throwable) {
8173
var metricAttributes = new HashMap<String, Object>();
82-
metricAttributes.putAll(modelAttributes(model));
74+
metricAttributes.putAll(serviceAttributes(model));
8375
metricAttributes.putAll(responseAttributes(throwable));
8476
return metricAttributes;
8577
}

‎server/src/test/java/org/elasticsearch/inference/telemetry/InferenceStatsTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.Map;
2626

2727
import static org.elasticsearch.inference.telemetry.InferenceStats.create;
28-
import static org.elasticsearch.inference.telemetry.InferenceStats.modelAttributes;
28+
import static org.elasticsearch.inference.telemetry.InferenceStats.serviceAttributes;
2929
import static org.elasticsearch.inference.telemetry.InferenceStats.responseAttributes;
3030
import static org.hamcrest.Matchers.is;
3131
import static org.hamcrest.Matchers.nullValue;
@@ -45,7 +45,7 @@ public void testRecordWithModel() {
4545
var longCounter = mock(LongCounter.class);
4646
var stats = new InferenceStats(longCounter, mock(), mock());
4747

48-
stats.requestCount().incrementBy(1, modelAttributes(model("service", TaskType.ANY, "modelId")));
48+
stats.requestCount().incrementBy(1, serviceAttributes(model("service", TaskType.ANY, "modelId")));
4949

5050
verify(longCounter).incrementBy(
5151
eq(1L),
@@ -57,7 +57,7 @@ public void testRecordWithoutModel() {
5757
var longCounter = mock(LongCounter.class);
5858
var stats = new InferenceStats(longCounter, mock(), mock());
5959

60-
stats.requestCount().incrementBy(1, modelAttributes(model("service", TaskType.ANY, null)));
60+
stats.requestCount().incrementBy(1, serviceAttributes(model("service", TaskType.ANY, null)));
6161

6262
verify(longCounter).incrementBy(eq(1L), eq(Map.of("service", "service", "task_type", TaskType.ANY.toString())));
6363
}
@@ -72,7 +72,7 @@ public void testRecordDurationWithoutError() {
7272
var stats = new InferenceStats(mock(), histogramCounter, mock());
7373

7474
Map<String, Object> metricAttributes = new HashMap<>();
75-
metricAttributes.putAll(modelAttributes(model("service", TaskType.ANY, "modelId")));
75+
metricAttributes.putAll(serviceAttributes(model("service", TaskType.ANY, "modelId")));
7676
metricAttributes.putAll(responseAttributes(null));
7777

7878
stats.inferenceDuration().record(expectedLong, metricAttributes);
@@ -100,7 +100,7 @@ public void testRecordDurationWithElasticsearchStatusException() {
100100
var expectedError = String.valueOf(statusCode.getStatus());
101101

102102
Map<String, Object> metricAttributes = new HashMap<>();
103-
metricAttributes.putAll(modelAttributes(model("service", TaskType.ANY, "modelId")));
103+
metricAttributes.putAll(serviceAttributes(model("service", TaskType.ANY, "modelId")));
104104
metricAttributes.putAll(responseAttributes(exception));
105105

106106
stats.inferenceDuration().record(expectedLong, metricAttributes);
@@ -127,7 +127,7 @@ public void testRecordDurationWithOtherException() {
127127
var expectedError = exception.getClass().getSimpleName();
128128

129129
Map<String, Object> metricAttributes = new HashMap<>();
130-
metricAttributes.putAll(modelAttributes(model("service", TaskType.ANY, "modelId")));
130+
metricAttributes.putAll(serviceAttributes(model("service", TaskType.ANY, "modelId")));
131131
metricAttributes.putAll(responseAttributes(exception));
132132

133133
stats.inferenceDuration().record(expectedLong, metricAttributes);
@@ -152,7 +152,7 @@ public void testRecordDurationWithUnparsedModelAndElasticsearchStatusException()
152152
var unparsedModel = new UnparsedModel("inferenceEntityId", TaskType.ANY, "service", Map.of(), Map.of());
153153

154154
Map<String, Object> metricAttributes = new HashMap<>();
155-
metricAttributes.putAll(modelAttributes(unparsedModel));
155+
metricAttributes.putAll(serviceAttributes(unparsedModel));
156156
metricAttributes.putAll(responseAttributes(exception));
157157

158158
stats.inferenceDuration().record(expectedLong, metricAttributes);
@@ -176,7 +176,7 @@ public void testRecordDurationWithUnparsedModelAndOtherException() {
176176
var unparsedModel = new UnparsedModel("inferenceEntityId", TaskType.ANY, "service", Map.of(), Map.of());
177177

178178
Map<String, Object> metricAttributes = new HashMap<>();
179-
metricAttributes.putAll(modelAttributes(unparsedModel));
179+
metricAttributes.putAll(serviceAttributes(unparsedModel));
180180
metricAttributes.putAll(responseAttributes(exception));
181181

182182
stats.inferenceDuration().record(expectedLong, metricAttributes);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceAction.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@
4949

5050
import static org.elasticsearch.ExceptionsHelper.unwrapCause;
5151
import static org.elasticsearch.core.Strings.format;
52-
import static org.elasticsearch.inference.telemetry.InferenceStats.modelAndResponseAttributes;
53-
import static org.elasticsearch.inference.telemetry.InferenceStats.modelAttributes;
5452
import static org.elasticsearch.inference.telemetry.InferenceStats.responseAttributes;
53+
import static org.elasticsearch.inference.telemetry.InferenceStats.serviceAndResponseAttributes;
5554
import static org.elasticsearch.xpack.inference.InferencePlugin.INFERENCE_API_FEATURE;
5655

5756
/**
@@ -181,7 +180,7 @@ private static void validationHelper(Supplier<Boolean> validationFailure, Suppli
181180

182181
private void recordRequestDurationMetrics(Model model, InferenceTimer timer, @Nullable Throwable t) {
183182
Map<String, Object> metricAttributes = new HashMap<>();
184-
metricAttributes.putAll(modelAttributes(model));
183+
metricAttributes.putAll(InferenceStats.serviceAttributes(model));
185184
metricAttributes.putAll(responseAttributes(unwrapCause(t)));
186185

187186
inferenceStats.inferenceDuration().record(timer.elapsedMillis(), metricAttributes);
@@ -270,7 +269,7 @@ protected <T> Flow.Publisher<T> streamErrorHandler(Flow.Publisher<T> upstream) {
270269

271270
private void recordRequestCountMetrics(Model model, Request request, String localNodeId) {
272271
Map<String, Object> requestCountAttributes = new HashMap<>();
273-
requestCountAttributes.putAll(modelAttributes(model));
272+
requestCountAttributes.putAll(InferenceStats.serviceAttributes(model));
274273

275274
inferenceStats.requestCount().incrementBy(1, requestCountAttributes);
276275
}
@@ -283,7 +282,7 @@ private void recordRequestDurationMetrics(
283282
@Nullable Throwable t
284283
) {
285284
Map<String, Object> metricAttributes = new HashMap<>();
286-
metricAttributes.putAll(modelAndResponseAttributes(model, unwrapCause(t)));
285+
metricAttributes.putAll(serviceAndResponseAttributes(model, unwrapCause(t)));
287286

288287
inferenceStats.inferenceDuration().record(timer.elapsedMillis(), metricAttributes);
289288
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
import java.util.Map;
7878
import java.util.stream.Collectors;
7979

80-
import static org.elasticsearch.inference.telemetry.InferenceStats.modelAndResponseAttributes;
80+
import static org.elasticsearch.inference.telemetry.InferenceStats.serviceAndResponseAttributes;
8181
import static org.elasticsearch.xpack.inference.InferencePlugin.INFERENCE_API_FEATURE;
8282
import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.toSemanticTextFieldChunks;
8383
import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.toSemanticTextFieldChunksLegacy;
@@ -461,7 +461,7 @@ public void onFailure(Exception exc) {
461461

462462
private void recordRequestCountMetrics(Model model, int incrementBy, Throwable throwable) {
463463
Map<String, Object> requestCountAttributes = new HashMap<>();
464-
requestCountAttributes.putAll(modelAndResponseAttributes(model, throwable));
464+
requestCountAttributes.putAll(serviceAndResponseAttributes(model, throwable));
465465
requestCountAttributes.put("inference_source", "semantic_text_bulk");
466466
inferenceStats.requestCount().incrementBy(incrementBy, requestCountAttributes);
467467
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/BaseElasticsearchInternalService.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
import static org.elasticsearch.ExceptionsHelper.unwrapCause;
4949
import static org.elasticsearch.core.Strings.format;
50-
import static org.elasticsearch.inference.telemetry.InferenceStats.modelAndResponseAttributes;
50+
import static org.elasticsearch.inference.telemetry.InferenceStats.serviceAndResponseAttributes;
5151
import static org.elasticsearch.xpack.core.ClientHelper.INFERENCE_ORIGIN;
5252
import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
5353

@@ -126,7 +126,7 @@ public void start(Model model, TimeValue timeout, ActionListener<Boolean> finalL
126126
});
127127
subscribableListener.addTimeout(timeout, threadPool, inferenceExecutor);
128128
subscribableListener.addListener(ActionListener.wrap(started -> {
129-
inferenceStats.deploymentDuration().record(timer.elapsedMillis(), modelAndResponseAttributes(model, null));
129+
inferenceStats.deploymentDuration().record(timer.elapsedMillis(), serviceAndResponseAttributes(model, null));
130130
finalListener.onResponse(started);
131131
}, e -> {
132132
if (e instanceof ElasticsearchTimeoutException) {
@@ -139,10 +139,11 @@ public void start(Model model, TimeValue timeout, ActionListener<Boolean> finalL
139139
model.getInferenceEntityId()
140140
)
141141
);
142-
inferenceStats.deploymentDuration().record(timer.elapsedMillis(), modelAndResponseAttributes(model, timeoutException));
142+
inferenceStats.deploymentDuration()
143+
.record(timer.elapsedMillis(), serviceAndResponseAttributes(model, timeoutException));
143144
finalListener.onFailure(timeoutException);
144145
} else {
145-
inferenceStats.deploymentDuration().record(timer.elapsedMillis(), modelAndResponseAttributes(model, unwrapCause(e)));
146+
inferenceStats.deploymentDuration().record(timer.elapsedMillis(), serviceAndResponseAttributes(model, unwrapCause(e)));
146147
finalListener.onFailure(e);
147148
}
148149
}));

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ public void testItemFailures() throws Exception {
356356
assertThat(statusCode, is(200));
357357
}
358358
assertThat(attributes.get("task_type"), is(model.getTaskType().toString()));
359-
assertThat(attributes.get("model_id"), is(model.getServiceSettings().modelId()));
360359
assertThat(attributes.get("service"), is(model.getConfigurations().getService()));
361360
assertThat(attributes.get("inference_source"), is("semantic_text_bulk"));
362361
}));

0 commit comments

Comments
 (0)