Remove conditional error handling in profilers

Signed-off-by: Daniel Hodges <[email protected]>
hodgesds · Oct 31, 2021 · 67e329d · 67e329d
1 parent 278b807
commit 67e329d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/cache_profiler.go b/cache_profiler.go
@@ -402,7 +402,7 @@ func (p *cacheProfiler) Profile(cacheProfile *CacheProfile) error {
 	cacheProfile.Reset()
 	p.profilersMu.RLock()
 	for profilerType, profiler := range p.profilers {
-		profileVal := profileValuePool.Get().(*ProfileValue)
+		profileVal := ProfileValuePool.Get().(*ProfileValue)
 		err2 := profiler.Profile(profileVal)
 		err = multierr.Append(err, err2)
 		if err2 == nil {
@@ -470,9 +470,5 @@ func (p *cacheProfiler) Profile(cacheProfile *CacheProfile) error {
 		}
 	}
 	p.profilersMu.RUnlock()
-	if len(multierr.Errors(err)) == len(p.profilers) {
-		return err
-	}
-
-	return nil
+	return err
 }
diff --git a/hardware_profiler.go b/hardware_profiler.go
@@ -204,7 +204,7 @@ func (p *hardwareProfiler) Profile(hwProfile *HardwareProfile) error {
 	hwProfile.Reset()
 	p.profilersMu.RLock()
 	for profilerType, profiler := range p.profilers {
-		profileVal := profileValuePool.Get().(*ProfileValue)
+		profileVal := ProfileValuePool.Get().(*ProfileValue)
 		err2 := profiler.Profile(profileVal)
 		err = multierr.Append(err, err2)
 		if err2 == nil {
@@ -238,10 +238,6 @@ func (p *hardwareProfiler) Profile(hwProfile *HardwareProfile) error {
 			}
 		}
 	}
-	if len(multierr.Errors(err)) == len(p.profilers) {
-		return err
-	}
 	p.profilersMu.RUnlock()
-
-	return nil
+	return err
 }
diff --git a/software_profiler.go b/software_profiler.go
@@ -183,7 +183,7 @@ func (p *softwareProfiler) Profile(swProfile *SoftwareProfile) error {
 	swProfile.Reset()
 	p.profilersMu.RLock()
 	for profilerType, profiler := range p.profilers {
-		profileVal := profileValuePool.Get().(*ProfileValue)
+		profileVal := ProfileValuePool.Get().(*ProfileValue)
 		err2 := profiler.Profile(profileVal)
 		err = multierr.Append(err, err2)
 		if err2 == nil {
@@ -217,9 +217,5 @@ func (p *softwareProfiler) Profile(swProfile *SoftwareProfile) error {
 		}
 	}
 	p.profilersMu.RUnlock()
-	if len(multierr.Errors(err)) == len(p.profilers) {
-		return err
-	}
-
 	return nil
 }