Skip to content
This repository was archived by the owner on Nov 7, 2022. It is now read-only.

Commit 9b1fd0d

Browse files
authored
Upgrade versions of opencensus core and exporters. (#538)
* Update paths for all OC exporters. * Upgrade versions of opencensus core and exporters. * Fix tests. * Fix vet. * Attempt to fix vet on Travis.
1 parent e57bda2 commit 9b1fd0d

File tree

12 files changed

+165
-270
lines changed

12 files changed

+165
-270
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ vet:
8686
install-tools:
8787
go get golang.org/x/lint/golint
8888
go get -u github.com/google/go-cmp/cmp
89+
go get contrib.go.opencensus.io/exporter/jaeger@v0.1.1-0.20190430175949-e8b55949d948
90+
go get contrib.go.opencensus.io/exporter/prometheus
91+
go get contrib.go.opencensus.io/exporter/zipkin
8992

9093
.PHONY: agent
9194
agent:

cmd/occollector/app/collector/telemetry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"net/http"
2121
"strconv"
2222

23+
"contrib.go.opencensus.io/exporter/prometheus"
2324
"github.com/spf13/viper"
24-
"go.opencensus.io/exporter/prometheus"
2525
"go.opencensus.io/stats/view"
2626
"go.uber.org/zap"
2727

exporter/jaegerexporter/jaeger.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ package jaegerexporter
1616

1717
import (
1818
"github.com/spf13/viper"
19-
"go.opencensus.io/exporter/jaeger"
19+
20+
"contrib.go.opencensus.io/exporter/jaeger"
2021

2122
"github.com/census-instrumentation/opencensus-service/consumer"
2223
"github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper"
2324
)
2425

25-
// Slight modified version of go/src/go.opencensus.io/exporter/jaeger/jaeger.go
26+
// Slight modified version of go/src/contrib.go.opencensus.io/exporter/jaeger/jaeger.go
2627
type jaegerConfig struct {
2728
CollectorEndpoint string `mapstructure:"collector_endpoint,omitempty"`
2829
Username string `mapstructure:"username,omitempty"`

exporter/opencensusexporter/opencensusexporter_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ import (
2222

2323
func TestOpenCensusTraceExportersFromViper(t *testing.T) {
2424
v := viper.New()
25-
v.Set("opencensus", struct{}{})
25+
v.Set("opencensus", map[interface{}]interface{}{})
26+
v.Set("opencensus.endpoint", "")
2627
_, _, _, err := OpenCensusTraceExportersFromViper(v)
2728

2829
if err != ErrEndpointRequired {
29-
t.Fatalf("Expected to get ErrEndpointRequired but did not")
30+
t.Fatalf("Expected to get ErrEndpointRequired. Got %v", err)
3031
}
3132

3233
v.Set("opencensus.endpoint", "127.0.0.1:55678")

exporter/prometheusexporter/prometheus_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ prometheus:
167167
_ = res.Body.Close()
168168
want := `# HELP test_this_one_there_where_ Extra ones
169169
# TYPE test_this_one_there_where_ counter
170-
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99.0
170+
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99
171171
`
172172
if got := string(blob); got != want {
173173
t.Errorf("Response mismatch\nGot:\n%s\n\nWant:\n%s", got, want)

exporter/stackdriverexporter/stackdriver.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,15 @@ func (sde *stackdriverExporter) ConsumeMetricsData(ctx context.Context, md data.
119119

120120
var setErrorOnce sync.Once
121121

122-
for _, metric := range md.Metrics {
123-
err := sde.exporter.ExportMetric(ctx, md.Node, md.Resource, metric)
124-
if err != nil {
125-
setErrorOnce.Do(func() {
126-
span.SetStatus(trace.Status{Code: trace.StatusCodeInternal, Message: err.Error()})
127-
})
128-
129-
span.Annotate([]trace.Attribute{
130-
trace.StringAttribute("error", err.Error()),
131-
}, "Error encountered")
132-
}
122+
err := sde.exporter.ExportMetricsProto(ctx, md.Node, md.Resource, md.Metrics)
123+
if err != nil {
124+
setErrorOnce.Do(func() {
125+
span.SetStatus(trace.Status{Code: trace.StatusCodeInternal, Message: err.Error()})
126+
})
127+
128+
span.Annotate([]trace.Attribute{
129+
trace.StringAttribute("error", err.Error()),
130+
}, "Error encountered")
133131
}
134132

135133
return nil

go.mod

Lines changed: 17 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,61 @@ module github.com/census-instrumentation/opencensus-service
22

33
require (
44
contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0
5-
contrib.go.opencensus.io/exporter/ocagent v0.4.7
6-
contrib.go.opencensus.io/exporter/stackdriver v0.9.2
7-
github.com/Azure/azure-sdk-for-go v6.0.0-beta+incompatible // indirect
8-
github.com/Azure/go-autorest v11.4.0+incompatible // indirect
9-
github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 // indirect
5+
contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948
6+
contrib.go.opencensus.io/exporter/ocagent v0.5.0
7+
contrib.go.opencensus.io/exporter/prometheus v0.1.0
8+
contrib.go.opencensus.io/exporter/stackdriver v0.11.1-0.20190501184545-76b193af8427
9+
contrib.go.opencensus.io/exporter/zipkin v0.1.1
10+
github.com/DataDog/datadog-go v2.2.0+incompatible // indirect
1011
github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329
1112
github.com/VividCortex/gohistogram v1.0.0 // indirect
1213
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
1314
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
1415
github.com/census-instrumentation/opencensus-proto v0.2.0
15-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
1616
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
1717
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
1818
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
1919
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
2020
github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
21-
github.com/go-logfmt/logfmt v0.4.0 // indirect
22-
github.com/gogo/googleapis v1.1.0 // indirect
23-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
21+
github.com/gogo/googleapis v1.2.0 // indirect
2422
github.com/golang/protobuf v1.3.1
2523
github.com/google/go-cmp v0.2.0
26-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
27-
github.com/googleapis/gnostic v0.2.0 // indirect
28-
github.com/gophercloud/gophercloud v0.0.0-20190206021053-df38e1611dbe // indirect
29-
github.com/gorilla/context v1.1.1 // indirect
3024
github.com/gorilla/mux v1.6.2
31-
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 // indirect
3225
github.com/grpc-ecosystem/grpc-gateway v1.8.5
33-
github.com/hashicorp/consul v1.4.2 // indirect
34-
github.com/hashicorp/go-cleanhttp v0.5.0 // indirect
35-
github.com/hashicorp/go-rootcerts v1.0.0 // indirect
36-
github.com/hashicorp/serf v0.8.2 // indirect
37-
github.com/honeycombio/libhoney-go v1.8.2 // indirect
26+
github.com/honeycombio/libhoney-go v1.10.0 // indirect
3827
github.com/honeycombio/opencensus-exporter v0.0.0-20181101214123-9be2bb327b5a
3928
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4029
github.com/jaegertracing/jaeger v1.9.0
41-
github.com/json-iterator/go v1.1.5 // indirect
42-
github.com/mitchellh/mapstructure v1.1.2 // indirect
43-
github.com/modern-go/reflect2 v1.0.1 // indirect
4430
github.com/omnition/scribe-go v0.0.0-20190131012523-9e3c68f31124
45-
github.com/onsi/ginkgo v1.7.0 // indirect
46-
github.com/onsi/gomega v1.4.3 // indirect
47-
github.com/opentracing/opentracing-go v1.0.2 // indirect
48-
github.com/openzipkin/zipkin-go v0.1.3
31+
github.com/opentracing/opentracing-go v1.1.0 // indirect
32+
github.com/openzipkin/zipkin-go v0.1.6
4933
github.com/orijtech/prometheus-go-metrics-exporter v0.0.3-0.20190313163149-b321c5297f60
5034
github.com/orijtech/promreceiver v0.0.6
51-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5235
github.com/philhofer/fwd v1.0.0 // indirect
5336
github.com/pkg/errors v0.8.0
5437
github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect
5538
github.com/prometheus/client_golang v0.9.2
56-
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
39+
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1
5740
github.com/prometheus/prometheus v0.0.0-20190131111325-62e591f928dd
5841
github.com/rs/cors v1.6.0
59-
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
6042
github.com/soheilhy/cmux v0.1.4
6143
github.com/spf13/cast v1.2.0
6244
github.com/spf13/cobra v0.0.3
6345
github.com/spf13/viper v1.2.1
6446
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
65-
github.com/stretchr/objx v0.1.1 // indirect
66-
github.com/tinylib/msgp v1.0.2 // indirect
47+
github.com/tinylib/msgp v1.1.0 // indirect
6748
github.com/uber-go/atomic v1.3.2 // indirect
68-
github.com/uber/jaeger-client-go v2.15.0+incompatible // indirect
49+
github.com/uber/jaeger-client-go v2.16.0+incompatible // indirect
6950
github.com/uber/jaeger-lib v2.0.0+incompatible
7051
github.com/uber/tchannel-go v1.10.0
7152
github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb
72-
go.opencensus.io v0.19.0
53+
go.opencensus.io v0.21.0
7354
go.uber.org/atomic v1.3.2 // indirect
7455
go.uber.org/multierr v1.1.0 // indirect
7556
go.uber.org/zap v1.9.1
76-
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
77-
google.golang.org/api v0.1.0
78-
google.golang.org/genproto v0.0.0-20190215211957-bd968387e4aa // indirect
79-
google.golang.org/grpc v1.19.1
80-
gopkg.in/DataDog/dd-trace-go.v1 v1.4.0 // indirect
57+
google.golang.org/api v0.4.0
58+
google.golang.org/grpc v1.20.1
59+
gopkg.in/DataDog/dd-trace-go.v1 v1.12.1 // indirect
8160
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
82-
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
8361
gopkg.in/yaml.v2 v2.2.2
84-
k8s.io/apimachinery v0.0.0-20190207091153-095b9d203467 // indirect
85-
k8s.io/kube-openapi v0.0.0-20190205224424-fd29a9f2f429 // indirect
86-
sigs.k8s.io/structured-merge-diff v0.0.0-20190130003954-e5e029740eb8 // indirect
8762
)

0 commit comments

Comments
 (0)