wip fix tests

cmd/cli/main.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/multiplay/go-svrquery/lib/svrquery"
 	"log"
 	"os"
 
+	"github.com/multiplay/go-svrquery/lib/svrquery"
 	"github.com/multiplay/go-svrquery/lib/svrquery/protocol"
 	"github.com/multiplay/go-svrquery/lib/svrsample"
 	"github.com/multiplay/go-svrquery/lib/svrsample/common"

lib/svrquery/client.go

@@ -73,29 +73,26 @@ func NewClient(proto, addr string, options ...Option) (*Client, error) {
 	}
 	c.Queryer = f(c)
 
-	// TODO: move keys & timeout to transport?
-	for _, o := range options {
-		if err := o(c); err != nil {
-			return nil, err
-		}
-	}
-
 	var t transport
 	switch proto {
-	case "sqp":
-		t = &udpTransport{address: addr}
 	case "prom":
 		t = &httpTransport{address: addr}
 	default:
-		return nil, fmt.Errorf("protocol %s not supported", proto)
+		// defaulting to udp
+		t = &udpTransport{address: addr}
+	}
+	c.transport = t
+
+	for _, o := range options {
+		if err := o(c); err != nil {
+			return nil, err
+		}
 	}
 
 	if err := t.Setup(); err != nil {
 		return nil, fmt.Errorf("setup client transport: %w", err)
 	}
 
-	c.transport = t
-
 	return c, nil
 }
 

lib/svrquery/protocol/prom/query.go

@@ -3,10 +3,11 @@ package prom
 import (
 	"bytes"
 	"fmt"
-	"github.com/multiplay/go-svrquery/lib/svrquery/protocol"
-	"github.com/prometheus/common/expfmt"
 	"io"
 	"strconv"
+
+	"github.com/multiplay/go-svrquery/lib/svrquery/protocol"
+	"github.com/prometheus/common/expfmt"
 )
 
 const defaultBufSize = 4096