From afaa05dff36b84ad624708134f93a33d0581ad13 Mon Sep 17 00:00:00 2001
From: Mashhur <99575341+mashhurs@users.noreply.github.com>
Date: Tue, 7 Apr 2026 15:04:57 -0700
Subject: [PATCH] DeadLetterQueueUtils#extractSegmentId improvement: replace
 split with index of and substring methods. (#18874)

* DeadLetterQueueUtils: avoid using heavy split operation, replace it with simple index of and substring methods.

* Handle exception case if file name doesn't end with .log. Add unit test cases.

(cherry picked from commit 8d7a5a31cae207f36fe500a910647ba8572f1455)
---
 .../common/io/DeadLetterQueueUtils.java       |  9 ++++++--
 .../common/io/DeadLetterQueueReaderTest.java  | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java
index 31e9d564426..06a6a507462 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java
@@ -37,8 +37,13 @@ class DeadLetterQueueUtils {
 
     private static final Logger logger = LogManager.getLogger(DeadLetterQueueUtils.class);
 
-    static int extractSegmentId(Path p) {
-        return Integer.parseInt(p.getFileName().toString().split("\\.log")[0]);
+    static int extractSegmentId(final Path p) {
+        final String fileName = p.getFileName().toString();
+        final int dotIndex = fileName.indexOf(".log");
+        if (dotIndex <= 0) {
+            throw new IllegalArgumentException("Invalid segment file name: " + fileName);
+        }
+        return Integer.parseInt(fileName.substring(0, dotIndex));
     }
 
     static Stream<Path> listFiles(Path path, String suffix) throws IOException {
diff --git a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
index da8ae7e91eb..90f53df7739 100644
--- a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
@@ -1124,4 +1124,26 @@ public void testReaderLockProhibitMultipleInstances() throws IOException {
             }
         }
     }
+
+    @Test
+    public void testExtractSegmentIdWithValidFileName() {
+        Path validPath = Paths.get("123.log");
+        assertEquals(123, DeadLetterQueueUtils.extractSegmentId(validPath));
+
+        Path singleDigitPath = Paths.get("1.log");
+        assertEquals(1, DeadLetterQueueUtils.extractSegmentId(singleDigitPath));
+
+        Path largeNumberPath = Paths.get("999999.log");
+        assertEquals(999999, DeadLetterQueueUtils.extractSegmentId(largeNumberPath));
+    }
+
+    @Test
+    public void testExtractSegmentIdWithNoLogExtensionThrowsException() {
+        Path noExtensionPath = Paths.get("123.txt");
+        IllegalArgumentException exception = Assert.assertThrows(
+                IllegalArgumentException.class,
+                () -> DeadLetterQueueUtils.extractSegmentId(noExtensionPath)
+        );
+        assertThat(exception.getMessage(), containsString("Invalid segment file name"));
+    }
 }