From 09b3c96da740b909d87b40bf1e5de2ea5dc61a62 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Fri, 6 Sep 2019 15:06:43 -0400 Subject: [PATCH] Remove go modules (#76) * Remove go modules Signed-off-by: Yuri Shkuro * Fix build Signed-off-by: Yuri Shkuro * Fix travis Signed-off-by: Yuri Shkuro --- .travis.yml | 9 +++------ CONTRIBUTING.md | 10 ++++++---- Makefile | 7 +++++-- README.md | 4 +--- go.mod | 24 ------------------------ go.sum | 40 ---------------------------------------- 6 files changed, 15 insertions(+), 79 deletions(-) delete mode 100644 go.mod delete mode 100644 go.sum diff --git a/.travis.yml b/.travis.yml index e7b1387..a631414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,22 +8,19 @@ go_import_path: github.com/uber/jaeger-lib matrix: include: - - go: 1.12.7 - env: - - COVERAGE=true - - GO111MODULE=on - go: 1.12.7 env: - TEST=true + - COVERAGE=true - USE_DEP=true - go: 1.12.7 env: - USE_GLIDE=true + - USE_DEP=false - TEST=true install: - - if [ "$USE_DEP" == true ]; then make install-dep-ci ; else echo 'skipping installing dep'; fi - - make install-ci + - make install-ci USE_DEP=$USE_DEP script: - if [ "$COVERAGE" == true ]; then make test-ci ; else echo 'skipping tests'; fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1d9be66..d492c85 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,12 +19,14 @@ file for details. ## Getting Started -This library uses Go modules to manage dependencies. +This library uses [dep](https://golang.github.io/dep/) to manage dependencies. -To get started, clone the Git repository into any location (does not need to be under `$GOPATH`) +To get started, make sure you clone the Git repository into the correct location +`github.com/uber/jaeger-lib` relative to `$GOPATH`: ``` -cd you-dev-root +mkdir -p $GOPATH/src/github.com/uber +cd $GOPATH/src/github.com/uber git clone git@github.com:jaegertracing/jaeger-lib.git jaeger-lib cd jaeger-lib ``` @@ -32,7 +34,7 @@ cd jaeger-lib Then install dependencies and run the tests: ``` -git submodule update --init --recursive +make install make test ``` diff --git a/Makefile b/Makefile index e5a98c6..83b7e1c 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor -e thrift-gen \ -e ".*/_.*" \ -e ".*/mocks.*") +USE_DEP := true + RACE=-race GOTEST=go test -v $(RACE) GOLINT=golint @@ -55,6 +57,7 @@ lint: .PHONY: install install: ifeq ($(USE_DEP),true) + dep version || make install-dep dep ensure dep status else ifeq ($(USE_GLIDE),true) @@ -78,8 +81,8 @@ idl-submodule: thrift-image: $(THRIFT) -version -.PHONY: install-dep-ci -install-dep-ci: +.PHONY: install-dep +install-dep: - curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $$GOPATH/bin/dep - chmod +x $$GOPATH/bin/dep diff --git a/README.md b/README.md index eb968fb..db84e53 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,11 @@ # jaeger-lib A collection of shared infrastructure libraries used by different -components of [Jaeger](https://github.com/uber/jaeger) backend and [jaeger-client-go](https://github.com/uber/jaeger-client-go). +components of [Jaeger](https://github.com/jaegertracing/jaeger) backend and [jaeger-client-go](https://github.com/uber/jaeger-client-go). This library is *not intended to be used standalone*, and provides *no guarantees of backwards compatibility*. The library's import path is `github.com/uber/jaeger-lib`. -The library uses Go modules for dependency management. For backwards compatibility, Dep and Glide dependency files are still maintained, but will be removed in the future. - ## How to Contribute Please see [CONTRIBUTING.md](CONTRIBUTING.md). diff --git a/go.mod b/go.mod deleted file mode 100644 index 066c5d9..0000000 --- a/go.mod +++ /dev/null @@ -1,24 +0,0 @@ -module github.com/uber/jaeger-lib - -go 1.12 - -require ( - github.com/VividCortex/gohistogram v1.0.0 // indirect - github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect - github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect - github.com/go-kit/kit v0.5.0 - github.com/go-logfmt/logfmt v0.3.0 // indirect - github.com/go-stack/stack v1.6.0 // indirect - github.com/golang/protobuf v0.0.0-20160425215824-7cc19b78d562 // indirect - github.com/influxdata/influxdb v0.0.0-20170912164834-f3f30726d822 - github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/prometheus/client_golang v0.8.0 - github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612 - github.com/prometheus/common v0.0.0-20170220103846-49fee292b27b // indirect - github.com/prometheus/procfs v0.0.0-20170216223256-a1dba9ce8bae // indirect - github.com/stretchr/testify v1.3.0 - github.com/uber-go/tally v3.2.0+incompatible -) diff --git a/go.sum b/go.sum deleted file mode 100644 index 1ccd1af..0000000 --- a/go.sum +++ /dev/null @@ -1,40 +0,0 @@ -github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a h1:BtpsbiV638WQZwhA98cEZw2BsbnQJrbd0BI7tsy0W1c= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw= -github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA= -github.com/go-kit/kit v0.5.0 h1:SI25KgiIaNiy8GCcvstnkBVXPISD0rJ7LrAwt1PJ8zA= -github.com/go-kit/kit v0.5.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0 h1:8HUsc87TaSWLKwrnumgC8/YconD2fJQsRJAsWaPg2ic= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-stack/stack v1.6.0 h1:MmJCxYVKTJ0SplGKqFVX3SBnmaUhODHZrrFF6jMbpZk= -github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/golang/protobuf v0.0.0-20160425215824-7cc19b78d562 h1:Cuu6mnKPbb6F6/z64H13pV8sV5+je6H4tgLbJ3bpYlA= -github.com/golang/protobuf v0.0.0-20160425215824-7cc19b78d562/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/influxdata/influxdb v0.0.0-20170912164834-f3f30726d822 h1:YeSN5oFQ21ylODM81YSTzUonBILXrm4M6v1sJUvCfnc= -github.com/influxdata/influxdb v0.0.0-20170912164834-f3f30726d822/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.8.0 h1:1921Yw9Gc3iSc4VQh3PIoOqgPCZS7G/4xQNVUp8Mda8= -github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612 h1:13pIdM2tpaDi4OVe24fgoIS7ZTqMt0QI+bwQsX5hq+g= -github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.0.0-20170220103846-49fee292b27b h1:nure2StBXEgV+CtAOZSggLGJ7bfuSfvuitPnwEQSKWQ= -github.com/prometheus/common v0.0.0-20170220103846-49fee292b27b/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20170216223256-a1dba9ce8bae h1:nbLP9B5vU3a/0hOXzolmZHxr2SQ2MEu6vhZappUZY9c= -github.com/prometheus/procfs v0.0.0-20170216223256-a1dba9ce8bae/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/uber-go/tally v3.2.0+incompatible h1:p3DYhltXwRBy1INL86ZKfVC+KdC+gXfz/Jg29etVhlc= -github.com/uber-go/tally v3.2.0+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=