Merge pull request #814 from LiZhenCheng9527/fix-accesslog

Fix accesslog

Author: kmesh-bot

pkg/controller/telemetry/metric.go

@@ -250,7 +250,6 @@ func (m *MetricController) Run(ctx context.Context, mapOfTcpInfo *ebpf.Map) {
 
 			workloadLabels.reporter = "-"
 			serviceLabels.reporter = "-"
-			accesslog.direction = "-"
 			if data.direction == constants.INBOUND {
 				workloadLabels.reporter = "destination"
 				serviceLabels.reporter = "destination"
@@ -261,7 +260,7 @@ func (m *MetricController) Run(ctx context.Context, mapOfTcpInfo *ebpf.Map) {
 				serviceLabels.reporter = "source"
 				accesslog.direction = "OUTBOUND"
 			}
-			if data.state == TCP_CLOSTED {
+			if data.state == TCP_CLOSTED && accesslog.sourceWorkload != "-" {
 				OutputAccesslog(data, accesslog)
 			}
 			m.mutex.Lock()
@@ -350,6 +349,7 @@ func (m *MetricController) buildServiceMetric(data *requestMetric) (serviceMetri
 	trafficLabels.requestProtocol = "tcp"
 	trafficLabels.responseFlags = "-"
 	trafficLabels.connectionSecurityPolicy = "mutual_tls"
+
 	accesslog.destinationAddress = dstIp + ":" + fmt.Sprintf("%d", data.dstPort)
 	accesslog.sourceAddress = srcIp + ":" + fmt.Sprintf("%d", data.srcPort)
 
@@ -361,8 +361,7 @@ func (m *MetricController) getWorkloadByAddress(address []byte) (*workloadapi.Wo
 	networkAddr.Address, _ = netip.AddrFromSlice(address)
 	workload := m.workloadCache.GetWorkloadByAddr(networkAddr)
 	if workload == nil {
-		log.Debugf("cannot find workload %s", networkAddr.Address.String())
-		return nil, ""
+		return nil, networkAddr.Address.String()
 	}
 	return workload, networkAddr.Address.String()
 }
@@ -399,7 +398,16 @@ func buildWorkloadMetric(dstWorkload, srcWorkload *workloadapi.Workload) workloa
 
 func buildServiceMetric(dstWorkload, srcWorkload *workloadapi.Workload, dstPort uint16) (serviceMetricLabels, logInfo) {
 	trafficLabels := serviceMetricLabels{}
-	accesslog := logInfo{}
+	accesslog := logInfo{
+		direction:            "-",
+		sourceAddress:        "-",
+		sourceWorkload:       "-",
+		sourceNamespace:      "-",
+		destinationAddress:   "-",
+		destinationService:   "-",
+		destinationWorkload:  "-",
+		destinationNamespace: "-",
+	}
 
 	if dstWorkload != nil {
 		namespacedhost := ""
@@ -437,8 +445,12 @@ func buildServiceMetric(dstWorkload, srcWorkload *workloadapi.Workload, dstPort
 		trafficLabels.destinationPrincipal = buildPrincipal(dstWorkload)
 
 		accesslog.destinationWorkload = dstWorkload.Name
-		accesslog.destinationNamespace = svcNamespace
-		accesslog.destinationService = svcHost
+		if svcNamespace != "" {
+			accesslog.destinationNamespace = svcNamespace
+		}
+		if svcHost != "" {
+			accesslog.destinationService = svcHost
+		}
 	}
 
 	if srcWorkload != nil {

pkg/controller/telemetry/metric_test.go

@@ -584,10 +584,11 @@ func TestBuildServiceMetric(t *testing.T) {
 		data *requestMetric
 	}
 	tests := []struct {
-		name    string
-		args    args
-		want    serviceMetricLabels
-		wantErr bool
+		name        string
+		args        args
+		want        serviceMetricLabels
+		wantErr     bool
+		wantLogInfo logInfo
 	}{
 		{
 			name: "normal capability test",
@@ -596,6 +597,7 @@ func TestBuildServiceMetric(t *testing.T) {
 					src:           [4]uint32{521736970, 0, 0, 0},
 					dst:           [4]uint32{383822016, 0, 0, 0},
 					dstPort:       uint16(80),
+					srcPort:       uint16(8000),
 					direction:     uint32(2),
 					sentBytes:     uint32(156),
 					receivedBytes: uint32(1024),
@@ -626,6 +628,16 @@ func TestBuildServiceMetric(t *testing.T) {
 				connectionSecurityPolicy:     "mutual_tls",
 			},
 			wantErr: false,
+			wantLogInfo: logInfo{
+				direction:            "-",
+				sourceAddress:        "10.19.25.31:8000",
+				sourceWorkload:       "kmesh",
+				sourceNamespace:      "kmesh-system",
+				destinationAddress:   "192.168.224.22:80",
+				destinationService:   "kmesh.kmesh-system.svc.cluster.local",
+				destinationWorkload:  "kmesh",
+				destinationNamespace: "kmesh-system",
+			},
 		},
 	}
 	for _, tt := range tests {
@@ -635,8 +647,9 @@ func TestBuildServiceMetric(t *testing.T) {
 			}
 			m.workloadCache.AddOrUpdateWorkload(dstWorkload)
 			m.workloadCache.AddOrUpdateWorkload(srcWorkload)
-			got, _ := m.buildServiceMetric(tt.args.data)
+			got, accesslog := m.buildServiceMetric(tt.args.data)
 			assert.Equal(t, tt.want, got)
+			assert.Equal(t, tt.wantLogInfo, accesslog)
 		})
 	}
 }