Merge branch 'main' into remove-trailing-space-labels

CHANGELOG.md

@@ -6,6 +6,12 @@ log is based on the [Keep a CHANGELOG](http://keepachangelog.com/) project.
 
 ## Unreleased
 
+## Fixed
+
+- nil pointer dereference during a scrape [#97](https://github.com/Comcast/fishymetrics/issues/97)
+
+## [0.12.0]
+
 ## Added
 
 - Add ability to reference different vault paths for credential retrieval [#25](https://github.com/Comcast/fishymetrics/issues/25)

README.md

@@ -9,7 +9,7 @@ This app can support any chassis that has the redfish API available. If one need
 
 To run it:
 
-```
+```console
 $ ./fishymetrics --help
 usage: fishymetrics [<flags>]
 
@@ -209,13 +209,13 @@ make build
 
 #### docker image
 
-```
+```bash
 make docker
 ```
 
 ### Testing
 
-```
+```bash
 make test
 ```
 

common/util.go

@@ -56,6 +56,9 @@ func Fetch(uri, host, profile string, client *retryablehttp.Client) func() ([]by
 				for retryCount < 3 && resp.StatusCode == http.StatusNotFound {
 					time.Sleep(client.RetryWaitMin)
 					resp, err = DoRequest(client, req)
+					if err != nil {
+						return nil, err
+					}
 					retryCount = retryCount + 1
 				}
 				if err != nil {

exporter/moonshot/exporter.go

@@ -212,6 +212,9 @@ func fetch(uri, device, metricType, host, profile string, client *retryablehttp.
 				for retryCount < 3 && resp.StatusCode == http.StatusNotFound {
 					time.Sleep(client.RetryWaitMin)
 					resp, err = common.DoRequest(client, req)
+					if err != nil {
+						return nil, device, metricType, err
+					}
 					retryCount = retryCount + 1
 				}
 				if err != nil {