Rename package collectors -> collector

sapcc · Jan 16, 2020 · 10e1e59 · 10e1e59
1 parent 3be1913
commit 10e1e59
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git 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 → collector/collector.go b/collectors/collector.go → 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 → collector/dispersion.go b/collectors/dispersion.go → 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 → collector/dispersion_test.go b/collectors/dispersion_test.go → 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/...s/fixtures/dispersion_failed_collect.prom → ...r/fixtures/dispersion_failed_collect.prom b/...s/fixtures/dispersion_failed_collect.prom → ...r/fixtures/dispersion_failed_collect.prom
diff --git a/...xtures/dispersion_successful_collect.prom → ...xtures/dispersion_successful_collect.prom b/...xtures/dispersion_successful_collect.prom → ...xtures/dispersion_successful_collect.prom
diff --git a/...ectors/fixtures/recon_failed_collect.prom → collector/fixtures/recon_failed_collect.prom b/...ectors/fixtures/recon_failed_collect.prom → collector/fixtures/recon_failed_collect.prom
diff --git a/...rs/fixtures/recon_successful_metrics.prom → ...or/fixtures/recon_successful_metrics.prom b/...rs/fixtures/recon_successful_metrics.prom → ...or/fixtures/recon_successful_metrics.prom
diff --git a/collectors/recon.go → collector/recon.go b/collectors/recon.go → 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 → collector/recon_test.go b/collectors/recon_test.go → 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
@@ -25,16 +25,16 @@ 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() {
 	logg.ShowDebug, _ = strconv.ParseBool(os.Getenv("DEBUG"))
 	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