From 70c3aa5fb51ec2434b52a97ae07bfca98a6e7aa6 Mon Sep 17 00:00:00 2001 From: Pat Whelan Date: Wed, 27 Aug 2025 19:18:17 -0400 Subject: [PATCH] [ML] Remove unused InferenceRequestStats This class was replaced by InferenceStats and is no longer used. --- .../core/inference/InferenceRequestStats.java | 70 ------------------ .../inference/InferenceRequestStatsTests.java | 72 ------------------- 2 files changed, 142 deletions(-) delete mode 100644 x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/InferenceRequestStats.java delete mode 100644 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/InferenceRequestStatsTests.java diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/InferenceRequestStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/InferenceRequestStats.java deleted file mode 100644 index 74d44b1a24173..0000000000000 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/InferenceRequestStats.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -package org.elasticsearch.xpack.core.inference; - -import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.core.Nullable; -import org.elasticsearch.inference.TaskType; -import org.elasticsearch.xcontent.ToXContent; -import org.elasticsearch.xcontent.XContentBuilder; - -import java.io.IOException; -import java.util.Objects; - -public class InferenceRequestStats implements SerializableStats { - private final InferenceFeatureSetUsage.ModelStats modelStats; - private final String modelId; - - public InferenceRequestStats(String service, TaskType taskType, @Nullable String modelId, long count) { - this(new InferenceFeatureSetUsage.ModelStats(service, taskType, count), modelId); - } - - private InferenceRequestStats(InferenceFeatureSetUsage.ModelStats modelStats, @Nullable String modelId) { - this.modelStats = new InferenceFeatureSetUsage.ModelStats(modelStats); - this.modelId = modelId; - } - - public InferenceRequestStats(StreamInput in) throws IOException { - this.modelStats = new InferenceFeatureSetUsage.ModelStats(in); - this.modelId = in.readOptionalString(); - } - - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { - builder.startObject(); - builder.field("service", modelStats.service()); - builder.field("task_type", modelStats.taskType().toString()); - builder.field("count", modelStats.count()); - - if (modelId != null) { - builder.field("model_id", modelId); - } - - builder.endObject(); - return builder; - } - - @Override - public void writeTo(StreamOutput out) throws IOException { - modelStats.writeTo(out); - out.writeOptionalString(modelId); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - InferenceRequestStats that = (InferenceRequestStats) o; - return Objects.equals(modelStats, that.modelStats) && Objects.equals(modelId, that.modelId); - } - - @Override - public int hashCode() { - return Objects.hash(modelStats, modelId); - } -} diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/InferenceRequestStatsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/InferenceRequestStatsTests.java deleted file mode 100644 index 518612b1b0397..0000000000000 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/InferenceRequestStatsTests.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -package org.elasticsearch.xpack.core.inference; - -import org.elasticsearch.TransportVersion; -import org.elasticsearch.common.Strings; -import org.elasticsearch.common.io.stream.Writeable; -import org.elasticsearch.inference.TaskType; -import org.elasticsearch.xcontent.XContentBuilder; -import org.elasticsearch.xcontent.XContentFactory; -import org.elasticsearch.xcontent.XContentType; -import org.elasticsearch.xpack.core.ml.AbstractBWCWireSerializationTestCase; - -import java.io.IOException; - -import static org.hamcrest.Matchers.is; - -public class InferenceRequestStatsTests extends AbstractBWCWireSerializationTestCase { - - public static InferenceRequestStats createRandom() { - var modelId = randomBoolean() ? randomAlphaOfLength(10) : null; - - return new InferenceRequestStats(randomAlphaOfLength(10), randomFrom(TaskType.values()), modelId, randomInt()); - } - - public void testToXContent_DoesNotWriteModelId_WhenItIsNull() throws IOException { - var stats = new InferenceRequestStats("service", TaskType.TEXT_EMBEDDING, null, 1); - - XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON); - stats.toXContent(builder, null); - String xContentResult = Strings.toString(builder); - - assertThat(xContentResult, is(""" - {"service":"service","task_type":"text_embedding","count":1}""")); - } - - public void testToXContent_WritesModelId_WhenItIsDefined() throws IOException { - var stats = new InferenceRequestStats("service", TaskType.TEXT_EMBEDDING, "model_id", 2); - - XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON); - stats.toXContent(builder, null); - String xContentResult = Strings.toString(builder); - - assertThat(xContentResult, is(""" - {"service":"service","task_type":"text_embedding","count":2,"model_id":"model_id"}""")); - } - - @Override - protected InferenceRequestStats mutateInstanceForVersion(InferenceRequestStats instance, TransportVersion version) { - return instance; - } - - @Override - protected Writeable.Reader instanceReader() { - return InferenceRequestStats::new; - } - - @Override - protected InferenceRequestStats createTestInstance() { - return createRandom(); - } - - @Override - protected InferenceRequestStats mutateInstance(InferenceRequestStats instance) throws IOException { - return randomValueOtherThan(instance, this::createTestInstance); - } -}