makes span use init() to run before server.New (#597)

api/server/init.go

@@ -5,21 +5,12 @@ import (
 	"os"
 	"os/signal"
 	"strconv"
-	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
 
 func init() {
-	var err error
-	currDir, err = os.Getwd()
-	if err != nil {
-		logrus.WithError(err).Fatalln("")
-	}
-	// Replace forward slashes in case this is windows, URL parser errors
-	currDir = strings.Replace(currDir, "\\", "/", -1)
-
 	logLevel, err := logrus.ParseLevel(getEnv(EnvLogLevel, DefaultLogLevel))
 	if err != nil {
 		logrus.WithError(err).Fatalln("Invalid log level.")
@@ -30,6 +21,11 @@ func init() {
 	if logLevel == logrus.DebugLevel {
 		gin.SetMode(gin.DebugMode)
 	}
+
+	// do this in init so that it's only run once & before server.New() which may
+	// start things that use spans, which are global.
+	// TODO there's not a great reason that our fn spans don't work w/ noop spans, should fix this really.
+	setupTracer(getEnv(EnvZipkinURL, ""))
 }
 
 func getEnv(key, fallback string) string {

api/server/server.go

@@ -28,10 +28,6 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var (
-	currDir string
-)
-
 const (
 	EnvLogLevel  = "FN_LOG_LEVEL"
 	EnvMQURL     = "FN_MQ_URL"
@@ -81,14 +77,14 @@ func nodeTypeFromString(value string) ServerNodeType {
 
 // NewFromEnv creates a new Functions server based on env vars.
 func NewFromEnv(ctx context.Context, opts ...ServerOption) *Server {
+	curDir := pwd()
 	var defaultDB, defaultMQ string
 	nodeType := nodeTypeFromString(getEnv(EnvNodeType, "")) // default to full
 	if nodeType != ServerTypeRunner {
 		// only want to activate these for full and api nodes
-		defaultDB = fmt.Sprintf("sqlite3://%s/data/fn.db", currDir)
+		defaultDB = fmt.Sprintf("sqlite3://%s/data/fn.db", curDir)
-		defaultMQ = fmt.Sprintf("bolt://%s/data/fn.mq", currDir)
+		defaultMQ = fmt.Sprintf("bolt://%s/data/fn.mq", curDir)
 	}
-	opts = append(opts, WithZipkin(getEnv(EnvZipkinURL, "")))
 	opts = append(opts, WithDBURL(getEnv(EnvDBURL, defaultDB)))
 	opts = append(opts, WithMQURL(getEnv(EnvMQURL, defaultMQ)))
 	opts = append(opts, WithLogURL(getEnv(EnvLOGDBURL, "")))
@@ -97,6 +93,15 @@ func NewFromEnv(ctx context.Context, opts ...ServerOption) *Server {
 	return New(ctx, opts...)
 }
 
+func pwd() string {
+	cwd, err := os.Getwd()
+	if err != nil {
+		logrus.WithError(err).Fatalln("couldn't get working directory, possibly unsupported platform?")
+	}
+	// Replace forward slashes in case this is windows, URL parser errors
+	return strings.Replace(cwd, "\\", "/", -1)
+}
+
 func WithDBURL(dbURL string) ServerOption {
 	if dbURL != "" {
 		ds, err := datastore.New(dbURL)
@@ -209,10 +214,8 @@ func New(ctx context.Context, opts ...ServerOption) *Server {
 	return s
 }
 
-// TODO this doesn't need to be an option necessarily since it's just setting
+// TODO need to fix this to handle the nil case better
-// globals but it makes things uniform. change if you've a better idear
+func setupTracer(zipkinURL string) {
-func WithZipkin(zipkinURL string) ServerOption {
-	return func(s *Server) {
 	var (
 		debugMode          = false
 		serviceName        = "fnserver"
@@ -257,7 +260,6 @@ func WithZipkin(zipkinURL string) ServerOption {
 	opentracing.SetGlobalTracer(fntracer)
 	logrus.WithFields(logrus.Fields{"url": zipkinHTTPEndpoint}).Info("started tracer")
 }
-}
 
 func setMachineID() {
 	port := uint16(getEnvInt(EnvPort, DefaultPort))