Merge eefee92 into bb97311

agent/agent.go

@@ -121,7 +121,7 @@ func NewAgent(
 		metricsReporters:   metricsReporters,
 	}
 
-	// bindng session
+	// binding session
 	s := session.New(a, true)
 	metrics.ReportNumberOfConnectedClients(metricsReporters, session.SessionCount)
 	a.Session = s

app.go

@@ -140,7 +140,10 @@ func Configure(
 	app.metricsReporters = make([]metrics.Reporter, 0)
 
 	defaultTags := app.config.GetStringMapString("pitaya.metrics.tags")
-	AddMetricsReporter(metrics.GetPrometheusReporter(serverType, app.config.GetString("pitaya.game"), app.config.GetInt("pitaya.metrics.prometheus.port"), defaultTags))
+	if app.config.GetBool("pitaya.metrics.prometheus.enabled") {
+		logger.Log.Infof("prometheus is enabled, configuring the metrics reporter on port %d", app.config.GetInt("pitaya.metrics.prometheus.port"))
+		AddMetricsReporter(metrics.GetPrometheusReporter(serverType, app.config.GetString("pitaya.game"), app.config.GetInt("pitaya.metrics.prometheus.port"), defaultTags))
+	}
 
 	if app.config.GetBool("pitaya.metrics.statsd.enabled") {
 		logger.Log.Infof("statsd is enabled, configuring the metrics reporter with host: %s", app.config.Get("pitaya.metrics.statsd.host"))

config/config.go

@@ -89,6 +89,7 @@ func (c *Config) fillDefaultValues() {
 		"pitaya.metrics.statsd.rate":                            1,
 		"pitaya.metrics.prometheus.port":                        9090,
 		"pitaya.metrics.tags":                                   map[string]string{},
+		"pitaya.metrics.prometheus.enabled":                     true,
 	}
 
 	for param := range defaultsMap {

metrics/constants.go

@@ -0,0 +1,14 @@
+package metrics
+
+var (
+	// ResponseTime reports the response time of handlers and rpc
+	ResponseTime = "response_time_ns"
+	// ConnectedClients represents the number of current connected clients in frontend servers
+	ConnectedClients = "connected_clients"
+	// CountServers counts the number of servers of different types
+	CountServers = "count_servers"
+	// ChannelCapacity represents the capacity of a channel (available slots)
+	ChannelCapacity = "channel_capacity"
+	// DroppedMessages reports the number of dropped messages in rpc server (messages that will not be handled)
+	DroppedMessages = "dropped_messages"
+)

metrics/prometheus_reporter.go

@@ -31,16 +31,6 @@ import (
 )
 
 var (
-	// ResponseTime reports the response time of handlers and rpc
-	ResponseTime = "response_time_ns"
-	// ConnectedClients represents the number of current connected clients in frontend servers
-	ConnectedClients = "connected_clients"
-	// CountServers counts the number of servers of different types
-	CountServers = "count_servers"
-	// ChannelCapacity represents the capacity of a channel (available slots)
-	ChannelCapacity = "channel_capacity"
-	// DroppedMessages reports the number of dropped messages in rpc server (messages that will not be handled)
-	DroppedMessages    = "dropped_messages"
 	prometheusReporter *PrometheusReporter
 	once               sync.Once
 )
@@ -58,7 +48,7 @@ func (p *PrometheusReporter) registerMetrics(constLabels map[string]string) {
 	constLabels["game"] = p.game
 	constLabels["serverType"] = p.serverType
 
-	// HanadlerResponseTimeMs summaary
+	// HandlerResponseTimeMs summary
 	p.summaryReportersMap[ResponseTime] = prometheus.NewSummaryVec(
 		prometheus.SummaryOpts{
 			Namespace:   "pitaya",