Skip to content

Commit 4819b28

Browse files
authored
Merge pull request #642 from kuba--/enh-638/bblfsh-tracing
Use global open tracer
2 parents 7760b71 + dc449a7 commit 4819b28

File tree

94 files changed

+8452
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+8452
-118
lines changed

Gopkg.lock

Lines changed: 14 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454

5555
[[constraint]]
5656
name = "gopkg.in/bblfsh/client-go.v3"
57-
version = "3.1.0"
57+
version = "3.2.0"
5858

5959
[[override]]
6060
name = "gopkg.in/bblfsh/sdk.v1"
6161
version = "1.16.0"
6262

6363
[[constraint]]
6464
name = "gopkg.in/bblfsh/sdk.v2"
65-
version = "2.7.0"
65+
version = "2.11.0"
6666

6767
[[constraint]]
6868
name = "github.com/uber/jaeger-client-go"

cmd/gitbase/command/server.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,23 +146,19 @@ func (c *Server) Execute(args []string) error {
146146
Fatal("unable to read jaeger environment")
147147
return err
148148
}
149-
150149
if cfg.ServiceName == "" {
151150
cfg.ServiceName = TracerServiceName
152151
}
153152

154153
logger := &jaegerLogrus{logrus.WithField("subsystem", "jaeger")}
155154

156-
t, closer, err := cfg.NewTracer(
157-
config.Logger(logger),
158-
)
159-
155+
closer, err := cfg.InitGlobalTracer(cfg.ServiceName, config.Logger(logger))
160156
if err != nil {
161-
logrus.WithField("error", err).Fatal("unable to initialize tracer")
157+
logrus.WithField("error", err).Fatal("unable to initialize global tracer")
162158
return err
163159
}
164160

165-
tracer = t
161+
tracer = opentracing.GlobalTracer()
166162
defer closer.Close()
167163

168164
logrus.Info("tracing enabled")

docs/using-gitbase/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
`gitbase` optional dependencies that should be running on your system if you're planning on using certain functionality.
66

7-
- [bblfsh](https://github.com/bblfsh/bblfshd) >= 2.6.1 (only if you're planning to use the `UAST` functionality provided in gitbase)
7+
- [bblfsh](https://github.com/bblfsh/bblfshd) >= 2.10.0 (only if you're planning to use the `UAST` functionality provided in gitbase)
88

99
## Installing gitbase
1010

vendor/github.com/grpc-ecosystem/grpc-opentracing/.gitignore

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-opentracing/LICENSE

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-opentracing/PATENTS

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-opentracing/README.rst

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc/README.md

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)