From 436e4a4b01d96654b7012f795f2d305ca4084681 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 16 Dec 2023 04:38:30 +0000
Subject: [PATCH] feat(go): rename prom package to suitable prombat

---
 .github/workflows/ci.yml       |  1 +
 main.go                        | 10 +++++-----
 {prom => prombat}/collector.go |  2 +-
 {prom => prombat}/server.go    | 10 ++--------
 4 files changed, 9 insertions(+), 14 deletions(-)
 rename {prom => prombat}/collector.go (99%)
 rename {prom => prombat}/server.go (93%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dea9024..b5265a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ jobs:
       - name: Print version
         run: |
           ./bin/macos-battery-exporter -v
+          ./bin/macos-battery-exporter
 
   lint:
     name: Lint
diff --git a/main.go b/main.go
index e7f0168..2cb462e 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/jimeh/macos-battery-exporter/prom"
+	"github.com/jimeh/macos-battery-exporter/prombat"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/expfmt"
 )
@@ -28,7 +28,7 @@ var (
 	)
 	portFlag      = flag.Int("p", 9108, "Port to run server on")
 	namespaceFlag = flag.String(
-		"n", prom.DefaultNamespace, "Namespace for metrics",
+		"n", prombat.DefaultNamespace, "Namespace for metrics",
 	)
 	logLevelFlag = flag.String("l", "info", "Log level")
 	versionFlag  = flag.Bool("v", false, "Print version and exit")
@@ -54,12 +54,12 @@ func mainE() error {
 	}
 
 	if *serverFlag {
-		opts := prom.ServerOptions{
+		opts := prombat.ServerOptions{
 			Bind: *bindFlag,
 			Port: *portFlag,
 		}
 
-		return prom.RunServer(
+		return prombat.RunServer(
 			*namespaceFlag,
 			prometheus.DefaultRegisterer.(*prometheus.Registry),
 			opts,
@@ -67,7 +67,7 @@ func mainE() error {
 	}
 
 	registry := prometheus.NewRegistry()
-	err = registry.Register(prom.NewCollector(*namespaceFlag))
+	err = registry.Register(prombat.NewCollector(*namespaceFlag))
 	if err != nil {
 		return err
 	}
diff --git a/prom/collector.go b/prombat/collector.go
similarity index 99%
rename from prom/collector.go
rename to prombat/collector.go
index 737631c..4df3024 100644
--- a/prom/collector.go
+++ b/prombat/collector.go
@@ -1,6 +1,6 @@
 //go:build darwin
 
-package prom
+package prombat
 
 import (
 	"log/slog"
diff --git a/prom/server.go b/prombat/server.go
similarity index 93%
rename from prom/server.go
rename to prombat/server.go
index 073b28b..58ec07e 100644
--- a/prom/server.go
+++ b/prombat/server.go
@@ -1,6 +1,6 @@
 //go:build darwin
 
-package prom
+package prombat
 
 import (
 	"fmt"
@@ -14,23 +14,17 @@ import (
 
 const DefaultNamespace = "macos"
 
-type Registry interface {
-	prometheus.Registerer
-	prometheus.Gatherer
-}
-
 type ServerOptions struct {
 	Bind         string
 	Port         int
 	ReadTimeout  time.Duration
 	WriteTimeout time.Duration
 	IdleTimeout  time.Duration
-	Logger       *slog.Logger
 }
 
 type Server struct {
 	*http.Server
-	registry Registry
+	registry *prometheus.Registry
 	mux      *http.ServeMux
 }