Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Sep 23, 2019
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
578acbe
Upgrade Prometheus client to 1.1 and go-kit to 0.9
Sep 21, 2019
475deea
Fix PACKAGES makefile var
Sep 21, 2019
6a2895e
Clean up
Sep 23, 2019
eae54fa
Relax restriction in glide
Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 56 additions & 68 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down
10 changes: 2 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*")
Expand All @@ -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)/''
Expand Down
53 changes: 28 additions & 25 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading