diff options
| -rw-r--r-- | cmd/gitaly-blackbox/main.go | 2 | ||||
| -rw-r--r-- | internal/blackbox/blackbox.go | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cmd/gitaly-blackbox/main.go b/cmd/gitaly-blackbox/main.go index d9d604e0b..a0a520af3 100644 --- a/cmd/gitaly-blackbox/main.go +++ b/cmd/gitaly-blackbox/main.go @@ -46,7 +46,7 @@ func main() { os.Exit(1) } - bb := blackbox.New(cfg) + bb := blackbox.New(cfg, logger) prometheus.MustRegister(bb) if err := bb.Run(); err != nil { diff --git a/internal/blackbox/blackbox.go b/internal/blackbox/blackbox.go index 05059f2e9..35b63b2af 100644 --- a/internal/blackbox/blackbox.go +++ b/internal/blackbox/blackbox.go @@ -9,9 +9,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" "gitlab.com/gitlab-org/labkit/monitoring" ) @@ -74,7 +74,8 @@ func (m httpPostMetrics) Collect(metrics chan<- prometheus.Metric) { // Blackbox encapsulates all details required to run the blackbox prober. type Blackbox struct { - cfg Config + cfg Config + logger logrus.FieldLogger fetchReferenceDiscoveryMetrics httpReferenceDiscoveryMetrics httpPostMetrics httpPostMetrics @@ -82,9 +83,10 @@ type Blackbox struct { } // New creates a new Blackbox structure. -func New(cfg Config) Blackbox { +func New(cfg Config, logger logrus.FieldLogger) Blackbox { return Blackbox{ - cfg: cfg, + cfg: cfg, + logger: logger, fetchReferenceDiscoveryMetrics: httpReferenceDiscoveryMetrics{ firstPacket: newGauge("get_first_packet_seconds", "Time to first Git packet in GET /info/refs response"), totalTime: newGauge("get_total_time_seconds", "Time to receive entire GET /info/refs response"), @@ -140,7 +142,7 @@ func (b Blackbox) Run() error { func (b Blackbox) runProbes() { for ; ; time.Sleep(b.cfg.sleepDuration.Duration()) { for _, probe := range b.cfg.Probes { - entry := log.Default().WithFields(map[string]interface{}{ + entry := b.logger.WithFields(map[string]interface{}{ "probe": probe.Name, "type": probe.Type, }) |