Skip to content

Commit 8993c19

Browse files
mblaschkemblaschke
committed
improve logging
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 3ed5cc8 commit 8993c19

10 files changed

+26
-22
lines changed

‎collector_base.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (c *CollectorBase) collectionFinish() {
104104
c.LastScrapeDuration = &duration
105105

106106
if !c.isHidden {
107-
c.logger.WithField("duration", c.LastScrapeDuration).Infof("finished metrics collection (duration: %v)", c.LastScrapeDuration)
107+
c.logger.WithField("duration", c.LastScrapeDuration.Seconds()).Infof("finished metrics collection (duration: %v)", c.LastScrapeDuration)
108108
}
109109
}
110110

‎collector_general.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"context"
55
"github.com/PagerDuty/go-pagerduty"
6-
log "github.com/sirupsen/logrus"
76
"sync"
87
"time"
98
)
@@ -35,9 +34,9 @@ func (m *CollectorGeneral) Collect() {
3534
if r := recover(); r != nil {
3635
m.errorCounter++
3736

38-
log.Error(r)
37+
m.logger.Error(r)
3938
if m.errorCounter > CollectorErrorThreshold {
40-
panic("Error threshold reached, stopping exporter")
39+
m.logger.Panic("Error threshold reached, stopping exporter")
4140
}
4241
}
4342
}()

‎collector_processor_general.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"context"
5+
log "github.com/sirupsen/logrus"
56
)
67

78
type CollectorProcessorGeneralInterface interface {
@@ -28,3 +29,7 @@ func NewCollectorGeneral(name string, processor CollectorProcessorGeneralInterfa
2829

2930
return &collector
3031
}
32+
33+
func (c *CollectorProcessorGeneral) logger() *log.Entry {
34+
return c.CollectorReference.logger
35+
}

‎metrics_incident.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ func (m *MetricsCollectorIncident) Collect(ctx context.Context, callback chan<-
7878
incidentStatusMetricList := prometheusCommon.NewMetricsList()
7979

8080
for {
81-
m.CollectorReference.logger.Debugf("fetch incidents (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
81+
m.logger().Debugf("fetch incidents (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
8282

8383
list, err := PagerDutyClient.ListIncidents(listOpts)
8484
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListIncidents").Inc()
8585

8686
if err != nil {
87-
panic(err)
87+
m.logger().Panic(err)
8888
}
8989

9090
for _, incident := range list.Incidents {

‎metrics_maintenance_window.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ func (m *MetricsCollectorMaintenanceWindow) Collect(ctx context.Context, callbac
6767
maintWindowsStatusMetricList := prometheusCommon.NewMetricsList()
6868

6969
for {
70-
m.CollectorReference.logger.Debugf("fetch maintenance windows (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
70+
m.logger().Debugf("fetch maintenance windows (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
7171

7272
list, err := PagerDutyClient.ListMaintenanceWindows(listOpts)
7373
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListMaintenanceWindows").Inc()
7474

7575
if err != nil {
76-
panic(err)
76+
m.logger().Panic(err)
7777
}
7878

7979
currentTime := time.Now()

‎metrics_oncall.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ func (m *MetricsCollectorOncall) Collect(ctx context.Context, callback chan<- fu
4343
onCallMetricList := prometheusCommon.NewMetricsList()
4444

4545
for {
46-
m.CollectorReference.logger.Debugf("fetch schedule oncalls (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
46+
m.logger().Debugf("fetch schedule oncalls (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
4747

4848
list, err := PagerDutyClient.ListOnCalls(listOpts)
4949
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListOnCalls").Inc()
5050

5151
if err != nil {
52-
panic(err)
52+
m.logger().Panic(err)
5353
}
5454

5555
for _, oncall := range list.OnCalls {

‎metrics_schedule.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ func (m *MetricsCollectorSchedule) Collect(ctx context.Context, callback chan<-
109109
scheduleMetricList := prometheusCommon.NewMetricsList()
110110

111111
for {
112-
m.CollectorReference.logger.Debugf("fetch schedules (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
112+
m.logger().Debugf("fetch schedules (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
113113

114114
list, err := PagerDutyClient.ListSchedules(listOpts)
115115
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListSchedules").Inc()
116116

117117
if err != nil {
118-
panic(err)
118+
m.logger().Panic(err)
119119
}
120120

121121
for _, schedule := range list.Schedules {
@@ -152,13 +152,13 @@ func (m *MetricsCollectorSchedule) collectScheduleInformation(scheduleID string,
152152
listOpts.Until = filterUntil.Format(time.RFC3339)
153153
listOpts.Offset = 0
154154

155-
m.CollectorReference.logger.Debugf("fetch schedule information (schedule: %v, offset: %v, limit:%v)", scheduleID, listOpts.Offset, listOpts.Limit)
155+
m.logger().Debugf("fetch schedule information (schedule: %v, offset: %v, limit:%v)", scheduleID, listOpts.Offset, listOpts.Limit)
156156

157157
schedule, err := PagerDutyClient.GetSchedule(scheduleID, listOpts)
158158
m.CollectorReference.PrometheusAPICounter().WithLabelValues("GetSchedule").Inc()
159159

160160
if err != nil {
161-
panic(err)
161+
m.logger().Panic(err)
162162
}
163163

164164
scheduleLayerMetricList := prometheusCommon.NewMetricsList()
@@ -257,13 +257,13 @@ func (m *MetricsCollectorSchedule) collectScheduleOverrides(scheduleID string, c
257257
overrideMetricList := prometheusCommon.NewMetricsList()
258258

259259
for {
260-
m.CollectorReference.logger.Debugf("fetch schedule overrides (schedule: %v, offset: %v, limit:%v)", scheduleID, listOpts.Offset, listOpts.Limit)
260+
m.logger().Debugf("fetch schedule overrides (schedule: %v, offset: %v, limit:%v)", scheduleID, listOpts.Offset, listOpts.Limit)
261261

262262
list, err := PagerDutyClient.ListOverrides(scheduleID, listOpts)
263263
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListOverrides").Inc()
264264

265265
if err != nil {
266-
panic(err)
266+
m.logger().Panic(err)
267267
}
268268

269269
for _, override := range list.Overrides {

‎metrics_service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ func (m *MetricsCollectorService) Collect(ctx context.Context, callback chan<- f
5252
serviceMetricList := prometheusCommon.NewMetricsList()
5353

5454
for {
55-
m.CollectorReference.logger.Debugf("fetch services (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
55+
m.logger().Debugf("fetch services (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
5656

5757
list, err := PagerDutyClient.ListServices(listOpts)
5858
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListServices").Inc()
5959

6060
if err != nil {
61-
panic(err)
61+
m.logger().Panic(err)
6262
}
6363

6464
for _, service := range list.Services {

‎metrics_team.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ func (m *MetricsCollectorTeam) Collect(ctx context.Context, callback chan<- func
4545
teamMetricList := prometheusCommon.NewMetricsList()
4646

4747
for {
48-
m.CollectorReference.logger.Debugf("fetch teams (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
48+
m.logger().Debugf("fetch teams (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
4949

5050
list, err := PagerDutyClient.ListTeams(listOpts)
5151
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListTeams").Inc()
5252

5353
if err != nil {
54-
panic(err)
54+
m.logger().Panic(err)
5555
}
5656

5757
for _, team := range list.Teams {

‎metrics_user.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ func (m *MetricsCollectorUser) Collect(ctx context.Context, callback chan<- func
5656
userMetricList := prometheusCommon.NewMetricsList()
5757

5858
for {
59-
m.CollectorReference.logger.Debugf("fetch users (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
59+
m.logger().Debugf("fetch users (offset: %v, limit:%v)", listOpts.Offset, listOpts.Limit)
6060

6161
list, err := PagerDutyClient.ListUsers(listOpts)
6262
m.CollectorReference.PrometheusAPICounter().WithLabelValues("ListUsers").Inc()
6363

6464
if err != nil {
65-
panic(err)
65+
m.logger().Panic(err)
6666
}
6767

6868
for _, user := range list.Users {

0 commit comments

Comments
 (0)