Address comments

Author: RobertIndie

pulsar/consumer_test.go

@@ -5190,14 +5190,14 @@ func TestAckIDListWillIncreaseAckCounterMetrics(t *testing.T) {
 
 	assert.NoError(t, err)
 
-	msgIds := make([]MessageID, 10)
+	msgIDs := make([]MessageID, 10)
 	for i := 0; i < 10; i++ {
 		msg, err := c.Receive(context.Background())
 		assert.NoError(t, err)
-		msgIds[i] = msg.ID()
+		msgIDs[i] = msg.ID()
 	}
 
-	err = c.AckIDList(msgIds)
+	err = c.AckIDList(msgIDs)
 	assert.NoError(t, err)
 
 	ackCnt, err := getMetricValue("pulsar_client_consumer_acks")

pulsar/test_setup_test.go

@@ -68,8 +68,19 @@ func startMetricsServer() error {
 		}
 	}()
 
-	// Wait a bit for server to start
-	time.Sleep(100 * time.Millisecond)
+	// Wait for server to start with a retry mechanism
+	timeout := time.Now().Add(5 * time.Second)
+	for {
+		conn, err := net.Dial("tcp", addr)
+		if err == nil {
+			conn.Close()
+			break
+		}
+		if time.Now().After(timeout) {
+			return fmt.Errorf("server did not start within the timeout period: %v", err)
+		}
+		time.Sleep(50 * time.Millisecond)
+	}
 	return nil
 }
 
@@ -105,7 +116,8 @@ func getMetricValue(metricName string) (float64, error) {
 		if strings.HasPrefix(strings.TrimSpace(line), "#") {
 			continue
 		}
-		if strings.Contains(line, metricName) {
+		if strings.HasPrefix(line, metricName) && (len(line) == len(metricName) ||
+			line[len(metricName)] == '{' || line[len(metricName)] == ' ') {
 			// Parse the metric line to extract the value
 			// Format: metric_name{label="value",label2="value2"} 10
 			parts := strings.Fields(line)