Fix empty static files

Signed-off-by: Pavol Loffay <[email protected]>

Makefile

@@ -116,8 +116,13 @@ build-query-linux:
 build-collector-linux:
 	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/collector/collector-linux ./cmd/collector/main.go
 
+.PHONY: docker-no-ui
+docker-no-ui: build-agent-linux build-collector-linux build-query-linux build-crossdock-linux
+	mkdir -p jaeger-ui-build/build/
+	make docker-images-only
+
 .PHONY: docker
-docker: build_ui build-agent-linux build-collector-linux build-query-linux build-crossdock-linux docker-images-only
+docker: build_ui docker-no-ui
 
 .PHONY: docker-images-only
 docker-images-only:
@@ -151,7 +156,7 @@ build-crossdock-linux:
 include crossdock/rules.mk
 
 .PHONY: build-crossdock
-build-crossdock: docker
+build-crossdock: docker-no-ui
 	make crossdock
 
 .PHONY: build-crossdock-fresh

cmd/query/app/static_handler.go

@@ -27,10 +27,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-const (
-	defaultStaticAssetsRoot = "jaeger-ui-build/build/"
-)
-
 var (
 	staticRootFiles = []string{"favicon.ico"}
 	configPattern   = regexp.MustCompile("JAEGER_CONFIG *= *DEFAULT_CONFIG;")
@@ -45,7 +41,7 @@ type StaticAssetsHandler struct {
 // NewStaticAssetsHandler returns a StaticAssetsHandler
 func NewStaticAssetsHandler(staticAssetsRoot string, uiConfig string) (*StaticAssetsHandler, error) {
 	if staticAssetsRoot == "" {
-		staticAssetsRoot = defaultStaticAssetsRoot
+		return nil, nil
 	}
 	if !strings.HasSuffix(staticAssetsRoot, "/") {
 		staticAssetsRoot = staticAssetsRoot + "/"

cmd/query/main.go

@@ -98,13 +98,17 @@ func main() {
 				app.HandlerOptions.Prefix(queryOpts.Prefix),
 				app.HandlerOptions.Logger(logger),
 				app.HandlerOptions.Tracer(tracer))
+			r := mux.NewRouter()
 			staticHandler, err := app.NewStaticAssetsHandler(queryOpts.StaticAssets, queryOpts.UIConfig)
 			if err != nil {
 				logger.Fatal("Could not create static assets handler", zap.Error(err))
 			}
-			r := mux.NewRouter()
+			if staticHandler != nil {
+				staticHandler.RegisterRoutes(r)
+			} else {
+				logger.Info("Static handler is not registered")
+			}
 			apiHandler.RegisterRoutes(r)
-			staticHandler.RegisterRoutes(r)
 			portStr := ":" + strconv.Itoa(queryOpts.Port)
 			recoveryHandler := recoveryhandler.NewRecoveryHandler(logger, true)
 

cmd/standalone/main.go

@@ -221,12 +221,16 @@ func startQuery(
 		queryApp.HandlerOptions.Prefix(qOpts.Prefix),
 		queryApp.HandlerOptions.Logger(logger),
 		queryApp.HandlerOptions.Tracer(tracer))
+	r := mux.NewRouter()
 	staticHandler, err := queryApp.NewStaticAssetsHandler(qOpts.StaticAssets, qOpts.UIConfig)
 	if err != nil {
 		logger.Fatal("Could not create static assets handler", zap.Error(err))
 	}
-	r := mux.NewRouter()
-	apiHandler.RegisterRoutes(r)
+	if staticHandler != nil {
+		apiHandler.RegisterRoutes(r)
+	} else {
+		logger.Info("Static handler is not registered")
+	}
 	staticHandler.RegisterRoutes(r)
 	portStr := ":" + strconv.Itoa(qOpts.Port)
 	recoveryHandler := recoveryhandler.NewRecoveryHandler(logger, true)

crossdock/docker-compose.yml

@@ -76,3 +76,8 @@ services:
         image: jaegertracing/test-driver
         ports:
             - "8080"
+
+    jaeger-query:
+#    override to disable static files
+      command: ["/go/bin/query-linux", "--query.static-files=", "--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]
+