From 53c04fe491b5586c3686579a0011947bdf458e46 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 18 Apr 2019 13:48:57 +0200 Subject: [PATCH] Fix jaeger-lib dependency jaeger-client-go is not compatible with jaeger-lib 2.0.0 that was set in go.mod. Now uses 1.5.0 that is compatible and is the one in pilosa go.mod. With this change gitbase is able to use go-mysql-server with go.mod. This problem is mentioned here: https://github.com/jaegertracing/jaeger-client-go/issues/363#issuecomment-473656998 Signed-off-by: Javi Fontan --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d249203c5..bfab00f50 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/src-d/go-oniguruma v1.0.0 github.com/stretchr/testify v1.2.2 github.com/uber/jaeger-client-go v2.15.0+incompatible // indirect - github.com/uber/jaeger-lib v2.0.0+incompatible // indirect + github.com/uber/jaeger-lib v1.5.0 // indirect go.etcd.io/bbolt v1.3.2 golang.org/x/net v0.0.0-20190227022144-312bce6e941f // indirect google.golang.org/grpc v1.19.0 // indirect diff --git a/go.sum b/go.sum index ad84d2246..947b81a7e 100644 --- a/go.sum +++ b/go.sum @@ -102,8 +102,8 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/uber/jaeger-client-go v2.15.0+incompatible h1:NP3qsSqNxh8VYr956ur1N/1C1PjvOJnJykCzcD5QHbk= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.0.0+incompatible h1:iMSCV0rmXEogjNWPh2D0xk9YVKvrtGoHJNe9ebLu/pw= -github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/uber/jaeger-lib v1.5.0 h1:OHbgr8l656Ub3Fw5k9SWnBfIEwvoHQ+W2y+Aa9D1Uyo= +github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=