Update performance-sd tests to use nats-server v2 ConnInfo so we can continue bumping dependencies (#295)

Author: geofffranks

src/code.cloudfoundry.org/go.mod

@@ -1,8 +1,8 @@
 module code.cloudfoundry.org
 
-go 1.22
+go 1.22.0
 
-toolchain go1.22.3
+toolchain go1.23.1
 
 replace (
 	example-apps/spammer => ../example-apps/spammer
@@ -12,15 +12,15 @@ replace (
 
 require (
 	code.cloudfoundry.org/bbs v0.0.0-20240806230301-9be69c0199db
-	code.cloudfoundry.org/cf-networking-helpers v0.10.0
-	code.cloudfoundry.org/clock v1.10.0
-	code.cloudfoundry.org/debugserver v0.10.0
-	code.cloudfoundry.org/filelock v0.7.0
-	code.cloudfoundry.org/garden v0.0.0-20240904210308-248eacb9f907
-	code.cloudfoundry.org/lager/v3 v3.3.0
+	code.cloudfoundry.org/cf-networking-helpers v0.11.0
+	code.cloudfoundry.org/clock v1.11.0
+	code.cloudfoundry.org/debugserver v0.11.0
+	code.cloudfoundry.org/filelock v0.9.0
+	code.cloudfoundry.org/garden v0.0.0-20240906210158-d3ba7afc2097
+	code.cloudfoundry.org/lager/v3 v3.4.0
 	code.cloudfoundry.org/locket v0.0.0-20240521151413-b344fdd15d03
-	code.cloudfoundry.org/policy_client v0.13.0
-	code.cloudfoundry.org/tlsconfig v0.3.0
+	code.cloudfoundry.org/policy_client v0.15.0
+	code.cloudfoundry.org/tlsconfig v0.4.0
 	example-apps/spammer v0.0.0-00010101000000-000000000000
 	github.com/benjamintf1/unmarshalledmatchers v1.0.0
 	github.com/cf-container-networking/sql-migrate v0.0.0-20191108002617-83f2bdabdc5d
@@ -34,6 +34,7 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/nats-io/gnatsd v1.4.1
 	github.com/nats-io/go-nats v1.8.1
+	github.com/nats-io/nats-server/v2 v2.10.20
 	github.com/nats-io/nats-top v0.6.2
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/onsi/ginkgo/v2 v2.20.2
@@ -52,8 +53,8 @@ require (
 )
 
 require (
-	code.cloudfoundry.org/diego-logging-client v0.14.0 // indirect
-	code.cloudfoundry.org/durationjson v0.8.0 // indirect
+	code.cloudfoundry.org/diego-logging-client v0.16.0 // indirect
+	code.cloudfoundry.org/durationjson v0.9.0 // indirect
 	code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb // indirect
 	code.cloudfoundry.org/go-loggregator/v9 v9.2.1 // indirect
 	code.cloudfoundry.org/inigo v0.0.0-20230228171622-18bab030e953 // indirect
@@ -77,20 +78,20 @@ require (
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/minio/highwayhash v1.0.3 // indirect
 	github.com/nats-io/jwt/v2 v2.5.8 // indirect
-	github.com/nats-io/nats-server/v2 v2.10.18 // indirect
 	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/openzipkin/zipkin-go v0.4.3 // indirect
 	github.com/square/certstrap v1.3.0 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/ziutek/mymysql v1.5.4 // indirect
 	go.step.sm/crypto v0.51.2 // indirect
+	go.uber.org/automaxprocs v1.5.3 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.25.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/grpc v1.66.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect

src/code.cloudfoundry.org/go.sum

@@ -594,34 +594,34 @@ cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT
 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
 code.cloudfoundry.org/bbs v0.0.0-20240806230301-9be69c0199db h1:6eRhLjxWbnhBfaRzjYGPPNIJ6Qu535/KREpanrkz6mQ=
 code.cloudfoundry.org/bbs v0.0.0-20240806230301-9be69c0199db/go.mod h1:XKlGVVXFi5EcHHMPzw3xgONK9PeEZuUbIC43XNwxD10=
-code.cloudfoundry.org/cf-networking-helpers v0.10.0 h1:M9ObbjxNeEKx4p2awweDqAbLKyTNdZPv5UXyFszD0fQ=
-code.cloudfoundry.org/cf-networking-helpers v0.10.0/go.mod h1:VkOSAh9g1GWFqb5ZaIs8qQ6u4mMIkccVTzFgwpZehFc=
-code.cloudfoundry.org/clock v1.10.0 h1:0eGyCCSGXZucpvaRywsykkmqNdjppr4LZpck+7NpDn8=
-code.cloudfoundry.org/clock v1.10.0/go.mod h1:vUGMidO0W1wXd5p3frivTJeLKI5Q9BgZnxeMESiEX/c=
-code.cloudfoundry.org/debugserver v0.10.0 h1:RVeapjPQc2lgfu3IGq/MduP0i8RLSNVrHzFOO+Yx/vk=
-code.cloudfoundry.org/debugserver v0.10.0/go.mod h1:qCnPai9gjPntiTVWixRq6xV3I/sn2rJovZNE9uKlamk=
-code.cloudfoundry.org/diego-logging-client v0.14.0 h1:nDpIx8MFOvvHsz+4z9GbajejKMJ3RQROAOTeb+tsVag=
-code.cloudfoundry.org/diego-logging-client v0.14.0/go.mod h1:z38c8G3frXaoKBuunyIkVruwOFkd+yV1ctAnFrxEn5w=
-code.cloudfoundry.org/durationjson v0.8.0 h1:jXRQ+nBv+PzEISgJIvl9YDw9gdk5QKBRmoEI4XvWzvI=
-code.cloudfoundry.org/durationjson v0.8.0/go.mod h1:Aj+HblvQmhsKe8jgmdd5a7NT+aPKB9rUJ7Jhdpv9Qx4=
-code.cloudfoundry.org/filelock v0.7.0 h1:nxjkEAoMP7mW3R+nv2tQB4AH7JTDolLqoiDkdSBZdn0=
-code.cloudfoundry.org/filelock v0.7.0/go.mod h1:v8jaYxF2WruC6WJF6+ORAEaKzGCkxFI8x54Y7UN87b4=
-code.cloudfoundry.org/garden v0.0.0-20240904210308-248eacb9f907 h1:bKaeYd53VpRUl2gkuh5EXdSahtXkRidB/hwMzpbmLHA=
-code.cloudfoundry.org/garden v0.0.0-20240904210308-248eacb9f907/go.mod h1:l+O3SMIBjz20G/8tv8qI6zgaBVPh1dLD5RIl3OeGNdE=
+code.cloudfoundry.org/cf-networking-helpers v0.11.0 h1:fTVb7FCpp37N4ikXtq/M/eX8g78cYP7MH/Rfde9xwqs=
+code.cloudfoundry.org/cf-networking-helpers v0.11.0/go.mod h1:5J35pA4Z6xhp089bymbLjxYk9J4DBnTk55JZxRV5U0U=
+code.cloudfoundry.org/clock v1.11.0 h1:ZIg1APjFlsUKgtYq2i1uLr5URtBn8cmNivMPtKiHUik=
+code.cloudfoundry.org/clock v1.11.0/go.mod h1:lFz6ZwiQlPasKyy8L6P0pdFYVEkMhCbjPOuZXmv1dhs=
+code.cloudfoundry.org/debugserver v0.11.0 h1:WLrlkz8ZMjp/88zgmGg3q+UVyHV8foCP/yPiV65J6o0=
+code.cloudfoundry.org/debugserver v0.11.0/go.mod h1:h8M238FnqKxyPfDmNwPjwx1c4gro59vj9jF/sNYX7vQ=
+code.cloudfoundry.org/diego-logging-client v0.16.0 h1:O0nNC4XNVV8aMrpDUJHAQpot7nZ3qzcc97MBY81/Iew=
+code.cloudfoundry.org/diego-logging-client v0.16.0/go.mod h1:eDB0U0zLdDuRuv9jh8kzicHOkbN5LSV/IsK6DmfKBSo=
+code.cloudfoundry.org/durationjson v0.9.0 h1:SdIsys4lLi/0+zM/b7i0d3JtNx+a63Fd1zHlGAKtMlk=
+code.cloudfoundry.org/durationjson v0.9.0/go.mod h1:pTAISr9/6AGAeZlNIp96Ta9QS5kpBPNcFEPMXgv/29I=
+code.cloudfoundry.org/filelock v0.9.0 h1:D+Gx/IwoAQJ3O+B4Dvu4/dJrLQODPPRzZ0zzA1FXuvE=
+code.cloudfoundry.org/filelock v0.9.0/go.mod h1:A8IxWpupbVJF//dFK/0XzHKZvQmXE3n5+tJ04lE8iyk=
+code.cloudfoundry.org/garden v0.0.0-20240906210158-d3ba7afc2097 h1:27JltUeD9d6q73vYUD/xux9oYFjKhWrS2LSce5rsruA=
+code.cloudfoundry.org/garden v0.0.0-20240906210158-d3ba7afc2097/go.mod h1:dWOJpUO+IkzcUgZr++a0rJcEzm0SJ+p4qY4lgtzf0Eo=
 code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb h1:Last39ehN2b866DrM0B5FPIbdBFouL9humzWTqVTEX4=
 code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb/go.mod h1:PfkH7ePa4EhyC6VRisbZJOaIHhas7ofB0heANM//Z6Y=
 code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk=
 code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8=
 code.cloudfoundry.org/inigo v0.0.0-20230228171622-18bab030e953 h1:RqBeS32OCECJmvyE0qcrOjkksuNvggL15raElhxPaMQ=
 code.cloudfoundry.org/inigo v0.0.0-20230228171622-18bab030e953/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q=
-code.cloudfoundry.org/lager/v3 v3.3.0 h1:adWGo2aBLpHVfUG+3D2FQ4B6Mf2Bcz47KITbn8V4b0k=
-code.cloudfoundry.org/lager/v3 v3.3.0/go.mod h1:k/AYgZTVrwQaneNfQ2EwnZxUb9iUFE7i6AJ3KVOtAdE=
+code.cloudfoundry.org/lager/v3 v3.4.0 h1:HflFoHezSfYDIMNxkGctLKgWIvkr5cJqfo8BHGKOlCw=
+code.cloudfoundry.org/lager/v3 v3.4.0/go.mod h1:tpvCqzex59vTU7Ssgxo9h367EGiL6CrNzuohvnTbsEk=
 code.cloudfoundry.org/locket v0.0.0-20240521151413-b344fdd15d03 h1:jrunp9b2C7KMCIYlgU8CGxRa0u4A1EtJiYHaZRSo5GQ=
 code.cloudfoundry.org/locket v0.0.0-20240521151413-b344fdd15d03/go.mod h1:AwHLRkdXtttLXNB8RHgLfErJ2kKafH62AR2OClhy6xI=
-code.cloudfoundry.org/policy_client v0.13.0 h1:ifYR/LE01IoULVahbkkz5XyuoT+siWPX28HkYHHm+KY=
-code.cloudfoundry.org/policy_client v0.13.0/go.mod h1:jq7Fh3S7UK/X5FMPiNYdkWK+VRpmhUE1DjGuOqd+CJ0=
-code.cloudfoundry.org/tlsconfig v0.3.0 h1:403Gi+oetS8UmrmliF8PeYff/WlOPCoMX2L1fgJICfo=
-code.cloudfoundry.org/tlsconfig v0.3.0/go.mod h1:2x5SW9lTCTc7rxNMU9nh1xBLJ0EMATVnCgED2Br3I1w=
+code.cloudfoundry.org/policy_client v0.15.0 h1:d/OIh24hPXZvOKPxRtmeeC+mvOsWFH8N8Wf584WatAo=
+code.cloudfoundry.org/policy_client v0.15.0/go.mod h1:TTMOYGanJxODTpkOEyLuXCvK7aDi9cOYofJHQP+HVow=
+code.cloudfoundry.org/tlsconfig v0.4.0 h1:yPk995C/KPW7Ck57VqS6chJAKnzTdE/QnXjHLOrrFOw=
+code.cloudfoundry.org/tlsconfig v0.4.0/go.mod h1:AUJ2Wk4VsDw+VDtu7/bK49hbgjy7gScv8ocPTDPKRhw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
@@ -911,8 +911,8 @@ github.com/nats-io/go-nats v1.5.1-0.20180331191609-247b2a84d8d0 h1:zphK8iy08Kqv1
 github.com/nats-io/go-nats v1.5.1-0.20180331191609-247b2a84d8d0/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
 github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE=
 github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
-github.com/nats-io/nats-server/v2 v2.10.18 h1:tRdZmBuWKVAFYtayqlBB2BuCHNGAQPvoQIXOKwU3WSM=
-github.com/nats-io/nats-server/v2 v2.10.18/go.mod h1:97Qyg7YydD8blKlR8yBsUlPlWyZKjA7Bp5cl3MUE9K8=
+github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTLgP8etyvEI=
+github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M=
 github.com/nats-io/nats-top v0.6.2 h1:FVlwK4UVaOrnbEllkRQcY/W8u2qT7tptzIsGOwn+4BI=
 github.com/nats-io/nats-top v0.6.2/go.mod h1:Wc42bi43h/RzS0yOx1gBJfLfybxCQGX32lSYfLpJScg=
 github.com/nats-io/nats.go v1.36.0 h1:suEUPuWzTSse/XhESwqLxXGuj8vGRuPRoG7MoRN/qyU=
@@ -982,6 +982,8 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
@@ -1050,6 +1052,8 @@ go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.step.sm/crypto v0.51.2 h1:5EiCGIMg7IvQTGmJrwRosbXeprtT80OhoS/PJarg60o=
 go.step.sm/crypto v0.51.2/go.mod h1:QK7czLjN2k+uqVp5CHXxJbhc70kVRSP+0CQF3zsR5M0=
+go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
+go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -1432,8 +1436,8 @@ golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

src/code.cloudfoundry.org/test/performance-sd/nats_performance_test.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/montanaflynn/stats"
-	"github.com/nats-io/gnatsd/server"
 	"github.com/nats-io/go-nats"
 	"github.com/nats-io/go-nats/bench"
+	"github.com/nats-io/nats-server/v2/server"
 	toputils "github.com/nats-io/nats-top/util"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -244,8 +244,8 @@ func addPrefix(prefix, metricName string) string {
 	return metricName
 }
 
-func collectNatsSubscriberConnectionInfo(subscriber string) map[uint64]server.ConnInfo {
-	serviceDiscoverySubs := map[uint64]server.ConnInfo{}
+func collectNatsSubscriberConnectionInfo(subscriber string) map[uint64]*server.ConnInfo {
+	serviceDiscoverySubs := map[uint64]*server.ConnInfo{}
 
 	timeoutChan := time.After(10 * time.Second)
 	natsTopEngine := toputils.NewEngine(config.NatsURL, config.NatsMonitoringPort, 1000, 1)
@@ -265,7 +265,7 @@ func collectNatsSubscriberConnectionInfo(subscriber string) map[uint64]server.Co
 			}
 			for _, statsConn := range stats.Connz.Conns {
 				if strings.Contains(strings.Join(statsConn.Subs, ","), subscriber) {
-					serviceDiscoverySubs[statsConn.Cid] = server.ConnInfo(statsConn)
+					serviceDiscoverySubs[statsConn.Cid] = statsConn
 				}
 			}
 		case <-timeoutChan: