Avoid global by passing metricsGraphURL down

app/api_report_test.go

@@ -14,7 +14,7 @@ import (
 
 func topologyServer() *httptest.Server {
 	router := mux.NewRouter().SkipClean(true)
-	app.RegisterTopologyRoutes(router, app.StaticCollector(fixture.Report), map[string]bool{"foo_capability": true})
+	app.RegisterTopologyRoutes(router, app.StaticCollector(fixture.Report), map[string]bool{"foo_capability": true}, "")
 	return httptest.NewServer(router)
 }
 

app/api_topologies.go

@@ -548,17 +548,17 @@ func (r *Registry) RendererForTopology(topologyID string, values url.Values, rpt
 	return topology.renderer, nil, nil
 }
 
-type reporterHandler func(context.Context, Reporter, http.ResponseWriter, *http.Request)
+type reporterHandler func(context.Context, Reporter, string, http.ResponseWriter, *http.Request)
 
-func captureReporter(rep Reporter, f reporterHandler) CtxHandlerFunc {
+func captureReporter(rep Reporter, metricsGraphURL string, f reporterHandler) CtxHandlerFunc {
 	return func(ctx context.Context, w http.ResponseWriter, r *http.Request) {
-		f(ctx, rep, w, r)
+		f(ctx, rep, metricsGraphURL, w, r)
 	}
 }
 
-type rendererHandler func(context.Context, render.Renderer, render.Decorator, report.Report, http.ResponseWriter, *http.Request)
+type rendererHandler func(context.Context, render.Renderer, render.Decorator, report.Report, string, http.ResponseWriter, *http.Request)
 
-func (r *Registry) captureRenderer(rep Reporter, f rendererHandler) CtxHandlerFunc {
+func (r *Registry) captureRenderer(rep Reporter, metricGraphsURL string, f rendererHandler) CtxHandlerFunc {
 	return func(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 		var (
 			topologyID = mux.Vars(req)["topology"]
@@ -579,6 +579,6 @@ func (r *Registry) captureRenderer(rep Reporter, f rendererHandler) CtxHandlerFu
 			respondWith(w, http.StatusInternalServerError, err)
 			return
 		}
-		f(ctx, renderer, decorator, rpt, w, req)
+		f(ctx, renderer, decorator, rpt, metricGraphsURL, w, req)
 	}
 }

app/api_topologies_test.go

@@ -183,14 +183,14 @@ func getTestContainerLabelFilterTopologySummary(t *testing.T, exclude bool) (det
 		return nil, err
 	}
 
-	return detailed.Summaries(fixture.Report, renderer.Render(fixture.Report, decorator)), nil
+	return detailed.Summaries(fixture.Report, renderer.Render(fixture.Report, decorator), ""), nil
 }
 
 func TestAPITopologyAddsKubernetes(t *testing.T) {
 	router := mux.NewRouter()
 	c := app.NewCollector(1 * time.Minute)
 	app.RegisterReportPostHandler(c, router)
-	app.RegisterTopologyRoutes(router, c, map[string]bool{"foo_capability": true})
+	app.RegisterTopologyRoutes(router, c, map[string]bool{"foo_capability": true}, "")
 	ts := httptest.NewServer(router)
 	defer ts.Close()
 

app/api_topology.go

@@ -29,14 +29,14 @@ type APINode struct {
 }
 
 // Full topology.
-func handleTopology(ctx context.Context, renderer render.Renderer, decorator render.Decorator, report report.Report, w http.ResponseWriter, r *http.Request) {
+func handleTopology(ctx context.Context, renderer render.Renderer, decorator render.Decorator, report report.Report, metricsGraphURL string, w http.ResponseWriter, r *http.Request) {
 	respondWith(w, http.StatusOK, APITopology{
-		Nodes: detailed.Summaries(report, renderer.Render(report, decorator)),
+		Nodes: detailed.Summaries(report, renderer.Render(report, decorator), metricsGraphURL),
 	})
 }
 
 // Individual nodes.
-func handleNode(ctx context.Context, renderer render.Renderer, decorator render.Decorator, report report.Report, w http.ResponseWriter, r *http.Request) {
+func handleNode(ctx context.Context, renderer render.Renderer, decorator render.Decorator, report report.Report, metricsGraphURL string, w http.ResponseWriter, r *http.Request) {
 	var (
 		vars             = mux.Vars(r)
 		topologyID       = vars["topology"]
@@ -49,13 +49,14 @@ func handleNode(ctx context.Context, renderer render.Renderer, decorator render.
 		http.NotFound(w, r)
 		return
 	}
-	respondWith(w, http.StatusOK, APINode{Node: detailed.MakeNode(topologyID, report, rendered, node)})
+	respondWith(w, http.StatusOK, APINode{Node: detailed.MakeNode(topologyID, report, rendered, node, metricsGraphURL)})
 }
 
 // Websocket for the full topology.
 func handleWebsocket(
 	ctx context.Context,
 	rep Reporter,
+	metricsGraphURL string,
 	w http.ResponseWriter,
 	r *http.Request,
 ) {
@@ -123,7 +124,7 @@ func handleWebsocket(
 			log.Errorf("Error generating report: %v", err)
 			return
 		}
-		newTopo := detailed.Summaries(report, renderer.Render(report, decorator))
+		newTopo := detailed.Summaries(report, renderer.Render(report, decorator), metricsGraphURL)
 		diff := detailed.TopoDiff(previousTopo, newTopo)
 		previousTopo = newTopo
 

app/router.go

@@ -91,7 +91,7 @@ func gzipHandler(h http.HandlerFunc) http.HandlerFunc {
 }
 
 // RegisterTopologyRoutes registers the various topology routes with a http mux.
-func RegisterTopologyRoutes(router *mux.Router, r Reporter, capabilities map[string]bool) {
+func RegisterTopologyRoutes(router *mux.Router, r Reporter, capabilities map[string]bool, metricsGraphURL string) {
 	get := router.Methods("GET").Subrouter()
 	get.HandleFunc("/api",
 		gzipHandler(requestContextDecorator(apiHandler(r, capabilities))))
@@ -99,15 +99,15 @@ func RegisterTopologyRoutes(router *mux.Router, r Reporter, capabilities map[str
 		gzipHandler(requestContextDecorator(topologyRegistry.makeTopologyList(r))))
 	get.
 		HandleFunc("/api/topology/{topology}",
-			gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, handleTopology)))).
+			gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, metricsGraphURL, handleTopology)))).
 		Name("api_topology_topology")
 	get.
 		HandleFunc("/api/topology/{topology}/ws",
-			requestContextDecorator(captureReporter(r, handleWebsocket))). // NB not gzip!
+			requestContextDecorator(captureReporter(r, metricsGraphURL, handleWebsocket))). // NB not gzip!
 		Name("api_topology_topology_ws")
 	get.
 		MatcherFunc(URLMatcher("/api/topology/{topology}/{id}")).HandlerFunc(
-		gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, handleNode)))).
+		gzipHandler(requestContextDecorator(topologyRegistry.captureRenderer(r, metricsGraphURL, handleNode)))).
 		Name("api_topology_topology_id")
 	get.HandleFunc("/api/report",
 		gzipHandler(requestContextDecorator(makeRawReportHandler(r))))