From fd35911d9b9bba528e5ef355496f20e2e76f1b80 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 2 Jul 2019 10:51:58 +0200 Subject: [PATCH 1/2] Fixed object class methods resolution for executorBPP --- .../async/ExecutorBeanPostProcessor.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java index 2e001d3db..2e549697d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java @@ -22,6 +22,7 @@ import java.lang.reflect.Modifier; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import org.aopalliance.aop.Advice; @@ -266,14 +267,16 @@ class ExecutorBeanPostProcessor implements BeanPostProcessor { } private static boolean anyFinalMethods(T object, Class iface) { - for (Method method : ReflectionUtils.getAllDeclaredMethods(iface)) { - Method m = ReflectionUtils.findMethod(object.getClass(), method.getName(), - method.getParameterTypes()); - if (m != null && Modifier.isFinal(m.getModifiers())) { - return true; - } - } - return false; + AtomicBoolean finalMethodPresent = new AtomicBoolean(); + ReflectionUtils.doWithMethods(iface, method -> finalMethodPresent.set(true), + method -> { + Method m = ReflectionUtils.findMethod(object.getClass(), + method.getName(), method.getParameterTypes()); + return m != null && + !ReflectionUtils.isObjectMethod(m) && + Modifier.isFinal(m.getModifiers()); + }); + return finalMethodPresent.get(); } } From 94c7c229a7baf8a6377f801b047543993390dd93 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 3 Jul 2019 09:32:43 +0200 Subject: [PATCH 2/2] Return 0 status code on exception or invalid code (#1387) * Return 0 status code on exception or invalid code fixes gh-1382 --- .../async/ExecutorBeanPostProcessor.java | 5 +- .../TraceWebClientBeanPostProcessor.java | 13 ++++- ...xchangeFilterFunctionHttpAdapterTests.java | 50 +++++++++++++++++++ 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceExchangeFilterFunctionHttpAdapterTests.java diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java index 2e549697d..5316f0467 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java @@ -272,9 +272,8 @@ class ExecutorBeanPostProcessor implements BeanPostProcessor { method -> { Method m = ReflectionUtils.findMethod(object.getClass(), method.getName(), method.getParameterTypes()); - return m != null && - !ReflectionUtils.isObjectMethod(m) && - Modifier.isFinal(m.getModifiers()); + return m != null && !ReflectionUtils.isObjectMethod(m) + && Modifier.isFinal(m.getModifiers()); }); return finalMethodPresent.get(); } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java index b7cfdcf12..7362707f1 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java @@ -395,7 +395,18 @@ final class TraceExchangeFilterFunction implements ExchangeFilterFunction { @Override public Integer statusCode(ClientResponse response) { - return response.statusCode().value(); + int result = statusCodeAsInt(response); + return result != 0 ? result : null; + } + + @Override + public int statusCodeAsInt(ClientResponse response) { + try { + return response.rawStatusCode(); + } + catch (Exception dontCare) { + return 0; + } } } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceExchangeFilterFunctionHttpAdapterTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceExchangeFilterFunctionHttpAdapterTests.java new file mode 100644 index 000000000..9295fbc6b --- /dev/null +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceExchangeFilterFunctionHttpAdapterTests.java @@ -0,0 +1,50 @@ +/* + * Copyright 2013-2019 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.web.client; + +import org.assertj.core.api.BDDAssertions; +import org.junit.Test; +import org.mockito.BDDMockito; + +import org.springframework.web.reactive.function.client.ClientResponse; + +public class TraceExchangeFilterFunctionHttpAdapterTests { + + @Test + public void should_return_0_when_invalid_status_code_is_returned() { + ClientResponse clientResponse = BDDMockito.mock(ClientResponse.class); + BDDMockito.given(clientResponse.rawStatusCode()) + .willThrow(new IllegalStateException("Boom")); + TraceExchangeFilterFunction.HttpAdapter adapter = new TraceExchangeFilterFunction.HttpAdapter(); + + Integer statusCode = adapter.statusCodeAsInt(clientResponse); + + BDDAssertions.then(statusCode).isZero(); + } + + @Test + public void should_return_status_code_when_valid_status_code_is_returned() { + ClientResponse clientResponse = BDDMockito.mock(ClientResponse.class); + BDDMockito.given(clientResponse.rawStatusCode()).willReturn(200); + TraceExchangeFilterFunction.HttpAdapter adapter = new TraceExchangeFilterFunction.HttpAdapter(); + + Integer statusCode = adapter.statusCodeAsInt(clientResponse); + + BDDAssertions.then(statusCode).isEqualTo(200); + } + +}