Merge pull request #3862 from jaellio/eventMetric

feat(metrics): proxy broadcast event count
openservicemesh · Jul 29, 2021 · f258b86 · f258b86
2 parents 6122763 + 7e42e6e
commit f258b86
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/cmd/osm-controller/osm-controller.go b/cmd/osm-controller/osm-controller.go
@@ -301,6 +301,7 @@ func startMetricsStore() {
 		metricsstore.DefaultMetricsStore.ProxyConnectCount,
 		metricsstore.DefaultMetricsStore.ProxyReconnectCount,
 		metricsstore.DefaultMetricsStore.ProxyConfigUpdateTime,
+		metricsstore.DefaultMetricsStore.ProxyBroadcastEventCount,
 		metricsstore.DefaultMetricsStore.CertIssuedCount,
 		metricsstore.DefaultMetricsStore.CertIssuedTime,
 	)

diff --git a/pkg/catalog/dispatcher.go b/pkg/catalog/dispatcher.go
@@ -7,6 +7,7 @@ import (
 
 	a "github.com/openservicemesh/osm/pkg/announcements"
 	"github.com/openservicemesh/osm/pkg/k8s/events"
+	"github.com/openservicemesh/osm/pkg/metricsstore"
 )
 
 const (
@@ -101,6 +102,7 @@ func (mc *MeshCatalog) dispatcher() {
 			events.GetPubSubInstance().Publish(events.PubSubMessage{
 				AnnouncementType: a.ProxyBroadcast,
 			})
+			metricsstore.DefaultMetricsStore.ProxyBroadcastEventCount.Inc()
 
 			// broadcast done, reset timer channels
 			broadcastScheduled = false
@@ -112,6 +114,7 @@ func (mc *MeshCatalog) dispatcher() {
 			events.GetPubSubInstance().Publish(events.PubSubMessage{
 				AnnouncementType: a.ProxyBroadcast,
 			})
+			metricsstore.DefaultMetricsStore.ProxyBroadcastEventCount.Inc()
 
 			// broadcast done, reset timer channels
 			broadcastScheduled = false

diff --git a/pkg/metricsstore/metricsstore.go b/pkg/metricsstore/metricsstore.go
@@ -43,6 +43,9 @@ type MetricsStore struct {
 	// ProxyConfigUpdateTime is the histogram to track time spent for proxy configuration and its occurrences
 	ProxyConfigUpdateTime *prometheus.HistogramVec
 
+	// ProxyBroadcastEventCounter is the metric for the total number of ProxyBroadcast events published
+	ProxyBroadcastEventCount prometheus.Counter
+
 	/*
 	 * Injector metrics
 	 */
@@ -134,6 +137,13 @@ func init() {
 			"success",       // further labels if the operation succeeded or not
 		})
 
+	defaultMetricsStore.ProxyBroadcastEventCount = prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: metricsRootNamespace,
+		Subsystem: "proxy",
+		Name:      "broadcast_event_count",
+		Help:      "Represents the number of ProxyBroadcast events published by the OSM controller",
+	})
+
 	/*
 	 * Injector metrics
 	 */