fix: 修改 agent 指标名称

3 files changed, 35 insertions, 32 deletions

diff --git a/src/main/java/net/geedge/confagent/controller/CortexController.java b/src/main/java/net/geedge/confagent/controller/CortexController.java
index 8290996..cef02c0 100644
--- a/src/main/java/net/geedge/confagent/controller/CortexController.java
+++ b/src/main/java/net/geedge/confagent/controller/CortexController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlPath;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpConnection;
 import cn.hutool.log.Log;
 import io.micrometer.core.instrument.Metrics;
@@ -13,7 +14,6 @@ import net.geedge.confagent.util.ConfagentUtil;
 import net.geedge.confagent.util.R;
 import net.geedge.confagent.util.RCode;
 import net.geedge.confagent.util.Tool;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -22,11 +22,11 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.*;
 
@@ -218,7 +218,9 @@ public class CortexController extends BaseController{
 
             Tool.IoUtil.copy(connInputStream, resOutputStream);
             resOutputStream.flush();//flush 输出流
-            Metrics.counter("proxy.request.total",Tags.of("module", "cortex").and("target",host).and("path", url).and("status", String.valueOf(responseCode))).increment();
+            URL urlObject = URLUtil.toUrlForHttp(url);
+            String pathLabelValue = String.format("%s://%s%s", urlObject.getProtocol(), urlObject.getAuthority(), urlObject.getPath());
+            Metrics.counter("proxy.cortex.request.total", Tags.of("module", "cortex").and("target", host).and("path", pathLabelValue).and("status", String.valueOf(responseCode))).increment();
         } catch (Exception e) {
             try {
                 response.sendError(500, "request error");
diff --git a/src/main/java/net/geedge/confagent/controller/LokiController.java b/src/main/java/net/geedge/confagent/controller/LokiController.java
index bae7dc9..c1dd84b 100644
--- a/src/main/java/net/geedge/confagent/controller/LokiController.java
+++ b/src/main/java/net/geedge/confagent/controller/LokiController.java
@@ -1,30 +1,5 @@
 package net.geedge.confagent.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.nio.charset.Charset;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.ReflectUtil;
@@ -38,6 +13,25 @@ import net.geedge.confagent.util.ConfagentUtil;
 import net.geedge.confagent.util.R;
 import net.geedge.confagent.util.RCode;
 import net.geedge.confagent.util.Tool;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.nio.charset.Charset;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/loki")
@@ -172,7 +166,7 @@ public class LokiController extends BaseController {
 			LokiPushThread.addLogCache(httpEntity);
 			//响应 成功
 			response.setStatus(204);
-			Metrics.counter("proxy.request.total",Tags.of("module", "loki").and("path", lokiPath).and("status", String.valueOf(204))).increment();
+			Metrics.counter("proxy.loki.request.total", Tags.of("module", "loki").and("path", lokiPath).and("status", String.valueOf(204))).increment();
 			return;
 		}
 
@@ -233,7 +227,7 @@ public class LokiController extends BaseController {
 
 			Tool.IoUtil.copy(connInputStream, resOutputStream);
 			resOutputStream.flush();// flush 输出流
-			Metrics.counter("proxy.request.total",Tags.of("module", "loki").and("path", lokiPath).and("status", String.valueOf(responseCode))).increment();
+			Metrics.counter("proxy.loki.request.total", Tags.of("module", "loki").and("path", lokiPath).and("status", String.valueOf(responseCode))).increment();
 		} catch (Exception e) {
 			try {
 				response.sendError(500, "request error");
diff --git a/src/main/java/net/geedge/confagent/controller/PrometheusController.java b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
index 2a6a2e9..de92c3e 100644
--- a/src/main/java/net/geedge/confagent/controller/PrometheusController.java
+++ b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
@@ -3,6 +3,7 @@ package net.geedge.confagent.controller;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlPath;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpConnection;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
@@ -14,7 +15,6 @@ import net.geedge.confagent.util.ConfagentUtil;
 import net.geedge.confagent.util.R;
 import net.geedge.confagent.util.RCode;
 import net.geedge.confagent.util.Tool;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.*;
 
@@ -198,7 +199,13 @@ public class PrometheusController extends BaseController{
 
             Tool.IoUtil.copy(connInputStream, resOutputStream);
             resOutputStream.flush();//flush 输出流
-            Metrics.counter("proxy.request.total",Tags.of("module", "prometheus").and("target",host).and("path", url).and("status", String.valueOf(responseCode))).increment();
+            URL urlObject = URLUtil.toUrlForHttp(url);
+            String pathLabelValue = String.format("%s://%s%s", urlObject.getProtocol(), urlObject.getAuthority(), urlObject.getPath());
+            Metrics.counter("proxy.prometheus.request.total",Tags.of("module", "prometheus").and("target",host).and("path", pathLabelValue).and("status", String.valueOf(responseCode))).increment();
+            /*Counter.builder("proxy.request.total")
+                    .tags(Tags.of("module", "prometheus").and("target", host).and("path", pathLabelValue).and("status", String.valueOf(responseCode)))
+                    .register(Metrics.globalRegistry)
+                    .increment();*/
         } catch (Exception e) {
             try {
                 response.sendError(500, "request error");