Merge pull request #3325 from weaveworks/trace-context-detect

Add middleware to detect jaeger trace context over HTTP
weaveworks · Aug 28, 2018 · 4e08ea0 · 4e08ea0
2 parents 2215e66 + 67b887c
commit 4e08ea0
Show file tree

Hide file tree

Showing 8 changed files with 1,081 additions and 91 deletions.
diff --git a/prog/app.go b/prog/app.go
@@ -70,11 +70,15 @@ func router(collector app.Collector, controlRouter app.ControlRouter, pipeRouter
 			uiHandler))
 	router.PathPrefix("/").Name("static").Handler(uiHandler)
 
-	instrument := middleware.Instrument{
-		RouteMatcher: router,
-		Duration:     requestDuration,
-	}
-	return instrument.Wrap(router)
+	middlewares := middleware.Merge(
+		middleware.Instrument{
+			RouteMatcher: router,
+			Duration:     requestDuration,
+		},
+		middleware.Tracer{},
+	)
+
+	return middlewares.Wrap(router)
 }
 
 func collectorFactory(userIDer multitenant.UserIDer, collectorURL, s3URL, natsHostname string,