Refine executor description in WebSocketMessageBrokerStats

Closes gh-33104

Author: rstoyanchev

spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java

@@ -30,6 +30,7 @@
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler;
+import org.springframework.scheduling.SchedulingTaskExecutor;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -239,9 +240,15 @@ public String getSockJsTaskSchedulerStatsInfo() {
 		if (this.sockJsTaskScheduler == null) {
 			return "null";
 		}
-		if (this.sockJsTaskScheduler instanceof ThreadPoolTaskScheduler threadPoolTaskScheduler) {
-			return getExecutorStatsInfo(threadPoolTaskScheduler.getScheduledThreadPoolExecutor());
+
+		if (!(this.sockJsTaskScheduler instanceof SchedulingTaskExecutor)) {
+			return "thread-per-task";
+		}
+
+		if (this.sockJsTaskScheduler instanceof ThreadPoolTaskScheduler tpts) {
+			return getExecutorStatsInfo(tpts.getScheduledThreadPoolExecutor());
 		}
+
 		return "unknown";
 	}
 
@@ -250,8 +257,12 @@ private String getExecutorStatsInfo(@Nullable Executor executor) {
 			return "null";
 		}
 
-		if (executor instanceof ThreadPoolTaskExecutor threadPoolTaskScheduler) {
-			executor = threadPoolTaskScheduler.getThreadPoolExecutor();
+		if (!(executor instanceof SchedulingTaskExecutor) && (executor instanceof TaskExecutor)) {
+			return "thread-per-task";
+		}
+
+		if (executor instanceof ThreadPoolTaskExecutor tpte) {
+			executor = tpte.getThreadPoolExecutor();
 		}
 
 		if (executor instanceof ThreadPoolExecutor) {

spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java

@@ -65,8 +65,8 @@ void inboundAndOutboundChannelsWithMockedTaskExecutor() {
 		stats.setInboundChannelExecutor(executor);
 		stats.setOutboundChannelExecutor(executor);
 
-		assertThat(stats.getClientInboundExecutorStatsInfo()).as("inbound channel stats").isEqualTo("unknown");
-		assertThat(stats.getClientOutboundExecutorStatsInfo()).as("outbound channel stats").isEqualTo("unknown");
+		assertThat(stats.getClientInboundExecutorStatsInfo()).as("inbound channel stats").isEqualTo("thread-per-task");
+		assertThat(stats.getClientOutboundExecutorStatsInfo()).as("outbound channel stats").isEqualTo("thread-per-task");
 	}
 
 	@Test
@@ -86,7 +86,7 @@ void sockJsTaskSchedulerWithMockedTaskScheduler() {
 
 		stats.setSockJsTaskScheduler(scheduler);
 
-		assertThat(stats.getSockJsTaskSchedulerStatsInfo()).isEqualTo("unknown");
+		assertThat(stats.getSockJsTaskSchedulerStatsInfo()).isEqualTo("thread-per-task");
 	}
 
 }