diff --git a/samples/skywalking-example/account-application/account-impl/pom.xml b/samples/skywalking-example/account-application/account-impl/pom.xml index cfab3def1..5ab81c8e5 100644 --- a/samples/skywalking-example/account-application/account-impl/pom.xml +++ b/samples/skywalking-example/account-application/account-impl/pom.xml @@ -155,6 +155,13 @@ jdbc-plugin 1.0-SNAPSHOT + + + + com.ai.cloud + httpClient-plugin + 1.0-SNAPSHOT + diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java index 022787806..2278866f5 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java +++ b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java @@ -37,14 +37,10 @@ public class AccountMaintainImpl implements IAccountMaintain { commonsHttpResult.setErrorCode("99999"); commonsHttpResult.setMessage("Create account failed"); } else { - Map headParameters = new HashMap(); - headParameters.put("SkyWalking-TRACING-NAME", new RPCBuriedPointSender().beforeSend(Identification.newBuilder(). - spanType('W').viewPoint(MAIL_APPLICATION_DEPLOY_ADDRESS + SEND_MAIL_URL).build()).toString()); Map parameters = new HashMap(); parameters.put("recipientAccount", accountInfo.getMail()); String mailResult = HttpClientUtil.sendPostRequest(MAIL_APPLICATION_DEPLOY_ADDRESS + SEND_MAIL_URL, - parameters, headParameters); - new RPCBuriedPointSender().afterSend(); + parameters); CommonsHttpResult commonsHttpResult1 = gson.fromJson(mailResult, CommonsHttpResult.class); if ("000000".equals(commonsHttpResult1.getErrorCode())) { diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java index eb61f195d..20dd96197 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java +++ b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.example.account.util; +import com.ai.cloud.skywalking.plugin.httpclient.SWTracingHttpClient; import com.ai.cloud.skywalking.plugin.spring.Tracing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -8,7 +9,6 @@ import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; import java.io.BufferedReader; @@ -24,17 +24,14 @@ public class HttpClientUtil { private static final Log logger = LogFactory.getLog(HttpClientUtil.class); @Tracing - public static String sendPostRequest(String url, Map parametersMap, Map - headerParameter) throws IOException, URISyntaxException { - HttpClient httpclient = new DefaultHttpClient(); + public static String sendPostRequest(String url, Map parametersMap) throws IOException, URISyntaxException { + HttpClient httpclient = new SWTracingHttpClient(); HttpPost httpPost = new HttpPost(new URL(url).toURI()); List formparams = new ArrayList(); for (Map.Entry entry : parametersMap.entrySet()) { formparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); } - for (Map.Entry entry : headerParameter.entrySet()) { - httpPost.setHeader(entry.getKey(), entry.getValue()); - } + httpPost.setEntity(new UrlEncodedFormEntity(formparams, "UTF-8")); HttpResponse response = httpclient.execute(httpPost); if (response.getStatusLine().getStatusCode() == 200) {