mirror of
https://github.com/jimeh/macos-battery-exporter.git
synced 2026-02-19 01:16:40 +00:00
feat(go): rename prom package to suitable prombat
This commit is contained in:
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@@ -16,6 +16,7 @@ jobs:
|
||||
- name: Print version
|
||||
run: |
|
||||
./bin/macos-battery-exporter -v
|
||||
./bin/macos-battery-exporter
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
|
||||
10
main.go
10
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
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//go:build darwin
|
||||
|
||||
package prom
|
||||
package prombat
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user