Set global tracer

Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Sep 5, 2018 · d2935ff · d2935ff
1 parent c4b02c8
commit d2935ff
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/cmd/query/main.go b/cmd/query/main.go
@@ -24,9 +24,11 @@ import (
 	"syscall"
 
 	"github.com/gorilla/handlers"
+	"github.com/opentracing/opentracing-go"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	jaegerClientConfig "github.com/uber/jaeger-client-go/config"
+	jaegerClientZapLog "github.com/uber/jaeger-client-go/log/zap"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/env"
@@ -86,11 +88,16 @@ func main() {
 					Param: 1.0,
 				},
 				RPCMetrics: true,
-			}.New("jaeger-query", jaegerClientConfig.Metrics(baseFactory.Namespace("client", nil)))
+			}.New(
+				"jaeger-query",
+				jaegerClientConfig.Metrics(baseFactory.Namespace("client", nil)),
+				jaegerClientConfig.Logger(jaegerClientZapLog.NewLogger(logger)),
+			)
 			if err != nil {
 				logger.Fatal("Failed to initialize tracer", zap.Error(err))
 			}
 			defer closer.Close()
+			opentracing.SetGlobalTracer(tracer)
 
 			storageFactory.InitFromViper(v)
 			if err := storageFactory.Initialize(baseFactory, logger); err != nil {

diff --git a/cmd/standalone/main.go b/cmd/standalone/main.go
@@ -26,10 +26,12 @@ import (
 	"syscall"
 
 	"github.com/gorilla/mux"
+	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	jaegerClientConfig "github.com/uber/jaeger-client-go/config"
+	jaegerClientZapLog "github.com/uber/jaeger-client-go/log/zap"
 	"github.com/uber/jaeger-lib/metrics"
 	"github.com/uber/tchannel-go"
 	"github.com/uber/tchannel-go/thrift"
@@ -277,10 +279,16 @@ func startQuery(
 			Param: 1.0,
 		},
 		RPCMetrics: true,
-	}.New("jaeger-query", jaegerClientConfig.Metrics(baseFactory.Namespace("client", nil)))
+	}.New(
+		"jaeger-query",
+		jaegerClientConfig.Metrics(baseFactory.Namespace("client", nil)),
+		jaegerClientConfig.Logger(jaegerClientZapLog.NewLogger(logger)),
+	)
 	if err != nil {
 		logger.Fatal("Failed to initialize tracer", zap.Error(err))
 	}
+	opentracing.SetGlobalTracer(tracer)
+
 	apiHandler := queryApp.NewAPIHandler(
 		spanReader,
 		depReader,

diff --git a/plugin/storage/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go
@@ -146,10 +146,17 @@ func (s *SpanReader) GetOperations(ctx context.Context, service string) ([]strin
 	return s.operationNamesReader(service)
 }
 
+func lazyLogTraceID(traceID dbmodel.TraceID) func(fv otlog.Encoder) {
+	// unfortunately, this requires an allocation, due to the way OT API is defined.
+	return func(fv otlog.Encoder) {
+		fv.EmitObject("trace_id", traceID)
+	}
+}
+
 func (s *SpanReader) readTrace(ctx context.Context, traceID dbmodel.TraceID) (*model.Trace, error) {
 	span, ctx := startSpanForQuery(ctx, "readTrace", querySpanByTraceID)
 	defer span.Finish()
-	span.SetTag("traceID", traceID)
+	span.LogFields(otlog.String("event", "searching"), otlog.Lazy(lazyLogTraceID(traceID)))
 
 	trace, err := s.readTraceInSpan(ctx, traceID)
 	logErrorToSpan(span, err)