More fixes to dependencies (#440)

Please see the CHANGELOG for details.

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## v12.4.2
+
+### Bug Fixes
+
+- Improvements to the fixes made in v12.4.1.
+  - Remove `override` stanza from Gopkg.toml and `replace` directive from go.mod as they don't apply when being consumed as a dependency.
+  - Switched to latest version of `ocagent` that still depends on protobuf v1.2.
+  - Add indirect dependencies to the `required` clause with matching `constraint` stanzas so that `dep` dependencies match go.sum.
+
 ## v12.4.1
 
 ### Bug Fixes

Gopkg.toml

@@ -19,7 +19,15 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
-required = ["golang.org/x/lint/golint"]
+required = [
+    "github.com/census-instrumentation/opencensus-proto/gen-go/stats/v1",
+    "github.com/golang/protobuf/proto",
+    "github.com/grpc-ecosystem/grpc-gateway/runtime",
+    "golang.org/x/lint/golint",
+    "google.golang.org/api/container/v1",
+    "google.golang.org/genproto",
+    "google.golang.org/grpc"
+  ]
 
 [prune]
   unused-packages = true
@@ -43,12 +51,32 @@ required = ["golang.org/x/lint/golint"]
 
 [[constraint]]
   name = "go.opencensus.io"
-  version = "=0.21.0"
+  revision = "aab39bd6a98b853ab66c8a564f5d6cfcad59ce8a"
 
 [[constraint]]
   name = "contrib.go.opencensus.io/exporter/ocagent"
-  version = "=0.3.0"
+  version = "=0.4.6"
 
-[[override]]
+[[constraint]]
   name = "github.com/census-instrumentation/opencensus-proto"
-  version = "=0.1.0"
+  revision = "ba49f56771b83cff7bea7f34d1236fc139dbc471"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "=1.2.0"
+
+[[constraint]]
+  name = "google.golang.org/api"
+  revision = "7ca32eb868bf53ea2fc406698eb98583a8073d19"
+
+[[constraint]]
+  name = "google.golang.org/genproto"
+  revision = "11092d34479b07829b72e10713b159248caf5dad"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "=1.15.0"
+
+[[constraint]]
+  name = "github.com/grpc-ecosystem/grpc-gateway"
+  version = "=1.5.0"

autorest/version.go

@@ -19,7 +19,7 @@ import (
 	"runtime"
 )
 
-const number = "v12.4.1"
+const number = "v12.4.2"
 
 var (
 	userAgent = fmt.Sprintf("Go/%s (%s-%s) go-autorest/%s",

tracing/go.mod

@@ -3,11 +3,7 @@ module github.com/Azure/go-autorest/tracing
 go 1.12
 
 require (
-	// later releases of ocagent aren't compatible with our version of opencensus
-	contrib.go.opencensus.io/exporter/ocagent v0.3.0
-	// keep this pre-v0.22.0 to avoid dependency on protobuf v1.3+
-	go.opencensus.io v0.21.0
+	// use older versions to avoid taking a dependency on protobuf v1.3+
+	contrib.go.opencensus.io/exporter/ocagent v0.4.6
+	go.opencensus.io v0.18.1-0.20181204023538-aab39bd6a98b
 )
-
-// pin this to v0.1.0 to avoid breaking changes incompatible with our version of ocagent
-replace github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.1.0