Handle a bunch of unhandled errors

Author: knopers8

apricot/local/local_test.go

@@ -31,11 +31,21 @@ var _ = BeforeSuite(func() {
 	for _, configFile := range configFiles {
 		from, err := os.Open("./" + configFile)
 		Expect(err).NotTo(HaveOccurred())
-		defer from.Close()
+		defer func() {
+			err := from.Close()
+			if err != nil {
+				Expect(err).NotTo(HaveOccurred())
+			}
+		}()
 
 		to, err := os.OpenFile(*tmpDir+"/"+configFile, os.O_RDWR|os.O_CREATE, 0666)
 		Expect(err).NotTo(HaveOccurred())
-		defer to.Close()
+		defer func() {
+			err := to.Close()
+			if err != nil {
+				Expect(err).NotTo(HaveOccurred())
+			}
+		}()
 
 		_, err = io.Copy(to, from)
 		Expect(err).NotTo(HaveOccurred())
@@ -45,5 +55,6 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	os.RemoveAll(*tmpDir)
+	err := os.RemoveAll(*tmpDir)
+	Expect(err).NotTo(HaveOccurred())
 })

apricot/local/service.go

@@ -508,7 +508,10 @@ func (s *Service) GetCRUCardsForHost(hostname string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	json.Unmarshal([]byte(cfgCards), &cards)
+	err = json.Unmarshal([]byte(cfgCards), &cards)
+	if err != nil {
+		return nil, err
+	}
 	unique := make(map[string]bool)
 	for _, card := range cards {
 		if _, value := unique[card.Serial]; !value {

apricot/local/service_test.go

@@ -461,6 +461,12 @@ var _ = Describe("local service", func() {
 					Expect(err).To(HaveOccurred())
 				})
 			})
+			When("retrieving the CRU cards for an FLP with invalid \"cards\" JSON", func() {
+				It("should produce an error", func() {
+					cards, err = svc.GetCRUCardsForHost("flp500")
+					Expect(err).To(HaveOccurred())
+				})
+			})
 		})
 		Describe("getting endpoints for a CRU card", func() {
 			var (

apricot/local/service_test.yaml

@@ -192,4 +192,6 @@ o2:
       flp003:
         cards: "{ \"key\" : \"value\" }"
       flp100:
-        cards: "{ \"key\" : \"value\" }"
+        cards: "{ \"key\" : \"value\" }"
+      flp500:
+        cards: "invalid json{"

apricot/local/servicehttp.go

@@ -615,21 +615,33 @@ func (httpsvc *HttpService) ApiPrintClusterInformation(w http.ResponseWriter, r
 				log.WithError(err).Warn("Error, could not marshal inventory.")
 			}
 		}
-		fmt.Fprintln(w, string(result))
+		_, err = fmt.Fprintln(w, string(result))
+		if err != nil {
+			log.WithError(err).Warn("Error, could not write response.")
+		}
 	case "text":
 		fallthrough
 	default:
 		w.Header().Set("Content-Type", "text/plain")
 		w.WriteHeader(http.StatusOK)
 		if hosts != nil {
 			for _, hostname := range hosts {
-				fmt.Fprintf(w, "%s\n", hostname)
+				_, err := fmt.Fprintf(w, "%s\n", hostname)
+				if err != nil {
+					log.WithError(err).Warn("Error, could not write response.")
+				}
 			}
 		} else if inventory != nil {
 			for detector, flps := range inventory {
-				fmt.Fprintf(w, "%s\n", detector)
+				_, err := fmt.Fprintf(w, "%s\n", detector)
+				if err != nil {
+					log.WithError(err).Warn("Error, could not write response.")
+				}
 				for _, hostname := range flps {
-					fmt.Fprintf(w, "\t%s\n", hostname)
+					_, err = fmt.Fprintf(w, "\t%s\n", hostname)
+					if err != nil {
+						log.WithError(err).Warn("Error, could not write response.")
+					}
 				}
 			}
 		}

common/event/writer.go

@@ -133,7 +133,11 @@ func (w *KafkaWriter) Close() {
 		w.runningWorkers.Add(2)
 		close(w.toBatchMessagesChan)
 		w.runningWorkers.Wait()
-		w.Writer.Close()
+		err := w.Writer.Close()
+		if err != nil {
+			log.WithField(infologger.Level, infologger.IL_Devel).
+				Errorf("failed to close writer: %v", err)
+		}
 	}
 }
 

common/event/writer_test.go

@@ -49,7 +49,8 @@ var _ = Describe("Writer", func() {
 			writer.writeFunction = func(messages []kafka.Message) {
 				Expect(len(messages)).To(Equal(1))
 				event := &pb.Event{}
-				proto.Unmarshal(messages[0].Value, event)
+				err := proto.Unmarshal(messages[0].Value, event)
+				Expect(err).To(BeNil())
 				Expect(event.GetCoreStartEvent().FrameworkId).To(Equal("FrameworkId"))
 				channel <- struct{}{}
 			}

common/monitoring/common.go

@@ -35,11 +35,11 @@ type key struct {
 }
 
 func metricNameTagsToHash(hash *maphash.Hash, metric *Metric) {
-	hash.WriteString(metric.name)
+	_, _ = hash.WriteString(metric.name)
 
 	for _, tag := range metric.tags {
-		hash.WriteString(tag.name)
-		hash.WriteString(tag.value)
+		_, _ = hash.WriteString(tag.name)
+		_, _ = hash.WriteString(tag.value)
 	}
 }
 

common/monitoring/metricsreservoirsampling.go

@@ -66,7 +66,7 @@ func metricFieldToFloat64(field any) float64 {
 func (this *MetricsReservoirSampling) AddMetric(metric *Metric) {
 	for fieldName, field := range metric.fields {
 		metricNameTagsToHash(&this.hash, metric)
-		this.hash.WriteString(fieldName)
+		_, _ = this.hash.WriteString(fieldName)
 		k := key{nameTagsHash: hashValueAndReset(&this.hash), timestamp: time.Unix(metric.timestamp.Unix(), 0)}
 		if storedMetric, ok := this.metricsBuckets[k]; !ok {
 			newReservoir := newReservoirSampling(fieldName, reservoirSize)

common/monitoring/monitoring.go

@@ -120,7 +120,10 @@ func exportMetricsAndReset(w http.ResponseWriter, r *http.Request) {
 	if metricsToConvert == nil {
 		metricsToConvert = make([]Metric, 0)
 	}
-	Format(w, metricsToConvert)
+	err := Format(w, metricsToConvert)
+	if err != nil {
+		log.WithField(infologger.Level, infologger.IL_Devel).Errorf("Failed to export metrics: %v", err)
+	}
 }
 
 func Send(metric *Metric) {