defer removal of PipelineBusV1 until after 9.0

elastic · Dec 17, 2024 · bf76848 · bf76848
1 parent e18e466
commit bf76848
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBus.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBus.java
@@ -49,7 +49,7 @@ static PipelineBus create() {
         final String pipelineBusImplementation = System.getProperty("logstash.pipelinebus.implementation", "v2");
         switch (pipelineBusImplementation) {
             case "v1":
-                DEPRECATION_LOGGER.deprecated("The legacy pipeline bus selected with `logstash.pipelinebus.implementation=v1` is deprecated, and will be removed in Logstash 9.0");
+                DEPRECATION_LOGGER.deprecated("The legacy pipeline bus selected with `logstash.pipelinebus.implementation=v1` is deprecated, and will be removed in a future release of Logstash");
                 return new PipelineBusV1();
             case "v2": return new PipelineBusV2();
             default:

diff --git a/logstash-core/src/test/java/org/logstash/plugins/pipeline/PipelineBusTest.java b/logstash-core/src/test/java/org/logstash/plugins/pipeline/PipelineBusTest.java
@@ -307,7 +307,6 @@ public void whenInBlockingModeInputsShutdownLast() throws InterruptedException {
 
             // This should unblock the listener thread
             bus.unregisterSender(output, addresses);
-            TimeUnit.SECONDS.toMillis(30);
             unlistenThread.join(Duration.ofSeconds(30).toMillis());
             assertThat(unlistenThread.getState()).isEqualTo(Thread.State.TERMINATED);