diff --git a/go_exporter/deploy.yaml b/go_exporter/deploy.yaml index 57db275..4051dec 100644 --- a/go_exporter/deploy.yaml +++ b/go_exporter/deploy.yaml @@ -21,7 +21,7 @@ spec: spec: containers: - name: export - image: serviceplant/goexp:0.0.30 + image: serviceplant/goexp:0.0.31 ports: - containerPort: 9040 name: metrics diff --git a/go_exporter/main.go b/go_exporter/main.go index 1325827..b376f8f 100644 --- a/go_exporter/main.go +++ b/go_exporter/main.go @@ -37,6 +37,7 @@ func getMetrics(cephConn CephConnection) { result = append(result, x) } + metrics.total_rbd_requested_size_per_pool.Reset() for _,v := range result { if !v.hasRBD {continue} FillMetrics(v,metrics) diff --git a/go_exporter/metrics.go b/go_exporter/metrics.go index d8fb7f1..ab5c0e4 100644 --- a/go_exporter/metrics.go +++ b/go_exporter/metrics.go @@ -27,7 +27,6 @@ func InitMetrics() *Metrics { func FillMetrics(pool Pool,metrics *Metrics) { var totalSizePerPool uint64 = 0 - metrics.total_rbd_requested_size_per_pool.Reset() logger.Debugf("Processing pool %s",pool.Name) for _,v := range pool.RBDlist { diff --git a/go_exporter/rbd-exporter b/go_exporter/rbd-exporter index 835994c..5e942b0 100755 Binary files a/go_exporter/rbd-exporter and b/go_exporter/rbd-exporter differ diff --git a/testing/go.mod b/testing/go.mod new file mode 100644 index 0000000..f3d0661 --- /dev/null +++ b/testing/go.mod @@ -0,0 +1,3 @@ +module main.go + +go 1.25.5 diff --git a/testing/hello_test.go b/testing/hello_test.go new file mode 100644 index 0000000..c275fcf --- /dev/null +++ b/testing/hello_test.go @@ -0,0 +1,33 @@ +package main + +import "testing" + +func TestHello(t *testing.T) { + t.Run("Say hi to Utii",func(t *testing.T) { + got := Hello("Utii","") + want := "Hello Utii" + + assertCorrestMsg(t,got,want) + }) + + t.Run("say 'Hello world' when arg is empty",func(t *testing.T){ + got := Hello("","") + want := "Hello world" + + assertCorrestMsg(t,got,want) + }) + + t.Run("say 'Hello world' in Russian",func(t *testing.T){ + got := Hello("Utii","Russian") + want := "Привет Utii" + + assertCorrestMsg(t,got,want) + }) +} + +func assertCorrestMsg(t testing.TB,got, want string) { + t.Helper() + if got != want { + t.Errorf("got %q want %q",got,want) + } +} diff --git a/testing/main.go b/testing/main.go new file mode 100644 index 0000000..f6780ac --- /dev/null +++ b/testing/main.go @@ -0,0 +1,18 @@ +package main + +import "fmt" + +const Prefix = "Hello " + +func Hello(name,language string) string { + if name == "" { + name = "world" + } + if language == "Russian" { + return "Привет " + name + } + return Prefix + name +} +func main() { + fmt.Println(Hello("Utii","")) +}