Update to newer OpenCensus dependencies. (istio#14022)

galley/pkg/server/monitoring.go

@@ -19,8 +19,8 @@ import (
 	"net"
 	"net/http"
 
+	ocprom "contrib.go.opencensus.io/exporter/prometheus"
 	"github.com/prometheus/client_golang/prometheus"
-	ocprom "go.opencensus.io/exporter/prometheus"
 	"go.opencensus.io/stats/view"
 
 	"istio.io/common/pkg/version"

go.mod

@@ -16,7 +16,9 @@ require (
 	cloud.google.com/go v0.37.4
 	cloud.google.com/go/contextgraph/apiv1alpha1 v0.0.0
 	code.cloudfoundry.org/copilot v0.0.0-20180808174356-6bade2a0677a
+	contrib.go.opencensus.io/exporter/prometheus v0.1.0
 	contrib.go.opencensus.io/exporter/stackdriver v0.6.0
+	contrib.go.opencensus.io/exporter/zipkin v0.1.1
 	fortio.org/fortio v1.3.0
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Azure/go-autorest v11.1.0+incompatible // indirect
@@ -167,7 +169,7 @@ require (
 	github.com/yashtewari/glob-intersection v0.0.0-20180206001645-7af743e8ec84 // indirect
 	github.com/yl2chen/cidranger v0.0.0-20180214081945-928b519e5268
 	github.com/yuin/gopher-lua v0.0.0-20180316054350-84ea3a3c79b3 // indirect
-	go.opencensus.io v0.20.1
+	go.opencensus.io v0.21.0
 	go.uber.org/atomic v1.4.0
 	go.uber.org/multierr v1.1.0
 	go.uber.org/zap v1.10.0

go.sum

@@ -5,8 +5,12 @@ cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 code.cloudfoundry.org/copilot v0.0.0-20180808174356-6bade2a0677a h1:+wgboRul4rDtF76z1Y1FtVQ2+xLwGtZ5ZpOqoVbCPec=
 code.cloudfoundry.org/copilot v0.0.0-20180808174356-6bade2a0677a/go.mod h1:QTyGqKzbhvM1hZajwj2hDJSitop0S1sWnJAmXRjvqcE=
+contrib.go.opencensus.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg=
+contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A=
 contrib.go.opencensus.io/exporter/stackdriver v0.6.0 h1:U0FQWsZU3aO8W+BrZc88T8fdd24qe3Phawa9V9oaVUE=
 contrib.go.opencensus.io/exporter/stackdriver v0.6.0/go.mod h1:QeFzMJDAw8TXt5+aRaSuE8l5BwaMIOIlaVkBOPRuMuw=
+contrib.go.opencensus.io/exporter/zipkin v0.1.1 h1:PR+1zWqY8ceXs1qDQQIlgXe+sdiwCf0n32bH4+Epk8g=
+contrib.go.opencensus.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc=
 fortio.org/fortio v1.3.0 h1:svvLIZsz9kMgeAVasheXK7RyRjAF5BP3BXzvkkDybGA=
 fortio.org/fortio v1.3.0/go.mod h1:Go0fRqoPJ1xy5JOWcS23jyF58byVZxFyEePYsGmCR0k=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
@@ -444,6 +448,8 @@ github.com/yuin/gopher-lua v0.0.0-20180316054350-84ea3a3c79b3 h1:CX+AUpiV2hZ3OaP
 github.com/yuin/gopher-lua v0.0.0-20180316054350-84ea3a3c79b3/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
 go.opencensus.io v0.20.1 h1:pMEjRZ1M4ebWGikflH7nQpV6+Zr88KBMA2XJD3sbijw=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=

mixer/adapter/zipkin/zipkin.go

@@ -20,10 +20,10 @@ package zipkin
 import (
 	"context"
 
+	oczipkin "contrib.go.opencensus.io/exporter/zipkin"
 	zgo "github.com/openzipkin/zipkin-go"
 	"github.com/openzipkin/zipkin-go/reporter"
 	zhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	oczipkin "go.opencensus.io/exporter/zipkin"
 	"go.opencensus.io/trace"
 
 	"istio.io/istio/mixer/adapter/metadata"

mixer/adapter/zipkin/zipkin_integration_test.go

@@ -153,11 +153,11 @@ func TestReport(t *testing.T) {
       "annotations": [
         {
           "timestamp": 1136239444900000,
-          "value": "RECV"
+          "value": "Received 128 bytes"
         },
         {
           "timestamp": 1136239445000000,
-          "value": "SENT"
+          "value": "Sent 512 bytes"
         }
       ],
       "duration": 100000,

mixer/pkg/server/monitoring.go

@@ -22,8 +22,8 @@ import (
 	"net/http/pprof"
 	"time"
 
+	ocprom "contrib.go.opencensus.io/exporter/prometheus"
 	"github.com/prometheus/client_golang/prometheus"
-	ocprom "go.opencensus.io/exporter/prometheus"
 	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc/stats"
 

mixer/pkg/server/server.go

@@ -21,9 +21,9 @@ import (
 	"os"
 	"strings"
 
+	"contrib.go.opencensus.io/exporter/prometheus"
 	ot "github.com/opentracing/opentracing-go"
 	oprometheus "github.com/prometheus/client_golang/prometheus"
-	"go.opencensus.io/exporter/prometheus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"

pilot/pkg/bootstrap/monitoring.go

@@ -19,8 +19,8 @@ import (
 	"net"
 	"net/http"
 
+	ocprom "contrib.go.opencensus.io/exporter/prometheus"
 	"github.com/prometheus/client_golang/prometheus"
-	ocprom "go.opencensus.io/exporter/prometheus"
 	"go.opencensus.io/stats/view"
 
 	"istio.io/common/pkg/log"

security/pkg/server/monitoring/monitoring.go

@@ -21,8 +21,8 @@ import (
 	"net/http/pprof"
 	"time"
 
+	ocprom "contrib.go.opencensus.io/exporter/prometheus"
 	"github.com/prometheus/client_golang/prometheus"
-	ocprom "go.opencensus.io/exporter/prometheus"
 	"go.opencensus.io/stats/view"
 
 	"istio.io/common/pkg/log"