fix: the issue that the httpclient type fails to be built to match the key is fixed (#598)

* fix: uri append (#594)

* fix: uri append

* fix: uri append

* fix: the issue that the httpclient type fails to be built to match the key is fixed

---------

Co-authored-by: Nathan Mo <[email protected]>

Author: pangdayuan1

arex-instrumentation/httpclient/arex-httpclient-resttemplate/src/main/java/io/arex/inst/httpclient/resttemplate/RestTemplateExtractor.java

@@ -15,6 +15,7 @@
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RequestCallback;
@@ -108,7 +109,7 @@ private Mocker makeMocker() {
         Map<String, Object> attributes = new HashMap<>(2);
 
         mocker.getTargetRequest().setAttributes(attributes);
-        attributes.put(ArexConstants.HTTP_METHOD, httpMethod);
+        attributes.put(ArexConstants.HTTP_METHOD, Objects.isNull(httpMethod) ? null : httpMethod.name());
         attributes.put(ArexConstants.HTTP_QUERY_STRING, uri.getQuery());
 
         mocker.getTargetRequest().setBody(request);

arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletUtil.java

@@ -4,7 +4,6 @@
 import io.arex.agent.bootstrap.util.CollectionUtil;
 import io.arex.agent.bootstrap.util.StringUtil;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -20,22 +19,7 @@ private ServletUtil() {
     }
 
     public static String appendUri(String uri, String name, String value) {
-        try {
-            URI oldUri = URI.create(uri);
-            StringBuilder builder = new StringBuilder();
-            String newQuery = oldUri.getQuery();
-            if (oldUri.getQuery() == null) {
-                builder.append(name).append("=").append(value);
-            } else {
-                builder.append(newQuery).append("&").append(name).append("=").append(value);
-            }
-
-            URI newUri = new URI(oldUri.getScheme(), oldUri.getAuthority(),
-                oldUri.getPath(), builder.toString(), oldUri.getFragment());
-            return newUri.toString();
-        } catch (URISyntaxException e) {
-            return uri;
-        }
+        return UriComponentsBuilder.fromUriString(uri).queryParam(name, value).build().toString();
     }
 
     public static String getRequestPath(String uri) {

arex-instrumentation/servlet/arex-httpservlet/src/test/java/io/arex/inst/httpservlet/ServletUtilTest.java

@@ -22,6 +22,9 @@ void appendUri() {
 
         assertEquals("http://[email protected]&name=mark#fragment",
             ServletUtil.appendUri("http://[email protected]#fragment", "name", "mark"));
+
+        assertEquals("http://arextest.com?Signature=HJeNHsZ7%2BDMj0JsTK3zd3nzBDQE%3D&name=mark",
+            ServletUtil.appendUri("http://arextest.com?Signature=HJeNHsZ7%2BDMj0JsTK3zd3nzBDQE%3D", "name", "mark"));
     }
 
     @Test