Merge branch 'master' into feature/new-id

apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java

@@ -20,7 +20,7 @@ import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
  */
 public class AbstractHttpClientInstrumentation extends HttpClientInstrumentation {
 
-    private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.AbstractHttpClient";
+    private static final String ENHANCE_CLASS = "org.apache.http.impl.client.AbstractHttpClient";
 
     @Override
     public ClassMatch enhanceClass() {

apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java

@@ -17,7 +17,7 @@ import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
  */
 public class InternalHttpClientInstrumentation extends HttpClientInstrumentation {
 
-    private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.InternalHttpClient";
+    private static final String ENHANCE_CLASS = "org.apache.http.impl.client.InternalHttpClient";
 
     @Override
     public ClassMatch enhanceClass() {

apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java

@@ -20,7 +20,7 @@ import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
  */
 public class MinimalHttpClientInstrumentation extends HttpClientInstrumentation {
 
-    private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.MinimalHttpClient";
+    private static final String ENHANCE_CLASS = "org.apache.http.impl.client.MinimalHttpClient";
 
     @Override
     public ClassMatch enhanceClass() {