From ed1c238c1e15d7768f61bf7723862a75038f9a50 Mon Sep 17 00:00:00 2001 From: Muhammad Talal Anwar Date: Tue, 14 Jan 2020 18:34:44 +0100 Subject: [PATCH] Rename package collectors -> collector --- Makefile | 2 +- {collectors => collector}/collector.go | 2 +- {collectors => collector}/dispersion.go | 2 +- {collectors => collector}/dispersion_test.go | 2 +- .../fixtures/dispersion_failed_collect.prom | 0 .../fixtures/dispersion_successful_collect.prom | 0 .../fixtures/recon_failed_collect.prom | 0 .../fixtures/recon_successful_metrics.prom | 0 {collectors => collector}/recon.go | 2 +- {collectors => collector}/recon_test.go | 2 +- main.go | 6 +++--- 11 files changed, 9 insertions(+), 9 deletions(-) rename {collectors => collector}/collector.go (98%) rename {collectors => collector}/dispersion.go (99%) rename {collectors => collector}/dispersion_test.go (98%) rename {collectors => collector}/fixtures/dispersion_failed_collect.prom (100%) rename {collectors => collector}/fixtures/dispersion_successful_collect.prom (100%) rename {collectors => collector}/fixtures/recon_failed_collect.prom (100%) rename {collectors => collector}/fixtures/recon_successful_metrics.prom (100%) rename {collectors => collector}/recon.go (99%) rename {collectors => collector}/recon_test.go (98%) diff --git a/Makefile b/Makefile index 6b7e866..e81278e 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ GO_ALLPKGS := $(shell go list $(GO_BUILDFLAGS) $(PKG)/...) # which packages to test with `go test`? GO_TESTPKGS := $(shell go list $(GO_BUILDFLAGS) -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' $(PKG)/...) # which packages to measure coverage for? -GO_COVERPKGS := $(shell go list $(GO_BUILDFLAGS) $(PKG) $(PKG)/collectors) +GO_COVERPKGS := $(shell go list $(GO_BUILDFLAGS) $(PKG) $(PKG)/collector) # output files from `go test` GO_COVERFILES := $(patsubst %,build/%.cover.out,$(subst /,_,$(GO_TESTPKGS))) diff --git a/collectors/collector.go b/collector/collector.go similarity index 98% rename from collectors/collector.go rename to collector/collector.go index 5b85015..cd22620 100644 --- a/collectors/collector.go +++ b/collector/collector.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package collectors +package collector import ( "strings" diff --git a/collectors/dispersion.go b/collector/dispersion.go similarity index 99% rename from collectors/dispersion.go rename to collector/dispersion.go index af2805d..efd03f4 100644 --- a/collectors/dispersion.go +++ b/collector/dispersion.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package collectors +package collector import ( "encoding/json" diff --git a/collectors/dispersion_test.go b/collector/dispersion_test.go similarity index 98% rename from collectors/dispersion_test.go rename to collector/dispersion_test.go index 960c892..efb55bf 100644 --- a/collectors/dispersion_test.go +++ b/collector/dispersion_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package collectors +package collector import ( "path/filepath" diff --git a/collectors/fixtures/dispersion_failed_collect.prom b/collector/fixtures/dispersion_failed_collect.prom similarity index 100% rename from collectors/fixtures/dispersion_failed_collect.prom rename to collector/fixtures/dispersion_failed_collect.prom diff --git a/collectors/fixtures/dispersion_successful_collect.prom b/collector/fixtures/dispersion_successful_collect.prom similarity index 100% rename from collectors/fixtures/dispersion_successful_collect.prom rename to collector/fixtures/dispersion_successful_collect.prom diff --git a/collectors/fixtures/recon_failed_collect.prom b/collector/fixtures/recon_failed_collect.prom similarity index 100% rename from collectors/fixtures/recon_failed_collect.prom rename to collector/fixtures/recon_failed_collect.prom diff --git a/collectors/fixtures/recon_successful_metrics.prom b/collector/fixtures/recon_successful_metrics.prom similarity index 100% rename from collectors/fixtures/recon_successful_metrics.prom rename to collector/fixtures/recon_successful_metrics.prom diff --git a/collectors/recon.go b/collector/recon.go similarity index 99% rename from collectors/recon.go rename to collector/recon.go index 707ed65..1d6976c 100644 --- a/collectors/recon.go +++ b/collector/recon.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package collectors +package collector import ( "bytes" diff --git a/collectors/recon_test.go b/collector/recon_test.go similarity index 98% rename from collectors/recon_test.go rename to collector/recon_test.go index cfbfdde..e99e8f4 100644 --- a/collectors/recon_test.go +++ b/collector/recon_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package collectors +package collector import ( "path/filepath" diff --git a/main.go b/main.go index 76c661a..b01649e 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sapcc/go-bits/httpee" "github.com/sapcc/go-bits/logg" - "github.com/sapcc/swift-health-exporter/collectors" + "github.com/sapcc/swift-health-exporter/collector" ) func main() { @@ -33,8 +33,8 @@ func main() { swiftDispersionReportPath := getExecutablePath("SWIFT_DISPERSION_REPORT_PATH", "swift-dispersion-report") swiftReconPath := getExecutablePath("SWIFT_RECON_PATH", "swift-recon") - prometheus.MustRegister(collectors.NewDispersionCollector(swiftDispersionReportPath)) - prometheus.MustRegister(collectors.NewReconCollector(swiftReconPath)) + prometheus.MustRegister(collector.NewDispersionCollector(swiftDispersionReportPath)) + prometheus.MustRegister(collector.NewReconCollector(swiftReconPath)) // this port has been allocated for Swift health exporter // See: https://github.com/prometheus/prometheus/wiki/Default-port-allocations