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

Commit 392ee4a

Browse files
authored
Upgrade opencensus-proto version to v0.2.0. (#490)
* Upgrade opencensus-proto version to v0.2.0. * Run GO111MODULE=on go mod tidy. * Pin protobuf version to v1.3.0 * Upgrade ocagent and stackdriver exporter versions. * Upgrade promreceiver version. * Upgrade promreceiver and prom-metric-exporter versions. * Fix test failures.
1 parent 953218b commit 392ee4a

File tree

6 files changed

+164
-99
lines changed

6 files changed

+164
-99
lines changed

exporter/prometheusexporter/prometheus_test.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,13 @@ prometheus:
120120
}
121121

122122
var metric1 = &metricspb.Metric{
123-
Descriptor_: &metricspb.Metric_MetricDescriptor{
124-
MetricDescriptor: &metricspb.MetricDescriptor{
125-
Name: "this/one/there(where)",
126-
Description: "Extra ones",
127-
Unit: "1",
128-
LabelKeys: []*metricspb.LabelKey{
129-
{Key: "os", Description: "Operating system"},
130-
{Key: "arch", Description: "Architecture"},
131-
},
123+
MetricDescriptor: &metricspb.MetricDescriptor{
124+
Name: "this/one/there(where)",
125+
Description: "Extra ones",
126+
Unit: "1",
127+
LabelKeys: []*metricspb.LabelKey{
128+
{Key: "os", Description: "Operating system"},
129+
{Key: "arch", Description: "Architecture"},
132130
},
133131
},
134132
Timeseries: []*metricspb.TimeSeries{
@@ -169,7 +167,7 @@ prometheus:
169167
_ = res.Body.Close()
170168
want := `# HELP test_this_one_there_where_ Extra ones
171169
# TYPE test_this_one_there_where_ counter
172-
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99
170+
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99.0
173171
`
174172
if got := string(blob); got != want {
175173
t.Errorf("Response mismatch\nGot:\n%s\n\nWant:\n%s", got, want)

go.mod

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
module github.com/census-instrumentation/opencensus-service
22

33
require (
4-
cloud.google.com/go v0.32.0 // indirect
54
contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0
6-
contrib.go.opencensus.io/exporter/ocagent v0.4.6
7-
contrib.go.opencensus.io/exporter/stackdriver v0.9.1
8-
git.apache.org/thrift.git v0.0.0-20181101003639-92be4f312b88 // indirect
5+
contrib.go.opencensus.io/exporter/ocagent v0.4.7
6+
contrib.go.opencensus.io/exporter/stackdriver v0.9.2
97
github.com/Azure/azure-sdk-for-go v6.0.0-beta+incompatible // indirect
108
github.com/Azure/go-autorest v11.4.0+incompatible // indirect
11-
github.com/BurntSushi/toml v0.3.1 // indirect
129
github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 // indirect
1310
github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329
1411
github.com/VividCortex/gohistogram v1.0.0 // indirect
1512
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
16-
github.com/aws/aws-sdk-go v1.15.68 // indirect
1713
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
18-
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8
14+
github.com/census-instrumentation/opencensus-proto v0.2.0
1915
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
2016
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
2117
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
@@ -25,7 +21,7 @@ require (
2521
github.com/go-logfmt/logfmt v0.4.0 // indirect
2622
github.com/gogo/googleapis v1.1.0 // indirect
2723
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
28-
github.com/golang/protobuf v1.2.0
24+
github.com/golang/protobuf v1.3.0
2925
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
3026
github.com/googleapis/gnostic v0.2.0 // indirect
3127
github.com/gophercloud/gophercloud v0.0.0-20190206021053-df38e1611dbe // indirect
@@ -41,7 +37,6 @@ require (
4137
github.com/honeycombio/opencensus-exporter v0.0.0-20181101214123-9be2bb327b5a
4238
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4339
github.com/jaegertracing/jaeger v1.8.2
44-
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
4540
github.com/json-iterator/go v1.1.5 // indirect
4641
github.com/mitchellh/mapstructure v1.1.2 // indirect
4742
github.com/modern-go/reflect2 v1.0.1 // indirect
@@ -50,14 +45,14 @@ require (
5045
github.com/onsi/gomega v1.4.3 // indirect
5146
github.com/opentracing/opentracing-go v1.0.2 // indirect
5247
github.com/openzipkin/zipkin-go v0.1.3
53-
github.com/orijtech/prometheus-go-metrics-exporter v0.0.2
54-
github.com/orijtech/promreceiver v0.0.3
48+
github.com/orijtech/prometheus-go-metrics-exporter v0.0.3-0.20190313163149-b321c5297f60
49+
github.com/orijtech/promreceiver v0.0.5
5550
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5651
github.com/philhofer/fwd v1.0.0 // indirect
5752
github.com/pkg/errors v0.8.0
5853
github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect
59-
github.com/prometheus/client_golang v0.9.1
60-
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d
54+
github.com/prometheus/client_golang v0.9.2
55+
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
6156
github.com/prometheus/prometheus v0.0.0-20190131111325-62e591f928dd
6257
github.com/rs/cors v1.6.0
6358
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
@@ -73,23 +68,18 @@ require (
7368
github.com/uber/jaeger-lib v1.5.0
7469
github.com/uber/tchannel-go v1.10.0
7570
github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb
76-
go.opencensus.io v0.18.1-0.20181204023538-aab39bd6a98b
71+
go.opencensus.io v0.19.0
7772
go.uber.org/atomic v1.3.2 // indirect
7873
go.uber.org/multierr v1.1.0 // indirect
7974
go.uber.org/zap v1.9.1
8075
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
81-
golang.org/x/oauth2 v0.0.0-20181102170140-232e45548389 // indirect
82-
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
83-
google.golang.org/api v0.0.0-20181102150758-04bb50b6b83d
84-
google.golang.org/appengine v1.3.0 // indirect
76+
google.golang.org/api v0.1.0
8577
google.golang.org/genproto v0.0.0-20190215211957-bd968387e4aa // indirect
86-
google.golang.org/grpc v1.17.0
78+
google.golang.org/grpc v1.18.0
8779
gopkg.in/DataDog/dd-trace-go.v1 v1.4.0 // indirect
8880
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
89-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
9081
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
91-
gopkg.in/inf.v0 v0.9.1 // indirect
92-
gopkg.in/yaml.v2 v2.2.1
82+
gopkg.in/yaml.v2 v2.2.2
9383
k8s.io/apimachinery v0.0.0-20190207091153-095b9d203467 // indirect
9484
k8s.io/kube-openapi v0.0.0-20190205224424-fd29a9f2f429 // indirect
9585
sigs.k8s.io/structured-merge-diff v0.0.0-20190130003954-e5e029740eb8 // indirect

0 commit comments

Comments
 (0)