use httprouter and cactus

CHANGELOG.md

@@ -1,7 +1,6 @@
 ## 0.10.0 (2021-04-05)
   * Default HTTP port changed to 8825
   * Configure HTTP timeouts through `--http-timeout-read`, `--http-timeout-write` and `--http-timeout-idle`
-  * Allow to configure router through `--http-router-name`
 
 ## 0.9 (2019-01-29)
   * TLS Secure connection listening

Makefile

@@ -93,7 +93,7 @@ run-trace:
 	go tool trace /tmp/statsd-http-proxt-trace
 
 run-siege:
-	time siege -c 150 -r 5000 -H 'Connection: close' -H 'X-JWT-Token:eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJzdGF0c2QtcmVzdC1zZXJ2ZXIiLCJpYXQiOjE1MDY5NzI1ODAsImV4cCI6MTg4NTY2Mzc4MCwiYXVkIjoiaHR0cHM6Ly9naXRodWIuY29tL3Nva2lsL3N0YXRzZC1yZXN0LXNlcnZlciIsInN1YiI6InNva2lsIn0.sOb0ccRBnN1u9IP2jhJrcNod14G5t-jMHNb_fsWov5c' "http://127.0.0.1:8080/count/a.b.c.d POST value=42"
+	time siege -c 150 -r 2000 -H 'Connection: close' -H 'X-JWT-Token:eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJzdGF0c2QtcmVzdC1zZXJ2ZXIiLCJpYXQiOjE1MDY5NzI1ODAsImV4cCI6MTg4NTY2Mzc4MCwiYXVkIjoiaHR0cHM6Ly9naXRodWIuY29tL3Nva2lsL3N0YXRzZC1yZXN0LXNlcnZlciIsInN1YiI6InNva2lsIn0.sOb0ccRBnN1u9IP2jhJrcNod14G5t-jMHNb_fsWov5c' "http://127.0.0.1:8080/count/a.b.c.d POST value=42"
 
 run-wrk:
 	docker run --rm --network="host" -v $(CURDIR):/proxy williamyeh/wrk -c 1 -t 1 -d 20 -s /proxy/bench/wrk.lua http://127.0.0.1:8080/count/a.b.c.d

main.go

@@ -50,14 +50,15 @@ func main() {
 	var tokenSecret = flag.String("jwt-secret", "", "Secret to encrypt JWT")
 	var verbose = flag.Bool("verbose", false, "Verbose")
 	var version = flag.Bool("version", false, "Show version")
-	var httpRouterName = flag.String("http-router-name", "GorillaMux", "Type of HTTP router. Allowed values are GorillaMux and HttpRouter. Do not use in production.")
+	var httpRouterName = flag.String("http-router-name", "HttpRouter", "Type of HTTP router. Allowed values are GorillaMux and HttpRouter. Do not use in production.")
+	var statsdClientName = flag.String("statsd-client-name", "Cactus", "Type of StatsD client. Allowed values are Cactus and GoMetric. Do not use in production.")
 	var profilerHTTPort = flag.Int("profiler-http-port", 0, "Start profiler localhost")
 
 	// get flags
 	flag.Parse()
 
 	// show version and exit
-	if *version == true {
+	if *version {
 		fmt.Printf(
 			"StatsD HTTP Proxy v.%s, build %s from %s\n",
 			Version,
@@ -97,6 +98,7 @@ func main() {
 		*tokenSecret,
 		*verbose,
 		*httpRouterName,
+		*statsdClientName,
 	)
 
 	proxyServer.Listen()

proxy/server.go

@@ -41,6 +41,7 @@ func NewServer(
 	tokenSecret string,
 	verbose bool,
 	httpRouterName string,
+	statsdClientName string,
 ) *Server {
 	// configure logging
 	var logOutput io.Writer
@@ -55,14 +56,12 @@ func NewServer(
 	logger := log.New(logOutput, "", log.LstdFlags)
 
 	// create StatsD Client
-	statsdClientName := "Cactus"
-
 	var statsdClient statsdclient.StatsdClientInterface
 	switch statsdClientName {
-	case "GoMetric":
-		statsdClient = statsdclient.NewGoMetricClient(statsdHost, statsdPort)
 	case "Cactus":
 		statsdClient = statsdclient.NewCactusClient(statsdHost, statsdPort)
+	case "GoMetric":
+		statsdClient = statsdclient.NewGoMetricClient(statsdHost, statsdPort)
 	default:
 		panic("Passed statsd client not supported")
 	}
@@ -76,10 +75,11 @@ func NewServer(
 	// build router
 	var httpServerHandler http.Handler
 	switch httpRouterName {
-	case "GorillaMux":
-		httpServerHandler = router.NewGorillaMuxRouter(routeHandler, tokenSecret)
 	case "HttpRouter":
 		httpServerHandler = router.NewHTTPRouter(routeHandler, tokenSecret)
+	case "GorillaMux":
+		httpServerHandler = router.NewGorillaMuxRouter(routeHandler, tokenSecret)
+
 	default:
 		panic("Passed HTTP router not supported")
 	}

proxy/server_test.go

@@ -22,13 +22,14 @@ func TestNewServerWithGorillaMuxRouter(t *testing.T) {
 		"someTokenSecret",
 		true,
 		"GorillaMux",
+		"Cactus",
 	)
 
 	require.Equal(t, "*proxy.Server", reflect.TypeOf(proxyServer).String())
 
 	require.Equal(t, "127.0.0.1:8080", proxyServer.httpAddress)
 
-	require.Equal(t, "*statsd.Client", reflect.TypeOf(proxyServer.statsdClient).String())
+	require.Equal(t, "*statsdclient.CactusStatsdClientAdapter", reflect.TypeOf(proxyServer.statsdClient).String())
 
 	require.Equal(t, "tls.crt", proxyServer.tlsCert)
 
@@ -50,13 +51,14 @@ func TestNewServerWithHttpRouter(t *testing.T) {
 		"someTokenSecret",
 		true,
 		"HttpRouter",
+		"Cactus",
 	)
 
 	require.Equal(t, "*proxy.Server", reflect.TypeOf(proxyServer).String())
 
 	require.Equal(t, "127.0.0.1:8080", proxyServer.httpAddress)
 
-	require.Equal(t, "*statsd.Client", reflect.TypeOf(proxyServer.statsdClient).String())
+	require.Equal(t, "*statsdclient.CactusStatsdClientAdapter", reflect.TypeOf(proxyServer.statsdClient).String())
 
 	require.Equal(t, "tls.crt", proxyServer.tlsCert)