Remove go modules (#76)

* Remove go modules

Signed-off-by: Yuri Shkuro <[email protected]>

* Fix build

Signed-off-by: Yuri Shkuro <[email protected]>

* Fix travis

Signed-off-by: Yuri Shkuro <[email protected]>

.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

CONTRIBUTING.md

@@ -19,20 +19,22 @@ 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 [email protected]:jaegertracing/jaeger-lib.git jaeger-lib
 cd jaeger-lib
 ```
 
 Then install dependencies and run the tests:
 
 ```
-git submodule update --init --recursive
+make install
 make test
 ```
 

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
 

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).