From c3fb1654aaa7ce4f8142dc270c7f86125cd600b7 Mon Sep 17 00:00:00 2001
From: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Date: Thu, 2 Mar 2023 15:17:22 -0600
Subject: [PATCH] backport of commit 20cd7f1f483d7d0f59416738e81e125bbdc1ace6
 (#16510)

Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
---
 agent/dns_test.go | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/agent/dns_test.go b/agent/dns_test.go
index 501564c66c2e..1cc74213890b 100644
--- a/agent/dns_test.go
+++ b/agent/dns_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/hashicorp/serf/coordinate"
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/consul"
@@ -4883,21 +4884,26 @@ func TestDNS_TCP_and_UDP_Truncate(t *testing.T) {
 	services := []string{"normal", "truncated"}
 	for index, service := range services {
 		numServices := (index * 5000) + 2
+		var eg errgroup.Group
 		for i := 1; i < numServices; i++ {
-			args := &structs.RegisterRequest{
-				Datacenter: "dc1",
-				Node:       fmt.Sprintf("%s-%d.acme.com", service, i),
-				Address:    fmt.Sprintf("127.%d.%d.%d", 0, (i / 255), i%255),
-				Service: &structs.NodeService{
-					Service: service,
-					Port:    8000,
-				},
-			}
+			j := i
+			eg.Go(func() error {
+				args := &structs.RegisterRequest{
+					Datacenter: "dc1",
+					Node:       fmt.Sprintf("%s-%d.acme.com", service, j),
+					Address:    fmt.Sprintf("127.%d.%d.%d", 0, (j / 255), j%255),
+					Service: &structs.NodeService{
+						Service: service,
+						Port:    8000,
+					},
+				}
 
-			var out struct{}
-			if err := a.RPC(context.Background(), "Catalog.Register", args, &out); err != nil {
-				t.Fatalf("err: %v", err)
-			}
+				var out struct{}
+				return a.RPC(context.Background(), "Catalog.Register", args, &out)
+			})
+		}
+		if err := eg.Wait(); err != nil {
+			t.Fatalf("error registering: %v", err)
 		}
 
 		// Register an equivalent prepared query.