From bcbd7b5c24376849c235706ff74c1c26438dbdea Mon Sep 17 00:00:00 2001
From: "docmerlin (j. Emrys Landivar)" <landivar@gmail.com>
Date: Tue, 30 Oct 2018 18:19:23 -0500
Subject: [PATCH] context handling for tasks and for HTTP endpoints for tasks
 and query

---
 cmd/influxd/main.go   | 10 ++++++++++
 http/query_service.go |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go
index 42b7080020..8a86bd6400 100644
--- a/cmd/influxd/main.go
+++ b/cmd/influxd/main.go
@@ -3,6 +3,8 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/influxdata/platform/snowflake"
+	"github.com/opentracing/opentracing-go"
 	nethttp "net/http"
 	_ "net/http/pprof"
 	"os"
@@ -33,6 +35,7 @@ import (
 	taskexecutor "github.com/influxdata/platform/task/backend/executor"
 	_ "github.com/influxdata/platform/tsdb/tsi1"
 	_ "github.com/influxdata/platform/tsdb/tsm1"
+	pzap "github.com/influxdata/platform/zap"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -153,6 +156,12 @@ func run() error {
 	}
 	defer logger.Sync()
 
+	// set tracing
+	tracer := new(pzap.Tracer)
+	tracer.Logger = logger
+	tracer.IDGenerator = snowflake.NewIDGenerator()
+	opentracing.SetGlobalTracer(tracer)
+
 	reg := prom.NewRegistry()
 	reg.MustRegister(prometheus.NewGoCollector())
 	reg.WithLogger(logger)
@@ -338,6 +347,7 @@ func run() error {
 		h := http.NewHandlerFromRegistry("platform", reg)
 		h.Handler = platformHandler
 		h.Logger = logger
+		h.Tracer = opentracing.GlobalTracer()
 
 		httpServer.Handler = h
 		logger.Info("Listening", zap.String("transport", "http"), zap.String("addr", httpBindAddress))
diff --git a/http/query_service.go b/http/query_service.go
index 893cc86ed6..334b9d3bb5 100644
--- a/http/query_service.go
+++ b/http/query_service.go
@@ -54,7 +54,6 @@ func (h *QueryHandler) handlePing(w http.ResponseWriter, r *http.Request) {
 // handlePostQuery is the HTTP handler for the POST /api/v2/query route.
 func (h *QueryHandler) handlePostQuery(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-
 	var req query.Request
 	req.WithCompilerMappings(h.CompilerMappings)
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {