[agent.java] Add Apache HttpClient 5 dependency and update HttpClient5 implementation

- Add httpclient5 dependency to pom.xml with version 5.2.1 (provided scope)
- Update HttpClient5 class to use HttpClient5 API methods (getUri instead of getURI)
- Update import statements to use org.apache.hc.client5 package

Author: gunlee01

scouter.agent.java/pom.xml

@@ -436,6 +436,12 @@
             <version>5.2.1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.netflix.ribbon</groupId>
             <artifactId>ribbon-loadbalancer</artifactId>

scouter.agent.java/src/main/java/scouter/xtra/httpclient/HttpClient5.java

@@ -16,17 +16,15 @@
  */
 package scouter.xtra.httpclient;
 
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.classic.methods.HttpPut;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpUriRequest;
 import scouter.agent.proxy.IHttpClient;
 
-import java.net.URISyntaxException;
-
 public class HttpClient5 implements IHttpClient {
 	public String getHost(Object o) {
 		try {
@@ -75,22 +73,23 @@ public int getResponseStatusCode(Object o) {
 	}
 
 	public String getURI(Object o) {
-		if (o instanceof HttpUriRequest) {
-			HttpUriRequest req = (HttpUriRequest) o;
-			return req.getURI().getPath();
-		} else if (o instanceof HttpGet) {
-			HttpGet req = (HttpGet) o;
-			return req.getURI().getPath();
-		} else if (o instanceof HttpPut) {
-			HttpPut req = (HttpPut) o;
-			return req.getURI().getPath();
-		} else if (o instanceof HttpRequest) {
-			HttpRequest req = (HttpRequest) o;
-			try {
+		try {
+			HttpUriRequest request;
+			if (o instanceof HttpUriRequest) {
+				HttpUriRequest req = (HttpUriRequest) o;
+				return req.getUri().getPath();
+			} else if (o instanceof HttpGet) {
+				HttpGet req = (HttpGet) o;
+				return req.getUri().getPath();
+			} else if (o instanceof HttpPut) {
+				HttpPut req = (HttpPut) o;
+				return req.getUri().getPath();
+			} else if (o instanceof HttpRequest) {
+				HttpRequest req = (HttpRequest) o;
 				return req.getUri().toString();
-			} catch (URISyntaxException e) {
-				return req.toString();
 			}
+		} catch (Exception e) {
+			return o.toString();
 		}
 		return o.toString();
 	}

scouter.common/src/main/java/scouter/util/StrMatch.java

@@ -144,7 +144,8 @@ public COMP getComp() {
 	}
 
 	public static void main(String[] args) {
-		StrMatch sc = new StrMatch("zepeto.core.api.*Controller.*");
-		System.out.println(sc.include("zepeto.core.api.sub.UserController.Hello.do()"));
+		StrMatch sc = new StrMatch("zepeto/core/api/*Controller$*");
+		System.out.println(sc.include("zepeto/core/api/sub/UserController$getOne$1"));
+		System.out.println(sc.include("zepeto/core/api/web/module/Refer$Sys"));
 	}
 }