Merge pull request #1622 from HashZhang/HashZhang-patch-2

replace method for deprecation and keep reference of requestTemplate

spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClient.java

@@ -173,11 +173,10 @@ final class TracingFeignClient implements Client {
 			if (headers == null) {
 				return delegate;
 			}
-			String method = delegate.method();
 			String url = delegate.url();
 			byte[] body = delegate.body();
 			Charset charset = delegate.charset();
-			return Request.create(method, url, headers, body, charset);
+			return Request.create(delegate.httpMethod(), url, headers, body, charset, delegate.requestTemplate());
 		}
 
 	}

spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java

@@ -28,24 +28,31 @@ import brave.http.HttpTracing;
 import brave.propagation.StrictCurrentTraceContext;
 import feign.Client;
 import feign.Request;
+import feign.RequestTemplate;
 import org.assertj.core.api.BDDAssertions;
+import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.BDDMockito;
 import org.mockito.Mock;
+import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.stubbing.Answer;
 
 import static org.assertj.core.api.BDDAssertions.then;
 
 /**
  * @author Marcin Grzejszczak
+ * @author Hash.Jang
  */
 @ExtendWith(MockitoExtension.class)
 public class TracingFeignClientTests {
 
-	Request request = Request.create("GET", "https://foo", new HashMap<>(), null, null);
+	RequestTemplate requestTemplate = new RequestTemplate();
+
+	Request request = Request.create(Request.HttpMethod.GET, "https://foo", new HashMap<>(), null, null, requestTemplate);
 
 	Request.Options options = new Request.Options();
 
@@ -112,4 +119,16 @@ public class TracingFeignClientTests {
 		then(this.spans.get(0).tags()).containsEntry("error", "exception has occurred");
 	}
 
+	@Test
+	public void keep_requestTemplate() throws IOException {
+		BDDMockito.given(this.client.execute(BDDMockito.any(), BDDMockito.any())).willAnswer(new Answer() {
+			public Object answer(InvocationOnMock invocation) {
+				Object[] args = invocation.getArguments();
+				Assert.assertEquals(((Request) args[0]).requestTemplate(), requestTemplate);
+				return null;
+			}
+		});
+		this.traceFeignClient.execute(this.request, this.options);
+	}
+
 }