-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
277 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net/http" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "ydbcp/internal/config" | ||
| "ydbcp/internal/util/xlog" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/client_golang/prometheus/promauto" | ||
| "github.com/prometheus/client_golang/prometheus/promhttp" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| type MetricsRegistry interface { | ||
| Factory() promauto.Factory | ||
| } | ||
|
|
||
| type MetricsRegistryImpl struct { | ||
| server *http.Server | ||
| reg *prometheus.Registry | ||
| cfg config.MetricsServerConfig | ||
| } | ||
|
|
||
| func (s *MetricsRegistryImpl) Factory() promauto.Factory { | ||
| return promauto.With(s.reg) | ||
| } | ||
|
|
||
| func NewMetricsRegistry(ctx context.Context, wg *sync.WaitGroup, cfg *config.MetricsServerConfig) *MetricsRegistryImpl { | ||
| s := &MetricsRegistryImpl{ | ||
| reg: prometheus.NewRegistry(), | ||
| cfg: *cfg, | ||
| } | ||
|
|
||
| mux := http.NewServeMux() | ||
| mux.Handle("/metrics", promhttp.HandlerFor(s.reg, promhttp.HandlerOpts{Registry: s.reg})) | ||
|
|
||
| s.server = &http.Server{ | ||
| Addr: fmt.Sprintf("%s:%d", s.cfg.BindAddress, s.cfg.BindPort), | ||
| Handler: mux, | ||
| ErrorLog: zap.NewStdLog(xlog.Logger(ctx)), | ||
| } | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| xlog.Info(ctx, "Starting metrics server", zap.String("address", s.server.Addr)) | ||
| var err error | ||
| if len(s.cfg.TLSCertificatePath) > 0 && len(s.cfg.TLSKeyPath) > 0 { | ||
| err = s.server.ListenAndServeTLS(s.cfg.TLSCertificatePath, s.cfg.TLSKeyPath) | ||
| } else { | ||
| err = s.server.ListenAndServe() | ||
| } | ||
| if err != nil && !errors.Is(err, http.ErrServerClosed) { | ||
| xlog.Fatal(ctx, "metrics server failed to serve ", zap.Error(err)) | ||
| } | ||
| xlog.Info(ctx, "metrics server stopped") | ||
| }() | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| <-ctx.Done() | ||
|
|
||
| shutdownCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second) | ||
| defer cancel() | ||
| if err := s.server.Shutdown(shutdownCtx); err != nil { | ||
| xlog.Error(ctx, "metrics server shutdown error", zap.Error(err)) | ||
| } | ||
| }() | ||
| return s | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/client_golang/prometheus/promauto" | ||
| ) | ||
|
|
||
| type MockMetricsRegistry struct { | ||
| reg *prometheus.Registry | ||
| } | ||
|
|
||
| func (s *MockMetricsRegistry) Factory() promauto.Factory { | ||
| return promauto.With(s.reg) | ||
| } | ||
|
|
||
| func NewMockMetricsRegistry() *MockMetricsRegistry { | ||
| return &MockMetricsRegistry{ | ||
| reg: prometheus.NewRegistry(), | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "io" | ||
| "net/http" | ||
| "strconv" | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "ydbcp/internal/config" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestMetricsCount(t *testing.T) { | ||
| var wg sync.WaitGroup | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
|
|
||
| cfg := &config.MetricsServerConfig{ | ||
| BindPort: 8080, | ||
| BindAddress: "127.0.0.1", | ||
| } | ||
| p := NewMetricsRegistry(ctx, &wg, cfg) | ||
|
|
||
| count := p.Factory().NewCounter(prometheus.CounterOpts{Name: "test_counter"}) | ||
| count.Add(123) | ||
|
|
||
| repeat := 10 | ||
| for { | ||
| res, err := http.Get("http://127.0.0.1:8080/metrics") | ||
| if err != nil { | ||
| if repeat > 0 { | ||
| repeat-- | ||
| time.Sleep(time.Duration(1) * time.Second) | ||
| continue | ||
| } | ||
| } | ||
| assert.NoError(t, err) | ||
|
|
||
| resBody, err := io.ReadAll(res.Body) | ||
| assert.NoError(t, err) | ||
|
|
||
| pattern := []byte("test_counter") | ||
| val := 0 | ||
| for _, line := range bytes.Split(resBody, []byte("\n")) { | ||
| if len(line) == 0 { | ||
| continue | ||
| } | ||
| if line[0] == byte('#') { | ||
| continue | ||
| } | ||
|
|
||
| i := bytes.Index(line, pattern) | ||
| if i < 0 { | ||
| continue | ||
| } | ||
| i += len(pattern) | ||
| val, _ = strconv.Atoi(string(line[i+1:])) | ||
| break | ||
| } | ||
|
|
||
| assert.Equal(t, val, 123) | ||
| break | ||
| } | ||
| cancel() | ||
| wg.Wait() | ||
| } |
Oops, something went wrong.