Revert "TUN-6007: Implement new edge discovery algorithm"

This reverts commit 4f468b8.

Author: DevinCarr

connection/errors.go

@@ -18,15 +18,6 @@ func (e DupConnRegisterTunnelError) Error() string {
 	return "already connected to this server, trying another address"
 }
 
-// Dial to edge server with quic failed
-type EdgeQuicDialError struct {
-	Cause error
-}
-
-func (e *EdgeQuicDialError) Error() string {
-	return "failed to dial to edge with quic: " + e.Cause.Error()
-}
-
 // RegisterTunnel error from server
 type ServerRegisterTunnelError struct {
 	Cause     error

connection/quic.go

@@ -57,7 +57,7 @@ func NewQUICConnection(
 ) (*QUICConnection, error) {
 	session, err := quic.DialAddr(edgeAddr.String(), tlsConfig, quicConfig)
 	if err != nil {
-		return nil, &EdgeQuicDialError{Cause: err}
+		return nil, fmt.Errorf("failed to dial to edge: %w", err)
 	}
 
 	datagramMuxer, err := quicpogs.NewDatagramMuxer(session, logger)

edgediscovery/allregions/address.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	// Used to discover HA origintunneld servers
-	srvService = "v2-origintunneld"
+	srvService = "origintunneld"
 	srvProto   = "tcp"
 	srvName    = "argotunnel.com"
 
@@ -115,9 +115,6 @@ func edgeDiscovery(log *zerolog.Logger, srvService string) ([][]*EdgeAddr, error
 		if err != nil {
 			return nil, err
 		}
-		for _, e := range edgeAddrs {
-			log.Debug().Msgf("Edge Address: %+v", *e)
-		}
 		resolvedAddrPerCNAME = append(resolvedAddrPerCNAME, edgeAddrs)
 	}
 
@@ -190,6 +187,7 @@ func ResolveAddrs(addrs []string, log *zerolog.Logger) (resolved []*EdgeAddr) {
 			UDP:       udpAddr,
 			IPVersion: version,
 		})
+
 	}
 	return
 }