fix by comments

Signed-off-by: LiZhenCheng9527 <[email protected]>
kmesh-net · Sep 2, 2024 · 9eb6ad2 · 9eb6ad2
1 parent 72dfc95
commit 9eb6ad2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/pkg/controller/telemetry/metric.go b/pkg/controller/telemetry/metric.go
@@ -210,11 +210,8 @@ func (m *MetricController) Run(ctx context.Context, mapOfTcpInfo *ebpf.Map) {
 				return
 			default:
 				// Metrics updated every 3 seconds
-				time.Sleep(3 * time.Second)
+				time.Sleep(5 * time.Second)
 				m.updatePrometheusMetric()
-				if err != nil {
-					log.Errorf("update Kmesh metrics failed: %v\n", err)
-				}
 			}
 		}
 	}()
@@ -265,8 +262,10 @@ func (m *MetricController) Run(ctx context.Context, mapOfTcpInfo *ebpf.Map) {
 			if data.state == TCP_CLOSTED {
 				OutputAccesslog(data, accesslog)
 			}
-			m.buildWorkloadMetricsToPrometheus(data, workloadLabels)
-			m.buildServiceMetricsToPrometheus(data, serviceLabels)
+			m.mutex.RLock()
+			m.updateWorkloadMetricCache(data, workloadLabels)
+			m.updateServiceMetricCache(data, serviceLabels)
+			m.mutex.RUnlock()
 		}
 	}
 }
@@ -463,7 +462,7 @@ func buildPrincipal(workload *workloadapi.Workload) string {
 	return "-"
 }
 
-func (m *MetricController) buildWorkloadMetricsToPrometheus(data requestMetric, labels workloadMetricLabels) {
+func (m *MetricController) updateWorkloadMetricCache(data requestMetric, labels workloadMetricLabels) {
 	v, ok := m.workloadMetricCache[labels]
 	if ok {
 		if data.state == TCP_ESTABLISHED {
@@ -494,7 +493,7 @@ func (m *MetricController) buildWorkloadMetricsToPrometheus(data requestMetric,
 	}
 }
 
-func (m *MetricController) buildServiceMetricsToPrometheus(data requestMetric, labels serviceMetricLabels) {
+func (m *MetricController) updateServiceMetricCache(data requestMetric, labels serviceMetricLabels) {
 	v, ok := m.serviceMetricCache[labels]
 	if ok {
 		if data.state == TCP_ESTABLISHED {

diff --git a/pkg/controller/telemetry/metric_test.go b/pkg/controller/telemetry/metric_test.go
@@ -232,7 +232,7 @@ func TestBuildMetricsToPrometheus(t *testing.T) {
 				workloadMetricCache: map[workloadMetricLabels]workloadMetricInfo{},
 				serviceMetricCache:  map[serviceMetricLabels]serviceMetricInfo{},
 			}
-			m.buildWorkloadMetricsToPrometheus(tt.args.data, tt.args.labels)
+			m.updateWorkloadMetricCache(tt.args.data, tt.args.labels)
 			assert.Equal(t, m.workloadMetricCache[tt.args.labels].WorkloadConnClosed, tt.want[0])
 			assert.Equal(t, m.workloadMetricCache[tt.args.labels].WorkloadConnOpened, tt.want[1])
 			assert.Equal(t, m.workloadMetricCache[tt.args.labels].WorkloadConnReceivedBytes, tt.want[2])
@@ -301,7 +301,7 @@ func TestBuildServiceMetricsToPrometheus(t *testing.T) {
 				workloadMetricCache: map[workloadMetricLabels]workloadMetricInfo{},
 				serviceMetricCache:  map[serviceMetricLabels]serviceMetricInfo{},
 			}
-			m.buildServiceMetricsToPrometheus(tt.args.data, tt.args.labels)
+			m.updateServiceMetricCache(tt.args.data, tt.args.labels)
 			assert.Equal(t, m.serviceMetricCache[tt.args.labels].ServiceConnClosed, tt.want[0])
 			assert.Equal(t, m.serviceMetricCache[tt.args.labels].ServiceConnOpened, tt.want[1])
 			assert.Equal(t, m.serviceMetricCache[tt.args.labels].ServiceConnReceivedBytes, tt.want[2])