From 20a9aa6342b3688e55d88f73dc0c6293c80a2856 Mon Sep 17 00:00:00 2001 From: Vadim Galavanov Date: Fri, 29 Sep 2023 09:00:39 +0100 Subject: [PATCH] =?UTF-8?q?Override=20LazyTraceThreadPoolTaskExecutor.getQ?= =?UTF-8?q?ueueSize()=20to=20return=20del=E2=80=A6=20(#2316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Override LazyTraceThreadPoolTaskExecutor.getQueueSize() to return delegate's value (#2315) * Update LazyTraceThreadPoolTaskExecutorTests.java --------- Co-authored-by: Marcin Grzejszczak --- .../LazyTraceThreadPoolTaskExecutor.java | 5 ++ .../LazyTraceThreadPoolTaskExecutorTests.java | 60 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 spring-cloud-sleuth-instrumentation/src/test/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutorTests.java diff --git a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutor.java b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutor.java index e6d5c6921..49634377f 100644 --- a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutor.java +++ b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutor.java @@ -177,6 +177,11 @@ public class LazyTraceThreadPoolTaskExecutor extends ThreadPoolTaskExecutor { return this.delegate.getQueueCapacity(); } + @Override + public int getQueueSize() { + return this.delegate.getQueueSize(); + } + @Override public void destroy() { this.delegate.destroy(); diff --git a/spring-cloud-sleuth-instrumentation/src/test/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutorTests.java b/spring-cloud-sleuth-instrumentation/src/test/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutorTests.java new file mode 100644 index 000000000..031302a22 --- /dev/null +++ b/spring-cloud-sleuth-instrumentation/src/test/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutorTests.java @@ -0,0 +1,60 @@ +/* + * Copyright 2013-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.sleuth.instrument.async; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import org.springframework.beans.factory.BeanFactory; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + +@ExtendWith(MockitoExtension.class) +public class LazyTraceThreadPoolTaskExecutorTests { + + private static final String BEAN_NAME = "mock"; + + @Mock(lenient = true) + private BeanFactory beanFactory; + + @Mock(lenient = true) + private ThreadPoolTaskExecutor delegate; + + private LazyTraceThreadPoolTaskExecutor executor; + + @BeforeEach + public void setup() { + this.executor = spy(new LazyTraceThreadPoolTaskExecutor(beanFactory, delegate, BEAN_NAME)); + } + + @Test + public void should_delegate_getQueueSize() { + final int expected = 1000; + doReturn(expected).when(delegate).getQueueSize(); + + final int actual = executor.getQueueSize(); + + assertThat(actual).isEqualTo(expected); + } + +}