Merge pull request #1319 from aduffeck/remove-in-progress-metric

Drop the "InProgress" metric

services/postprocessing/pkg/metrics/metrics.go

@@ -36,12 +36,6 @@ var (
 		Name:      "events_redelivered",
 		Help:      "Number of redelivered events",
 	})
-	inProgress = promauto.NewGauge(prometheus.GaugeOpts{
-		Namespace: Namespace,
-		Subsystem: Subsystem,
-		Name:      "in_progress",
-		Help:      "Number of postprocessing events in progress",
-	})
 	finished = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: Namespace,
 		Subsystem: Subsystem,
@@ -64,7 +58,6 @@ type Metrics struct {
 	EventsOutstandingAcks prometheus.Gauge
 	EventsUnprocessed     prometheus.Gauge
 	EventsRedelivered     prometheus.Gauge
-	InProgress            prometheus.Gauge
 	Finished              *prometheus.CounterVec
 	Duration              *prometheus.HistogramVec
 }
@@ -76,7 +69,6 @@ func New() *Metrics {
 		EventsOutstandingAcks: eventsOutstandingAcks,
 		EventsUnprocessed:     eventsUnprocessed,
 		EventsRedelivered:     eventsRedelivered,
-		InProgress:            inProgress,
 		Finished:              finished,
 		Duration:              duration,
 	}

services/postprocessing/pkg/service/service.go

@@ -205,7 +205,6 @@ func (pps *PostprocessingService) processEvent(e raw.Event) error {
 			ImpersonatingUser: ev.ImpersonatingUser,
 			StartTime:         time.Now(),
 		}
-		pps.metrics.InProgress.Inc()
 		next = pp.Init(ev)
 	case events.PostprocessingStepFinished:
 		if ev.UploadID == "" {
@@ -256,7 +255,6 @@ func (pps *PostprocessingService) processEvent(e raw.Event) error {
 			}
 		})
 	case events.UploadReady:
-		pps.metrics.InProgress.Dec()
 		// the upload failed - let's keep it around for a while - but mark it as finished
 		pp, err = pps.getPP(pps.store, ev.UploadID)
 		if err != nil {