Fix tests

Signed-off-by: Yuri Shkuro <ys@uber.com>

Author: Yuri Shkuro

cmd/agent/app/builder.go

@@ -154,8 +154,8 @@ func (b *Builder) CreateAgent(logger *zap.Logger) (*Agent, error) {
 		return nil, err
 	}
 	httpServer := b.HTTPServer.GetHTTPServer(b.CollectorServiceName, mainReporter.Channel(), mFactory)
-	if b.metricsFactory == nil {
-		httpServer.Handler.(*http.ServeMux).Handle(b.Metrics.HTTPRoute, b.Metrics.Handler())
+	if h := b.Metrics.Handler(); b.metricsFactory != nil && h != nil {
+		httpServer.Handler.(*http.ServeMux).Handle(b.Metrics.HTTPRoute, h)
 	}
 	return NewAgent(processors, httpServer, logger), nil
 }

pkg/metrics/builder_test.go

@@ -16,7 +16,6 @@ package metrics
 
 import (
 	"flag"
-	"net/http"
 	"testing"
 
 	"github.com/spf13/cobra"
@@ -89,9 +88,7 @@ func TestBuilder(t *testing.T) {
 		}
 		require.NotNil(t, mf)
 		if testCase.handler {
-			require.NotNil(t, b.handler)
-			mux := http.NewServeMux()
-			b.RegisterHandler(mux.Handle)
+			require.NotNil(t, b.Handler())
 		}
 	}
 }