Merge pull request #1973 from qiangmzsx/master

fix: metrics still taking up too much memory when metrics.UseNilMetrics=true

broker.go

@@ -180,7 +180,7 @@ func (b *Broker) Open(conf *Config) error {
 		b.requestsInFlight = metrics.GetOrRegisterCounter("requests-in-flight", conf.MetricRegistry)
 		// Do not gather metrics for seeded broker (only used during bootstrap) because they share
 		// the same id (-1) and are already exposed through the global metrics above
-		if b.id >= 0 {
+		if b.id >= 0 && !metrics.UseNilMetrics {
 			b.registerMetrics()
 		}
 

broker_test.go

@@ -1041,3 +1041,36 @@ func validateBrokerMetrics(t *testing.T, broker *Broker, mockBrokerMetrics broke
 	// Run the validators
 	metricValidators.run(t, broker.conf.MetricRegistry)
 }
+
+func BenchmarkBroker_Open(b *testing.B) {
+	mb := NewMockBroker(nil, 0)
+	broker := NewBroker(mb.Addr())
+	// Set the broker id in order to validate local broker metrics
+	broker.id = 0
+	metrics.UseNilMetrics = false
+	conf := NewTestConfig()
+	conf.Version = V1_0_0_0
+	for i := 0; i < b.N; i++ {
+		err := broker.Open(conf)
+		if err != nil {
+			b.Fatal(err)
+		}
+		broker.Close()
+	}
+}
+
+func BenchmarkBroker_No_Metrics_Open(b *testing.B) {
+	mb := NewMockBroker(nil, 0)
+	broker := NewBroker(mb.Addr())
+	broker.id = 0
+	metrics.UseNilMetrics = true
+	conf := NewTestConfig()
+	conf.Version = V1_0_0_0
+	for i := 0; i < b.N; i++ {
+		err := broker.Open(conf)
+		if err != nil {
+			b.Fatal(err)
+		}
+		broker.Close()
+	}
+}

functional_client_test.go

@@ -1,4 +1,5 @@
-//+build functional
+//go:build functional
+// +build functional
 
 package sarama
 

functional_consumer_group_test.go

@@ -1,4 +1,5 @@
-//+build functional
+//go:build functional
+// +build functional
 
 package sarama
 

functional_consumer_test.go

@@ -1,4 +1,5 @@
-//+build functional
+//go:build functional
+// +build functional
 
 package sarama
 

functional_offset_manager_test.go

@@ -1,4 +1,5 @@
-//+build functional
+//go:build functional
+// +build functional
 
 package sarama
 

functional_producer_test.go

@@ -1,4 +1,5 @@
-//+build functional
+//go:build functional
+// +build functional
 
 package sarama
 

functional_test.go

@@ -1,4 +1,5 @@
-//+build functional
+//go:build functional
+// +build functional
 
 package sarama