fork of https://github.com/sourcegraph/zoekt
webserver: log traceID in WithTrace instead of field (#415)
* webserver: log traceID in WithTrace instead of field
* bump sourcegraph/log
author
Robert Lin
committer
GitHub
date
(Aug 26, 2022, 7:53 AM -0700)
commit
6a91f0b7
6a91f0b753c92b3b9cee9cbc90071ef0957d7f6d
parent
19e4a677
19e4a677f5ab861c354297fc941d12a2623fc40f
+29
-19
+23
-17
cmd/zoekt-webserver/main.go
+23
-17
cmd/zoekt-webserver/main.go
···
425
425
}
426
426
427
427
func (s *loggedSearcher) log(ctx context.Context, q query.Q, opts *zoekt.SearchOptions, st *zoekt.Stats, err error) {
428
-
logger := s.Logger.With(
429
-
sglog.String("query", q.String()),
430
-
sglog.String("traceID", traceID(ctx)),
431
-
sglog.Bool("opts.EstimateDocCount", opts.EstimateDocCount),
432
-
sglog.Bool("opts.Whole", opts.Whole),
433
-
sglog.Int("opts.ShardMaxMatchCount", opts.ShardMaxMatchCount),
434
-
sglog.Int("opts.TotalMaxMatchCount", opts.TotalMaxMatchCount),
435
-
sglog.Int("opts.ShardMaxImportantMatch", opts.ShardMaxImportantMatch),
436
-
sglog.Int("opts.TotalMaxImportantMatch", opts.TotalMaxImportantMatch),
437
-
sglog.Duration("opts.MaxWallTime", opts.MaxWallTime),
438
-
sglog.Int("opts.MaxDocDisplayCount", opts.MaxDocDisplayCount),
439
-
)
428
+
logger := s.Logger.
429
+
WithTrace(traceContext(ctx)).
430
+
With(
431
+
sglog.String("query", q.String()),
432
+
sglog.Bool("opts.EstimateDocCount", opts.EstimateDocCount),
433
+
sglog.Bool("opts.Whole", opts.Whole),
434
+
sglog.Int("opts.ShardMaxMatchCount", opts.ShardMaxMatchCount),
435
+
sglog.Int("opts.TotalMaxMatchCount", opts.TotalMaxMatchCount),
436
+
sglog.Int("opts.ShardMaxImportantMatch", opts.ShardMaxImportantMatch),
437
+
sglog.Int("opts.TotalMaxImportantMatch", opts.TotalMaxImportantMatch),
438
+
sglog.Duration("opts.MaxWallTime", opts.MaxWallTime),
439
+
sglog.Int("opts.MaxDocDisplayCount", opts.MaxDocDisplayCount),
440
+
)
440
441
if err != nil {
441
442
logger.Error("search failed", sglog.Error(err))
442
443
return
···
465
466
)
466
467
}
467
468
468
-
// traceID returns a trace ID, if any, found in the given context.
469
-
func traceID(ctx context.Context) string {
469
+
func traceContext(ctx context.Context) sglog.TraceContext {
470
470
otSpan := opentracing.SpanFromContext(ctx)
471
471
if otSpan != nil {
472
472
if jaegerSpan, ok := otSpan.Context().(jaeger.SpanContext); ok {
473
-
return jaegerSpan.TraceID().String()
473
+
return sglog.TraceContext{
474
+
TraceID: jaegerSpan.TraceID().String(),
475
+
SpanID: jaegerSpan.SpanID().String(),
476
+
}
474
477
}
475
478
}
476
479
477
480
if otelSpan := oteltrace.SpanFromContext(ctx).SpanContext(); otelSpan.IsValid() {
478
-
return otelSpan.TraceID().String()
481
+
return sglog.TraceContext{
482
+
TraceID: otelSpan.TraceID().String(),
483
+
SpanID: otelSpan.SpanID().String(),
484
+
}
479
485
}
480
486
481
-
return ""
487
+
return sglog.TraceContext{}
482
488
}
483
489
484
490
var (
+2
-2
go.mod
+2
-2
go.mod
···
25
25
github.com/prometheus/client_golang v1.12.1
26
26
github.com/rs/xid v1.4.0
27
27
github.com/sourcegraph/go-ctags v0.0.0-20220611154803-db463692f037
28
-
github.com/sourcegraph/log v0.0.0-20220818075705-a73424c8bbf9
28
+
github.com/sourcegraph/log v0.0.0-20220822162457-5c757f638021
29
29
github.com/uber/jaeger-client-go v2.30.0+incompatible
30
30
github.com/uber/jaeger-lib v2.4.1+incompatible
31
31
github.com/xanzy/go-gitlab v0.64.0
···
100
100
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.9.0 // indirect
101
101
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
102
102
go.uber.org/multierr v1.8.0 // indirect
103
-
go.uber.org/zap v1.21.0 // indirect
103
+
go.uber.org/zap v1.22.0 // indirect
104
104
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
105
105
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
106
106
golang.org/x/text v0.3.7 // indirect
+4
go.sum
+4
go.sum
···
557
557
github.com/sourcegraph/go-ctags v0.0.0-20220611154803-db463692f037/go.mod h1:ZYjpRXoJrRlxjU9ZfpaUKJkk62AjhJPffN3rlw2aqxM=
558
558
github.com/sourcegraph/log v0.0.0-20220818075705-a73424c8bbf9 h1:5BzCls0tdAx2EVVxQlVQKowvr31Y5v5iQAIur47XsWo=
559
559
github.com/sourcegraph/log v0.0.0-20220818075705-a73424c8bbf9/go.mod h1:zWEPlKrWBUVpko/tOgDS+qrp7BmzaCcmUrh9+ver1iQ=
560
+
github.com/sourcegraph/log v0.0.0-20220822162457-5c757f638021 h1:IngqLdQQ/n42AbcQqayqJeEdPg2tOwbleeIZtZEriBo=
561
+
github.com/sourcegraph/log v0.0.0-20220822162457-5c757f638021/go.mod h1:UxiwB6C3xk3xOySJpW1R0MDUyfGuJRFS5Z8C+SA5p2I=
560
562
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
561
563
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
562
564
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
···
650
652
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
651
653
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
652
654
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
655
+
go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0=
656
+
go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U=
653
657
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
654
658
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
655
659
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=