Merge branch 'master' into fix/squash-ref-commits-filter

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "1cffdc13f73985326120abbf1800cc4859ce2a4f"
+  revision = "12091f663c6224024dd4b3c10d2a8c1349f046d4"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -54,15 +54,15 @@
 
 [[constraint]]
   name = "gopkg.in/bblfsh/client-go.v3"
-  version = "3.1.0"
+  version = "3.2.0"
 
 [[override]]
   name = "gopkg.in/bblfsh/sdk.v1"
   version = "1.16.0"
 
 [[constraint]]
   name = "gopkg.in/bblfsh/sdk.v2"
-  version = "2.7.0"
+  version = "2.11.0"
 
 [[constraint]]
   name = "github.com/uber/jaeger-client-go"

Gopkg.toml

@@ -146,23 +146,19 @@ func (c *Server) Execute(args []string) error {
 				Fatal("unable to read jaeger environment")
 			return err
 		}
-
 		if cfg.ServiceName == "" {
 			cfg.ServiceName = TracerServiceName
 		}
 
 		logger := &jaegerLogrus{logrus.WithField("subsystem", "jaeger")}
 
-		t, closer, err := cfg.NewTracer(
-			config.Logger(logger),
-		)
-
+		closer, err := cfg.InitGlobalTracer(cfg.ServiceName, config.Logger(logger))
 		if err != nil {
-			logrus.WithField("error", err).Fatal("unable to initialize tracer")
+			logrus.WithField("error", err).Fatal("unable to initialize global tracer")
 			return err
 		}
 
-		tracer = t
+		tracer = opentracing.GlobalTracer()
 		defer closer.Close()
 
 		logrus.Info("tracing enabled")

cmd/gitbase/command/server.go

@@ -95,4 +95,4 @@ Also, if you want to retrieve values from a non common property, you can pass it
 
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/1cffdc13f73985326120abbf1800cc4859ce2a4f#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/12091f663c6224024dd4b3c10d2a8c1349f046d4#custom-functions).

docs/using-gitbase/functions.md

@@ -4,7 +4,7 @@
 
 `gitbase` optional dependencies that should be running on your system if you're planning on using certain functionality.
 
-- [bblfsh](https://github.com/bblfsh/bblfshd) >= 2.6.1 (only if you're planning to use the `UAST` functionality provided in gitbase)
+- [bblfsh](https://github.com/bblfsh/bblfshd) >= 2.10.0 (only if you're planning to use the `UAST` functionality provided in gitbase)
 
 ## Installing gitbase
 

docs/using-gitbase/getting-started.md

@@ -26,4 +26,4 @@ and for the second query also two indexes will be used and the result will be a
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/1cffdc13f73985326120abbf1800cc4859ce2a4f#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/12091f663c6224024dd4b3c10d2a8c1349f046d4#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -1,3 +1,3 @@
 ## Supported clients
 
-To see the supported MySQL clients and examples about how to use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/1cffdc13f73985326120abbf1800cc4859ce2a4f/SUPPORTED_CLIENTS.md).
+To see the supported MySQL clients and examples about how to use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/12091f663c6224024dd4b3c10d2a8c1349f046d4/SUPPORTED_CLIENTS.md).

docs/using-gitbase/supported-clients.md

@@ -1,3 +1,3 @@
 ## Supported syntax
 
-To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/1cffdc13f73985326120abbf1800cc4859ce2a4f/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
+To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/12091f663c6224024dd4b3c10d2a8c1349f046d4/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).