From 919a519b328834f2f62f64bb0fa863514cc7d3c9 Mon Sep 17 00:00:00 2001 From: Jim McDonald Date: Sun, 18 Jul 2021 07:46:01 +0100 Subject: [PATCH] Linting. Fix lint warnings given by revive (successor to golint). --- services/metrics/prometheus/accountmanager.go | 6 +----- services/metrics/prometheus/attestation.go | 6 +----- services/metrics/prometheus/attestationaggregation.go | 6 +----- services/metrics/prometheus/beaconblockproposal.go | 6 +----- services/metrics/prometheus/beaconcommitteesubscription.go | 6 +----- services/metrics/prometheus/client.go | 6 +----- services/metrics/prometheus/controller.go | 6 +----- services/metrics/prometheus/scheduler.go | 6 +----- testing/resources/certs.go | 6 +----- 9 files changed, 9 insertions(+), 45 deletions(-) diff --git a/services/metrics/prometheus/accountmanager.go b/services/metrics/prometheus/accountmanager.go index 6718e28..1791de8 100644 --- a/services/metrics/prometheus/accountmanager.go +++ b/services/metrics/prometheus/accountmanager.go @@ -24,11 +24,7 @@ func (s *Service) setupAccountManagerMetrics() error { Name: "accounts_total", Help: "The number of accounts managed by Vouch.", }, []string{"state"}) - if err := prometheus.Register(s.accountManagerAccounts); err != nil { - return err - } - - return nil + return prometheus.Register(s.accountManagerAccounts) } // Accounts sets the number of accounts in a given state. diff --git a/services/metrics/prometheus/attestation.go b/services/metrics/prometheus/attestation.go index f315ce6..0e0a023 100644 --- a/services/metrics/prometheus/attestation.go +++ b/services/metrics/prometheus/attestation.go @@ -41,11 +41,7 @@ func (s *Service) setupAttestationMetrics() error { Name: "requests_total", Help: "The number of attestation processes.", }, []string{"result"}) - if err := prometheus.Register(s.attestationProcessRequests); err != nil { - return err - } - - return nil + return prometheus.Register(s.attestationProcessRequests) } // AttestationsCompleted is called when an attestation process has completed. diff --git a/services/metrics/prometheus/attestationaggregation.go b/services/metrics/prometheus/attestationaggregation.go index 37d4ba6..937068e 100644 --- a/services/metrics/prometheus/attestationaggregation.go +++ b/services/metrics/prometheus/attestationaggregation.go @@ -53,11 +53,7 @@ func (s *Service) setupAttestationAggregationMetrics() error { Help: "The ratio of included to possible attestations in the aggregate.", Buckets: []float64{0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0}, }) - if err := prometheus.Register(s.attestationAggregationCoverageRatio); err != nil { - return err - } - - return nil + return prometheus.Register(s.attestationAggregationCoverageRatio) } // AttestationAggregationCompleted is called when an attestation aggregationprocess has completed. diff --git a/services/metrics/prometheus/beaconblockproposal.go b/services/metrics/prometheus/beaconblockproposal.go index e8ea216..1c48330 100644 --- a/services/metrics/prometheus/beaconblockproposal.go +++ b/services/metrics/prometheus/beaconblockproposal.go @@ -41,11 +41,7 @@ func (s *Service) setupBeaconBlockProposalMetrics() error { Name: "requests_total", Help: "The number of beacon block proposal processes.", }, []string{"result"}) - if err := prometheus.Register(s.beaconBlockProposalProcessRequests); err != nil { - return err - } - - return nil + return prometheus.Register(s.beaconBlockProposalProcessRequests) } // BeaconBlockProposalCompleted is called when a block proposal process has completed. diff --git a/services/metrics/prometheus/beaconcommitteesubscription.go b/services/metrics/prometheus/beaconcommitteesubscription.go index 2b084d7..aa93e48 100644 --- a/services/metrics/prometheus/beaconcommitteesubscription.go +++ b/services/metrics/prometheus/beaconcommitteesubscription.go @@ -61,11 +61,7 @@ func (s *Service) setupBeaconCommitteeSubscriptionMetrics() error { Name: "aggregators_total", Help: "The number of beacon committee aggregated.", }) - if err := prometheus.Register(s.beaconCommitteeAggregators); err != nil { - return err - } - - return nil + return prometheus.Register(s.beaconCommitteeAggregators) } // BeaconCommitteeSubscriptionCompleted is called when an beacon committee subscription process has completed. diff --git a/services/metrics/prometheus/client.go b/services/metrics/prometheus/client.go index 726edd2..4350db8 100644 --- a/services/metrics/prometheus/client.go +++ b/services/metrics/prometheus/client.go @@ -64,11 +64,7 @@ func (s *Service) setupClientMetrics() error { 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, }, }, []string{"strategy", "provider", "operation"}) - if err := prometheus.Register(s.strategyOperationTimer); err != nil { - return err - } - - return nil + return prometheus.Register(s.strategyOperationTimer) } // ClientOperation registers an operation. diff --git a/services/metrics/prometheus/controller.go b/services/metrics/prometheus/controller.go index 85f2321..77516c8 100644 --- a/services/metrics/prometheus/controller.go +++ b/services/metrics/prometheus/controller.go @@ -50,11 +50,7 @@ func (s *Service) setupControllerMetrics() error { 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, }, }, []string{"epoch_slot"}) - if err := prometheus.Register(s.blockReceiptDelay); err != nil { - return err - } - - return nil + return prometheus.Register(s.blockReceiptDelay) } // NewEpoch is called when vouch starts processing a new epoch. diff --git a/services/metrics/prometheus/scheduler.go b/services/metrics/prometheus/scheduler.go index 4177b42..28434d8 100644 --- a/services/metrics/prometheus/scheduler.go +++ b/services/metrics/prometheus/scheduler.go @@ -44,11 +44,7 @@ func (s *Service) setupSchedulerMetrics() error { Name: "jobs_started_total", Help: "The total number of scheduled jobs started.", }, []string{"trigger"}) - if err := prometheus.Register(s.schedulerJobsStarted); err != nil { - return err - } - - return nil + return prometheus.Register(s.schedulerJobsStarted) } // JobScheduled is called when a job is scheduled. diff --git a/testing/resources/certs.go b/testing/resources/certs.go index d566a72..13ce524 100644 --- a/testing/resources/certs.go +++ b/testing/resources/certs.go @@ -574,9 +574,5 @@ func SetupCerts(base string) error { if err := ioutil.WriteFile(filepath.Join(base, "client-test03.crt"), []byte(ClientTest03Crt), 0600); err != nil { return err } - if err := ioutil.WriteFile(filepath.Join(base, "client-test03.key"), []byte(ClientTest03Key), 0600); err != nil { - return err - } - - return nil + return ioutil.WriteFile(filepath.Join(base, "client-test03.key"), []byte(ClientTest03Key), 0600) }