fix: address review comments

Signed-off-by: Ricky Moorhouse <[email protected]>

Author: rickymoorhouse

Dockerfile

@@ -4,14 +4,13 @@ WORKDIR /app/
 
 RUN dnf upgrade --assumeyes
 RUN dnf install -y curl jq tar --allowerasing
- 
+COPY . .
 # Set the Go version dynamically by fetching the latest version
-RUN GOVERSION=$(curl -s 'https://go.dev/dl/?mode=json' | jq -r '.[0].version' | sed 's/^go//') && \
+RUN GOVERSION=$(egrep "^toolchain " go.mod | awk -Fgo '{print $2}') && \
     echo "Installing Go version: $GOVERSION" && \
     curl -sSL "https://golang.org/dl/go$GOVERSION.linux-amd64.tar.gz" | tar -C /usr/local -xzf - && \
     ln -s /usr/local/go/bin/go /usr/bin/go
 
-COPY . .
 RUN go mod download 
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./out/trawler .

go.mod

@@ -2,7 +2,7 @@ module rickymoorhouse/exporter
 
 go 1.23.0
 
-toolchain go1.23.5
+toolchain go1.23.9
 
 require (
 	github.com/IBM/alchemy-logging/src/go v1.0.3

nets/consumption/consumption.go

@@ -45,7 +45,7 @@ var healthStatus = promauto.NewGaugeVec(
 
 func (a *Consumption) apiCallCount(analytics_url string) {
 	formFactor := os.Getenv(("formFactor"))
-	fmt.Println("Form factor is", formFactor)
+	log.Log(alog.DEBUG, "Form factor is", formFactor)
 	certPath := os.Getenv("ANALYTICS_CERTS")
 	timeframe := "timeframe=last1minute"
 	//url := fmt.Sprintf("%s/cloud/dashboards/status?%s", analytics_url, timeframe)
@@ -67,22 +67,22 @@ func (a *Consumption) apiCallCount(analytics_url string) {
 		log.Log(alog.DEBUG, "%v", total)
 		if total.Total > 0 {
 			if formFactor == "ibm-cloud" {
-				err := SendMetrics("success")
+				err := SendMetrics(True)
 				if err != nil {
-					fmt.Println("Error sending metrics:", err)
+					log.Log(alog.ERROR, "Error sending metrics:", err)
 				} else {
-					fmt.Println("Metrics sent successfully.")
+					log.Log(alog.INFO, "Metrics sent successfully.")
 				}
 
 			}
 			healthStatus.WithLabelValues("API Calls", a.Config.CrnMask).Set(float64(1))
 		} else {
 			if formFactor == "ibm-cloud" {
-				err := SendMetrics("failure")
+				err := SendMetrics(False)
 				if err != nil {
-					fmt.Println("Error sending metrics:", err)
+					log.Log(alog.ERROR, "Error sending metrics:", err)
 				} else {
-					fmt.Println("Metrics sent successfully.")
+					log.Log(alog.INFO, "Metrics sent successfully.")
 				}
 
 			}

nets/consumption/ibmcloud.go

@@ -79,13 +79,13 @@ func getIAMToken() (string, error) {
 	return iamResp.AccessToken, nil
 }
 
-func SendMetrics(state string) error {
+func SendMetrics(isSuccess bool) error {
 
 	status := 0
 	var alert *Alert
 	serviceOutput := "Lifecycle: API Call traffic detected."
 
-	if state == "failure" {
+	if !isSuccess {
 		status = 1
 		alert = &Alert{
 			Severity:          2,
@@ -121,7 +121,7 @@ func SendMetrics(state string) error {
 
 	jsonPayload, _ := json.Marshal(payload)
 	client := &http.Client{}
-	fmt.Println("Payload before sending to edb:", string(jsonPayload))
+	log.Log(alog.INFO, "Payload before sending to edb:", string(jsonPayload))
 
 	// Add query parameters
 	params := url.Values{}
@@ -147,7 +147,7 @@ func SendMetrics(state string) error {
 	defer resp.Body.Close()
 
 	body, _ := io.ReadAll(resp.Body)
-	fmt.Println("Response Status Code:", resp.StatusCode)
-	fmt.Println("Successfully sent payload to EDB:", string(body))
+	log.Log(alog.INFO, "Response Status Code:", resp.StatusCode)
+	log.Log(alog.INFO, "Successfully sent payload to EDB:", string(body))
 	return nil
 }