瀏覽代碼

Fixed #TASK_QT-9810 修复connnection failed统计bug。

rock 1 年之前
父節點
當前提交
0da084bdc9
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 1 1
      containers/metrics.go
  2. 3 1
      containers/systemd.go

+ 1 - 1
containers/metrics.go

@@ -90,7 +90,7 @@ var metrics = struct {
 	NetListenInfo:            metric("process_net_tcp_listen_info", "Listen address of the process", "listen_addr", "proxy"),
 	NetConnectionsSuccessful: metric("process_net_tcp_successful_connects_total", "Total number of successful TCP connects", "instance_id","app_id","app_name","src", "destination", "actual_destination"),
 	NetConnectionsTotalTime:  metric("process_net_tcp_connection_time_seconds_total", "Time spent on TCP connections", "instance_id","app_id","app_name","src","destination", "actual_destination"),
-	NetConnectionsFailed:     metric("process_net_tcp_failed_connects_total", "Total number of failed TCP connects", "destination"),
+	NetConnectionsFailed:     metric("process_net_tcp_failed_connects_total", "Total number of failed TCP connects", "instance_id","app_id","app_name","destination"),
 	NetConnectionsActive:     metric("process_net_tcp_active_connections", "Number of active outbound connections used by the process", "destination", "actual_destination"),
 	NetRetransmits:           metric("process_net_tcp_retransmits_total", "Total number of retransmitted TCP segments", "instance_id","app_id","app_name","src","destination", "actual_destination"),
 	NetLatency:               metric("process_net_latency_seconds", "Round-trip time between the process and a remote IP", "destination_ip"),

+ 3 - 1
containers/systemd.go

@@ -29,7 +29,9 @@ func init() {
 		}
 		methods := []gdbus.Auth{gdbus.AuthExternal(strconv.Itoa(os.Getuid()))}
 		if err = c.Auth(methods); err != nil {
-			dbusConn.Close()
+			if dbusConn != nil { // 添加这个非空检查  
+				dbusConn.Close()  
+			}
 			return nil, err
 		}
 		return c, nil