From ea86f7e8f8b3a98a9034d3ac676b07b068d1f583 Mon Sep 17 00:00:00 2001 From: Bjoern Rabenstein Date: Tue, 25 Nov 2014 17:39:02 +0100 Subject: [PATCH] Fix weird things after merge. And I swear I'll never use 'rebase' to 'clean something up' ever agin, even if Julius tells me to do so... Change-Id: Ifeabab20445279bf693c95f062da769b60fe195f --- main.go | 1 - notification/notification.go | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/main.go b/main.go index bbe51aa09f..726aad8530 100644 --- a/main.go +++ b/main.go @@ -23,7 +23,6 @@ import ( "github.com/golang/glog" "github.com/prometheus/client_golang/extraction" - registry "github.com/prometheus/client_golang/prometheus" clientmodel "github.com/prometheus/client_golang/model" registry "github.com/prometheus/client_golang/prometheus" diff --git a/notification/notification.go b/notification/notification.go index bf700ffe10..b08ac196c3 100644 --- a/notification/notification.go +++ b/notification/notification.go @@ -219,18 +219,3 @@ func (n *NotificationHandler) Collect(ch chan<- prometheus.Metric) { ch <- n.notificationsQueueLength ch <- n.notificationsQueueCapacity } - -// Describe implements prometheus.Collector. -func (n *NotificationHandler) Describe(ch chan<- *prometheus.Desc) { - n.notificationLatency.Describe(ch) - ch <- n.notificationsQueueLength.Desc() - ch <- n.notificationsQueueCapacity.Desc() -} - -// Collect implements prometheus.Collector. -func (n *NotificationHandler) Collect(ch chan<- prometheus.Metric) { - n.notificationLatency.Collect(ch) - n.notificationsQueueLength.Set(float64(len(n.pendingNotifications))) - ch <- n.notificationsQueueLength - ch <- n.notificationsQueueCapacity -}