From 67b887cb5d6d42a932cb55dffb42fa6969f084cb Mon Sep 17 00:00:00 2001 From: Marcus Cobden Date: Thu, 23 Aug 2018 13:02:09 +0100 Subject: [PATCH] Add middleware to detect trace context on HTTP --- prog/app.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/prog/app.go b/prog/app.go index 91d0d09ff..234fe51e1 100644 --- 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,