make a single timeout

signalfx · Sep 12, 2019 · 8fd2dc4 · 8fd2dc4
1 parent 0605521
commit 8fd2dc4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/metadata/hostmetadata/host.go b/metadata/hostmetadata/host.go
@@ -65,15 +65,15 @@ func GetCPU() (info *CPU, err error) {
 	var cpus []cpu.InfoStat
 
 	// On Windows this can sometimes take longer than the default timeout (3 seconds).
-	ctx, _ := context.WithTimeout(context.Background(), cpuTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), cpuTimeout)
+	defer cancel()
+
 	if cpus, err = cpuInfo(ctx); err != nil {
 		return info, err
 	}
 
 	info.HostPhysicalCPUs = len(cpus)
 
-	ctx, _ = context.WithTimeout(context.Background(), cpuTimeout)
-
 	// get logical cpu stats
 	if info.HostLogicalCPUs, err = cpuCounts(ctx, true); err != nil {
 		return info, err