Supporting multiple metrics (#16)

Author: Hedingber

.travis.yml

@@ -10,7 +10,7 @@ addons:
 
 language: go
 go_import_path: github.com/v3io/sidecar-proxy
-go: "1.11"
+go: "1.13"
 
 script:
   - make

Makefile

@@ -9,7 +9,7 @@ all: lint build
 
 .PHONY: build
 build:
-	docker build --tag=$(PROXY_REPOSITORY)sidecar-proxy:$(PROXY_TAG) .
+	docker build -f cmd/sidecarproxy/Dockerfile --tag=$(PROXY_REPOSITORY)sidecar-proxy:$(PROXY_TAG) .
 
 .PHONY: ensure-gopath bin
 bin:
@@ -18,14 +18,12 @@ bin:
 .PHONY: lint
 lint: ensure-gopath
 	@echo Installing linters...
-	go get -u gopkg.in/alecthomas/gometalinter.v2
-	@$(GOPATH)/bin/gometalinter.v2 --install
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.21.0
 
 	@echo Linting...
-	@$(GOPATH)/bin/gometalinter.v2 \
+	@$(GOPATH)/bin/golangci-lint run \
 		--deadline=300s \
 		--disable-all \
-		--enable-gc \
 		--enable=deadcode \
 		--enable=goconst \
 		--enable=gofmt \
@@ -44,7 +42,7 @@ lint: ensure-gopath
 		--exclude="comment on" \
 		--exclude="error should be the last" \
 		--exclude="should have comment" \
-		./app/...
+		./pkg/...
 
 	@echo Done.
 

app/metrics.go

@@ -1,11 +1,11 @@
-FROM golang:1.11 as builder
+FROM golang:1.13 as builder
 
 # copy source tree
 WORKDIR /go/src/github.com/v3io/sidecar-proxy
 COPY . .
 
 # build the app
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags="-s -w" -o proxy_server main.go
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags="-s -w" -o proxy_server cmd/sidecarproxy/main.go
 
 #
 # Output stage: Copies binary to an alpine based image

app/server.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/v3io/sidecar-proxy/pkg/common"
+	"github.com/v3io/sidecar-proxy/pkg/sidecarproxy"
+
+	"github.com/nuclio/errors"
+	"github.com/nuclio/loggerus"
+	"github.com/sirupsen/logrus"
+)
+
+func run() error {
+	var metricNames common.StringArrayFlag
+
+	// args
+	listenAddress := flag.String("listen-addr", os.Getenv("PROXY_LISTEN_ADDRESS"), "Port to listen on")
+	forwardAddress := flag.String("forward-addr", os.Getenv("PROXY_FORWARD_ADDRESS"), "IP /w port to forward to (without protocol)")
+	namespace := flag.String("namespace", os.Getenv("PROXY_NAMESPACE"), "Kubernetes namespace")
+	serviceName := flag.String("service-name", os.Getenv("PROXY_SERVICE_NAME"), "Service which the proxy serves")
+	instanceName := flag.String("instance-name", os.Getenv("PROXY_INSTANCE_NAME"), "Deployment instance name")
+	logLevel := flag.String("log-level", os.Getenv("LOG_LEVEL"), "Set proxy's log level")
+	flag.Var(&metricNames, "metric-name", "Set which metrics to collect")
+	flag.Parse()
+
+	// logger conf
+	parsedLogLevel, err := logrus.ParseLevel(*logLevel)
+	if err != nil {
+		errors.Wrap(err, "Failed to parse log level")
+	}
+	logger, err := loggerus.NewTextLoggerus("main", parsedLogLevel, os.Stdout, true)
+	if err != nil {
+		errors.Wrap(err, "Failed to create new logger")
+	}
+
+	if len(metricNames) == 0 {
+		return errors.New("at least one metric name should be given")
+	}
+
+	// server start
+	server, err := sidecarproxy.NewServer(logger, *listenAddress, *forwardAddress, *namespace, *serviceName, *instanceName, metricNames)
+	if err != nil {
+		errors.Wrap(err, "Failed to create new server")
+	}
+	if err = server.Start(); err != nil {
+		errors.Wrap(err, "Failed to start server")
+	}
+
+	return nil
+}
+
+func main() {
+	if err := run(); err != nil {
+		errors.PrintErrorStack(os.Stderr, err, 5)
+		os.Exit(1)
+	}
+
+	os.Exit(0)
+}

Dockerfile cmd/sidecarproxy/DockerfileDockerfile renamed to cmd/sidecarproxy/Dockerfile

@@ -0,0 +1,17 @@
+module github.com/v3io/sidecar-proxy
+
+go 1.13
+
+require (
+	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
+	github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf // indirect
+	github.com/gorilla/websocket v1.4.1
+	github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c
+	github.com/nuclio/errors v0.0.1
+	github.com/nuclio/logger v0.0.1
+	github.com/nuclio/loggerus v0.0.1
+	github.com/prometheus/client_golang v1.2.1
+	github.com/sirupsen/logrus v1.4.2
+	gopkg.in/alecthomas/gometalinter.v2 v2.0.12 // indirect
+	gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c // indirect
+)