Enhanced Metrics Fix (#29437)

shreyamalpani · web-flow · commit 0df804cd3c27 · 2024-09-19T16:46:25.000Z
diff --git a/pkg/serverless/metrics/enhanced_metrics.go b/pkg/serverless/metrics/enhanced_metrics.go
@@ -686,18 +686,18 @@ func SendProcessEnhancedMetrics(sendMetrics chan bool, tags []string, metricAgen
 			pids := proc.GetPidList(proc.ProcPath)
 
 			fdUseData, err := proc.GetFileDescriptorUseData(pids)
-			if err != nil {
-				log.Debugf("Could not emit file descriptor enhanced metrics. %v", err)
-				return
+			if err == nil {
+				fdUse = math.Max(fdUse, fdUseData.UseFileHandles)
+			} else {
+				log.Debugf("Could not update file descriptor use enhanced metric. %v", err)
 			}
-			fdUse = math.Max(fdUse, fdUseData.UseFileHandles)
 
 			threadsUseData, err := proc.GetThreadsUseData(pids)
-			if err != nil {
-				log.Debugf("Could not emit thread enhanced metric. %v", err)
-				return
+			if err == nil {
+				threadsUse = math.Max(threadsUse, threadsUseData.ThreadsUse)
+			} else {
+				log.Debugf("Could not update thread use enhanced metric. %v", err)
 			}
-			threadsUse = math.Max(threadsUse, threadsUseData.ThreadsUse)
 		}
 	}
 }
diff --git a/pkg/serverless/serverless.go b/pkg/serverless/serverless.go
@@ -161,8 +161,8 @@ func callInvocationHandler(daemon *daemon.Daemon, arn string, deadlineMs int64,
 	cpuOffsetData, cpuOffsetErr := proc.GetCPUData()
 	uptimeOffset, uptimeOffsetErr := proc.GetUptime()
 	networkOffsetData, networkOffsetErr := proc.GetNetworkData()
-	sendFdMetrics := make(chan bool)
-	go metrics.SendProcessEnhancedMetrics(sendFdMetrics, daemon.ExtraTags.Tags, daemon.MetricAgent)
+	sendProcessMetrics := make(chan bool)
+	go metrics.SendProcessEnhancedMetrics(sendProcessMetrics, daemon.ExtraTags.Tags, daemon.MetricAgent)
 	sendTmpMetrics := make(chan bool)
 	go metrics.SendTmpEnhancedMetrics(sendTmpMetrics, daemon.ExtraTags.Tags, daemon.MetricAgent)
 
@@ -181,17 +181,17 @@ func callInvocationHandler(daemon *daemon.Daemon, arn string, deadlineMs int64,
 	case <-doneChannel:
 		break
 	}
-	sendSystemEnhancedMetrics(daemon, cpuOffsetErr == nil && uptimeOffsetErr == nil, networkOffsetErr == nil, uptimeOffset, cpuOffsetData, networkOffsetData, sendTmpMetrics, sendFdMetrics)
+	sendSystemEnhancedMetrics(daemon, cpuOffsetErr == nil && uptimeOffsetErr == nil, networkOffsetErr == nil, uptimeOffset, cpuOffsetData, networkOffsetData, sendTmpMetrics, sendProcessMetrics)
 }
 
-func sendSystemEnhancedMetrics(daemon *daemon.Daemon, emitCPUMetrics, emitNetworkMetrics bool, uptimeOffset float64, cpuOffsetData *proc.CPUData, networkOffsetData *proc.NetworkData, sendTmpMetrics chan bool, sendFdMetrics chan bool) {
+func sendSystemEnhancedMetrics(daemon *daemon.Daemon, emitCPUMetrics, emitNetworkMetrics bool, uptimeOffset float64, cpuOffsetData *proc.CPUData, networkOffsetData *proc.NetworkData, sendTmpMetrics chan bool, sendProcessMetrics chan bool) {
 	if daemon.MetricAgent == nil {
 		log.Debug("Could not send system enhanced metrics")
 		return
 	}
 
 	close(sendTmpMetrics)
-	close(sendFdMetrics)
+	close(sendProcessMetrics)
 
 	if emitCPUMetrics {
 		metrics.SendCPUEnhancedMetrics(cpuOffsetData, uptimeOffset, daemon.ExtraTags.Tags, daemon.MetricAgent.Demux)

Original file line number	Diff line number	Diff line change
`@@ -686,18 +686,18 @@ func SendProcessEnhancedMetrics(sendMetrics chan bool, tags []string, metricAgen`
`686`	`686`	`pids := proc.GetPidList(proc.ProcPath)`
`687`	`687`
`688`	`688`	`fdUseData, err := proc.GetFileDescriptorUseData(pids)`
`689`		`- if err != nil {`
`690`		`- log.Debugf("Could not emit file descriptor enhanced metrics. %v", err)`
`691`		`- return`
	`689`	`+ if err == nil {`
	`690`	`+ fdUse = math.Max(fdUse, fdUseData.UseFileHandles)`
	`691`	`+ } else {`
	`692`	`+ log.Debugf("Could not update file descriptor use enhanced metric. %v", err)`
`692`	`693`	`}`
`693`		`- fdUse = math.Max(fdUse, fdUseData.UseFileHandles)`
`694`	`694`
`695`	`695`	`threadsUseData, err := proc.GetThreadsUseData(pids)`
`696`		`- if err != nil {`
`697`		`- log.Debugf("Could not emit thread enhanced metric. %v", err)`
`698`		`- return`
	`696`	`+ if err == nil {`
	`697`	`+ threadsUse = math.Max(threadsUse, threadsUseData.ThreadsUse)`
	`698`	`+ } else {`
	`699`	`+ log.Debugf("Could not update thread use enhanced metric. %v", err)`
`699`	`700`	`}`
`700`		`- threadsUse = math.Max(threadsUse, threadsUseData.ThreadsUse)`
`701`	`701`	`}`
`702`	`702`	`}`
`703`	`703`	`}`