From 5558713616f3e2a97889ad191d43b1b700f08b48 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <ys@uber.com>
Date: Fri, 6 Sep 2019 13:15:04 -0400
Subject: [PATCH] Remove go modules

Signed-off-by: Yuri Shkuro <ys@uber.com>
---
 .travis.yml     |  9 +++------
 CONTRIBUTING.md | 11 +++++++----
 Makefile        |  2 ++
 README.md       | 25 +++++++++++++++++++------
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 304ca815..e7cdba64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,19 +10,16 @@ matrix:
   - go: 1.12.x
     env:
     - TESTS=true
+    - USE_DEP=true
     - COVERAGE=true
-    - GO111MODULE=on
-  - go: 1.12.x
-    env:
-    - CROSSDOCK=true
-    - GO111MODULE=on
   - go: 1.12.x
     env:
-    - TESTS=true
     - USE_DEP=true
+    - CROSSDOCK=true
   - go: 1.12.x
     env:
     - TESTS=true
+    - USE_DEP=false
     - USE_GLIDE=true
   - go: 1.11.x
     env:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d082bea..41e2154c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,20 +19,23 @@ 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-client-go` 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-client-go.git jaeger-client-go
 cd jaeger-client-go
 git submodule update --init --recursive
 ```
 
-Go will download dependencies automatically when you run the tests:
+Then install dependencies and run the tests:
 
 ```
+make install
 make test
 ```
 
diff --git a/Makefile b/Makefile
index 1ebf369e..1a8b1618 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@ ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor -e thrift-gen -e ./th
         -e ".*/_.*" \
         -e ".*/mocks.*")
 
+USE_DEP := true
+
 -include crossdock/rules.mk
 
 RACE=-race
diff --git a/README.md b/README.md
index 402cb86a..604d4b57 100644
--- a/README.md
+++ b/README.md
@@ -15,14 +15,27 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Installation
 
-We recommended using [semantic versioning](http://semver.org/) when including this library into an application. For example, Jaeger backend imports this library like this (if using Dep):
-
-```yaml
-- package: github.com/uber/jaeger-client-go
-  version: ^2.7.0
+We recommended using a dependency manager like [dep](https://golang.github.io/dep/)
+and [semantic versioning](http://semver.org/) when including this library into an application.
+For example, Jaeger backend imports this library like this:
+
+```toml
+[[constraint]]
+  name = "github.com/uber/jaeger-client-go"
+  version = "2.17"
 ```
 
-If you instead want to use the latest version in `master`, you can pull it via `go get github.com/uber/jaeger-client-go`.
+If you instead want to use the latest version in `master`, you can pull it via `go get`.
+Note that during `go get` you may see build errors due to incompatible dependencies, which is why
+we recommend using semantic versions for dependencies.  The error  may be fixed by running
+`make install` (it will install `dep` if you don't have it):
+
+```shell
+go get -u github.com/uber/jaeger-client-go/
+cd $GOPATH/src/github.com/uber/jaeger-client-go/
+git submodule update --init --recursive
+make install
+```
 
 ## Initialization