add application name for serive monitor list

chengjoey · Mar 13, 2024 · 4e559d1 · 4e559d1
1 parent 8c3aef9
commit 4e559d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/api/proto/msp/apm/service/service.proto b/api/proto/msp/apm/service/service.proto
@@ -162,6 +162,7 @@ message Service {
   erda.common.Language language        = 3;
   string               lastHeartbeat   = 4;
   AggregateMetric      aggregateMetric = 5;
+  string               appName         = 6;
 }
 
 message AggregateMetric {

diff --git a/internal/apps/msp/apm/service/apm.service.service.go b/internal/apps/msp/apm/service/apm.service.service.go
@@ -99,7 +99,7 @@ func (s *apmServiceService) GetServices(ctx context.Context, req *pb.GetServices
 	start, end := TimeRange("-24h")
 
 	// get services list
-	statement := fmt.Sprintf("SELECT service_id::tag,service_name::tag,service_agent_platform::tag,max(timestamp) FROM application_service_node "+
+	statement := fmt.Sprintf("SELECT service_id::tag,service_name::tag,service_agent_platform::tag,max(timestamp),application_name::tag FROM application_service_node "+
 		"WHERE $condition GROUP BY service_id::tag ORDER BY max(timestamp) DESC LIMIT %v OFFSET %v", req.PageSize, (req.PageNo-1)*req.PageSize)
 	condition := " terminus_key::tag=$terminus_key "
 	queryParams := map[string]*structpb.Value{
@@ -143,6 +143,7 @@ func (s *apmServiceService) GetServices(ctx context.Context, req *pb.GetServices
 		service.Name = row.Values[1].GetStringValue()
 		service.Language = parseLanguage(row.Values[2].GetStringValue())
 		service.LastHeartbeat = time.Unix(0, int64(row.Values[3].GetNumberValue())).Format("2006-01-02 15:04:05")
+		service.AppName = row.Values[4].GetStringValue()
 		service.AggregateMetric = &pb.AggregateMetric{}
 		services = append(services, service)
 	}

diff --git a/internal/apps/msp/apm/service/apm.service.service_test.go b/internal/apps/msp/apm/service/apm.service.service_test.go
@@ -110,6 +110,7 @@ func Test_apmServiceService_GetServices(t *testing.T) {
 											{Kind: &structpb.Value_StringValue{StringValue: "test-service-name"}},
 											{Kind: &structpb.Value_StringValue{StringValue: "jdk 1.2.3"}},
 											{Kind: &structpb.Value_NumberValue{NumberValue: 1638770074000}},
+											{Kind: &structpb.Value_StringValue{StringValue: "erda"}},
 										},
 									},
 									{
@@ -118,6 +119,7 @@ func Test_apmServiceService_GetServices(t *testing.T) {
 											{Kind: &structpb.Value_StringValue{StringValue: "test-service-name2"}},
 											{Kind: &structpb.Value_StringValue{StringValue: "py 1.2.3"}},
 											{Kind: &structpb.Value_NumberValue{NumberValue: 1638770074000}},
+											{Kind: &structpb.Value_StringValue{StringValue: "erda"}},
 										},
 									},
 									{
@@ -126,6 +128,7 @@ func Test_apmServiceService_GetServices(t *testing.T) {
 											{Kind: &structpb.Value_StringValue{StringValue: "test-service-name3"}},
 											{Kind: &structpb.Value_StringValue{StringValue: "golang 1.2.3"}},
 											{Kind: &structpb.Value_NumberValue{NumberValue: 1638770074000}},
+											{Kind: &structpb.Value_StringValue{StringValue: "erda"}},
 										},
 									},
 									{
@@ -134,6 +137,7 @@ func Test_apmServiceService_GetServices(t *testing.T) {
 											{Kind: &structpb.Value_StringValue{StringValue: "test-service-name4"}},
 											{Kind: &structpb.Value_StringValue{StringValue: "nodejs 1.2.3"}},
 											{Kind: &structpb.Value_NumberValue{NumberValue: 1638770074000}},
+											{Kind: &structpb.Value_StringValue{StringValue: "erda"}},
 										},
 									},
 								}},