Upgrade jaeger-lib to 2.2 and unpin Prom client (#434)

* Upgrade jaeger-lib to 2.2 and unpin Prom client Signed-off-by: Yuri Shkuro <[email protected]> * Use official jaeger-lib release Signed-off-by: Yuri Shkuro <[email protected]> * Update glide Signed-off-by: Yuri Shkuro <[email protected]> * Restore prom in dep Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Sep 23, 2019 · e95cd44 · e95cd44
1 parent f349093
commit e95cd44
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 60 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -8,7 +8,7 @@
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  version = "0.8.0"
+  version = "^1"
 
 [[constraint]]
   name = "github.com/stretchr/testify"
@@ -20,7 +20,7 @@
 
 [[constraint]]
   name = "github.com/uber/jaeger-lib"
-  version = "^2.0"
+  version = "^2.2"
 
 [[constraint]]
   name = "go.uber.org/zap"

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 PROJECT_ROOT=github.com/uber/jaeger-client-go
-PACKAGES := $(go list ./... | awk -F/ 'NR>1 {print "./"$4"/..."}' | grep -v -e ./thrift-gen/... -e ./thrift/... | sort -u)
+PACKAGES := $(shell go list ./... | awk -F/ 'NR>1 {print "./"$$4"/..."}' | grep -v -e ./thrift-gen/... -e ./thrift/... | sort -u)
 # all .go files that don't exist in hidden directories
 ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor -e thrift-gen -e ./thrift/ \
         -e ".*/\..*" \

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -12,11 +12,16 @@ import:
   - metrics
 - package: github.com/pkg/errors
   version: ~0.8.0
+- package: go.uber.org/zap
+  source: https://github.com/uber-go/zap.git
+  version: ^1
+- package: github.com/uber-go/atomic
+  version: ^1
+- package: github.com/prometheus/client_golang
+  version: ^1
 testImport:
 - package: github.com/stretchr/testify
   subpackages:
   - assert
   - require
   - suite
-- package: github.com/prometheus/client_golang
-  version: v0.8.0