From 12630c2677cbf21300f46290ae236890c6ca5422 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Mon, 13 Oct 2025 08:52:24 -0500 Subject: [PATCH 1/4] Fixing SamplingServiceTests.testMaybeSampleMaxSize() --- .../elasticsearch/ingest/SamplingServiceTests.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java index ad4309740f608..ca147662c1398 100644 --- a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java @@ -250,7 +250,7 @@ public void testMaybeSampleMaxSize() { ); final ProjectId projectId = projectBuilder.getId(); ProjectMetadata projectMetadata = projectBuilder.build(); - final IndexRequest indexRequest = new IndexRequest(indexName).id("_id").source(randomByteArrayOfLength(150), XContentType.JSON); + final IndexRequest indexRequest = new IndexRequest(indexName).id("_id").source(randomAsciiByteArrayOfLength(150), XContentType.JSON); for (int i = 0; i < maxSamples; i++) { samplingService.maybeSample(projectMetadata, indexRequest); } @@ -353,4 +353,15 @@ private SamplingService getTestSamplingService() { final ProjectResolver projectResolver = TestProjectResolvers.singleProject(projectId); return new SamplingService(scriptService, clusterService, projectResolver, System::currentTimeMillis); } + + /* + * Returns an array containing random bytes that correspond to valid ascii characters + */ + private static byte[] randomAsciiByteArrayOfLength(int size) { + byte[] bytes = new byte[size]; + for (int i = 0; i < size; i++) { + bytes[i] = (byte) randomIntBetween(0, 127); + } + return bytes; + } } From 11ec682915cef30a1b0c724320df11922f3792e5 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 13 Oct 2025 14:02:22 +0000 Subject: [PATCH 2/4] [CI] Auto commit changes from spotless --- .../java/org/elasticsearch/ingest/SamplingServiceTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java index ca147662c1398..c68d309104ce8 100644 --- a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java @@ -250,7 +250,8 @@ public void testMaybeSampleMaxSize() { ); final ProjectId projectId = projectBuilder.getId(); ProjectMetadata projectMetadata = projectBuilder.build(); - final IndexRequest indexRequest = new IndexRequest(indexName).id("_id").source(randomAsciiByteArrayOfLength(150), XContentType.JSON); + final IndexRequest indexRequest = new IndexRequest(indexName).id("_id") + .source(randomAsciiByteArrayOfLength(150), XContentType.JSON); for (int i = 0; i < maxSamples; i++) { samplingService.maybeSample(projectMetadata, indexRequest); } From 2cffc78fd09f1868b75516065a989b340a270572 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Mon, 13 Oct 2025 10:04:51 -0500 Subject: [PATCH 3/4] using randomAlphanumericOfLength instead --- .../elasticsearch/ingest/SamplingServiceTests.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java index c68d309104ce8..9efacaf81f623 100644 --- a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java @@ -251,7 +251,7 @@ public void testMaybeSampleMaxSize() { final ProjectId projectId = projectBuilder.getId(); ProjectMetadata projectMetadata = projectBuilder.build(); final IndexRequest indexRequest = new IndexRequest(indexName).id("_id") - .source(randomAsciiByteArrayOfLength(150), XContentType.JSON); + .source(randomAlphanumericOfLength(150).getBytes(), XContentType.JSON); for (int i = 0; i < maxSamples; i++) { samplingService.maybeSample(projectMetadata, indexRequest); } @@ -354,15 +354,4 @@ private SamplingService getTestSamplingService() { final ProjectResolver projectResolver = TestProjectResolvers.singleProject(projectId); return new SamplingService(scriptService, clusterService, projectResolver, System::currentTimeMillis); } - - /* - * Returns an array containing random bytes that correspond to valid ascii characters - */ - private static byte[] randomAsciiByteArrayOfLength(int size) { - byte[] bytes = new byte[size]; - for (int i = 0; i < size; i++) { - bytes[i] = (byte) randomIntBetween(0, 127); - } - return bytes; - } } From fd1ae84c8e7154820191d5c02768da9d9fba70fd Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Mon, 13 Oct 2025 10:37:33 -0500 Subject: [PATCH 4/4] avoiding forbidden method --- .../java/org/elasticsearch/ingest/SamplingServiceTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java index 9efacaf81f623..c34f9d33a29d3 100644 --- a/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/SamplingServiceTests.java @@ -33,6 +33,7 @@ import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xcontent.XContentType; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -251,7 +252,7 @@ public void testMaybeSampleMaxSize() { final ProjectId projectId = projectBuilder.getId(); ProjectMetadata projectMetadata = projectBuilder.build(); final IndexRequest indexRequest = new IndexRequest(indexName).id("_id") - .source(randomAlphanumericOfLength(150).getBytes(), XContentType.JSON); + .source(randomAlphanumericOfLength(150).getBytes(StandardCharsets.UTF_8), XContentType.JSON); for (int i = 0; i < maxSamples; i++) { samplingService.maybeSample(projectMetadata, indexRequest); }