Address Feedback From PR Review

Signed-off-by: Mahad Zaryab <[email protected]>

cmd/query/app/static_handler.go

@@ -76,10 +76,6 @@ type loadedConfig struct {
 
 // NewStaticAssetsHandler returns a StaticAssetsHandler
 func NewStaticAssetsHandler(staticAssetsRoot string, options StaticAssetsHandlerOptions) (*StaticAssetsHandler, error) {
-	if options.Logger == nil {
-		options.Logger = zap.NewNop()
-	}
-
 	assetsFS := ui.GetStaticFiles(options.Logger)
 	if staticAssetsRoot != "" {
 		assetsFS = http.Dir(staticAssetsRoot)

cmd/query/app/ui/assets.go

@@ -24,7 +24,7 @@ var placeholderAssetsFS embed.FS
 // non-functional index.html is returned to be used as a placeholder.
 func GetStaticFiles(logger *zap.Logger) http.FileSystem {
 	if _, err := actualAssetsFS.ReadFile("actual/index.html.gz"); err != nil {
-		logger.Warn("ui assets not found", zap.Error(err))
+		logger.Warn("ui assets not embedded in the binary, using a placeholder", zap.Error(err))
 		return httpfs.PrefixedFS("placeholder", http.FS(placeholderAssetsFS))
 	}
 

cmd/query/app/ui/assets_test.go

@@ -6,11 +6,11 @@ package ui
 import (
 	"embed"
 	"io"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 func TestGetStaticFiles_ReturnsPlaceholderWhenActualNotPresent(t *testing.T) {
@@ -20,11 +20,12 @@ func TestGetStaticFiles_ReturnsPlaceholderWhenActualNotPresent(t *testing.T) {
 	actualAssetsFS = embed.FS{}
 	t.Cleanup(func() { actualAssetsFS = currentActualAssets })
 
-	fs := GetStaticFiles(zap.NewNop())
+	logger, logBuf := testutils.NewLogger()
+	fs := GetStaticFiles(logger)
 	file, err := fs.Open("/index.html")
 	require.NoError(t, err)
-	buf := new(strings.Builder)
-	_, err = io.Copy(buf, file)
+	bytes, err := io.ReadAll(file)
 	require.NoError(t, err)
-	require.Contains(t, buf.String(), "This is a placeholder for the Jaeger UI home page")
+	require.Contains(t, string(bytes), "This is a placeholder for the Jaeger UI home page")
+	require.Contains(t, logBuf.String(), "ui assets not embedded in the binary, using a placeholder")
 }