Upgrade Prometheus client to 1.1 and go-kit to 0.9 (#78)

* Upgrade Prometheus client to 1.1 and go-kit to 0.9 Signed-off-by: Yuri Shkuro <[email protected]> * Fix PACKAGES makefile var Signed-off-by: Yuri Shkuro <[email protected]> * Clean up Signed-off-by: Yuri Shkuro <[email protected]> * Relax restriction in glide Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Sep 23, 2019 · f232686 · f232686
1 parent ddfc2ce
commit f232686
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 107 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -1,6 +1,6 @@
 [[constraint]]
   name = "github.com/go-kit/kit"
-  version = "0.5.0"
+  version = "0.9.0"
 
 [[constraint]]
   name = "github.com/codahale/hdrhistogram"
@@ -12,11 +12,11 @@
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  version = "0.8.0"
+  version = "1.1.0"
 
 [[constraint]]
   name = "github.com/stretchr/testify"
-  version = "1.2.1"
+  version = "1.4.0"
 
 [prune]
   go-tests = true

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 PROJECT_ROOT=github.com/uber/jaeger-lib
-PACKAGES := $(go list ./... | awk -F/ 'NR>1 {print "./"$4"/..."}' | sort -u)
+PACKAGES := $(shell go list ./... | awk -F/ 'NR>1 {print "./"$$4"/..."}' | 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 \
+ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor \
         -e ".*/\..*" \
         -e ".*/_.*" \
         -e ".*/mocks.*")
@@ -16,12 +16,6 @@ GOFMT=gofmt
 FMT_LOG=fmt.log
 LINT_LOG=lint.log
 
-THRIFT_VER=0.9.3
-THRIFT_IMG=thrift:$(THRIFT_VER)
-THRIFT=docker run -v "${PWD}:/data" $(THRIFT_IMG) thrift
-THRIFT_GO_ARGS=thrift_import="github.com/apache/thrift/lib/go/thrift"
-THRIFT_GEN_DIR=thrift-gen
-
 PASS=$(shell printf "\033[32mPASS\033[0m")
 FAIL=$(shell printf "\033[31mFAIL\033[0m")
 COLORIZE=sed ''/PASS/s//$(PASS)/'' | sed ''/FAIL/s//$(FAIL)/''

diff --git a/glide.lock b/glide.lock