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

Commit b9f473c

Browse files
author
Paulo Janotti
authored
Revert "Upgrade opencensus-proto version to v0.2.0. (#490)" (#503)
This reverts commit 392ee4a.
1 parent 405c9e3 commit b9f473c

File tree

6 files changed

+101
-163
lines changed

6 files changed

+101
-163
lines changed

exporter/prometheusexporter/prometheus_test.go

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

122122
var metric1 = &metricspb.Metric{
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"},
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+
},
130132
},
131133
},
132134
Timeseries: []*metricspb.TimeSeries{
@@ -167,7 +169,7 @@ prometheus:
167169
_ = res.Body.Close()
168170
want := `# HELP test_this_one_there_where_ Extra ones
169171
# TYPE test_this_one_there_where_ counter
170-
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99.0
172+
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99
171173
`
172174
if got := string(blob); got != want {
173175
t.Errorf("Response mismatch\nGot:\n%s\n\nWant:\n%s", got, want)

go.mod

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

33
require (
4+
cloud.google.com/go v0.32.0 // indirect
45
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
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
79
github.com/Azure/azure-sdk-for-go v6.0.0-beta+incompatible // indirect
810
github.com/Azure/go-autorest v11.4.0+incompatible // indirect
11+
github.com/BurntSushi/toml v0.3.1 // indirect
912
github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 // indirect
1013
github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329
1114
github.com/VividCortex/gohistogram v1.0.0 // indirect
1215
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
16+
github.com/aws/aws-sdk-go v1.15.68 // indirect
1317
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
14-
github.com/census-instrumentation/opencensus-proto v0.2.0
18+
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8
1519
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
1620
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
1721
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
@@ -21,7 +25,7 @@ require (
2125
github.com/go-logfmt/logfmt v0.4.0 // indirect
2226
github.com/gogo/googleapis v1.1.0 // indirect
2327
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
24-
github.com/golang/protobuf v1.3.0
28+
github.com/golang/protobuf v1.2.0
2529
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
2630
github.com/googleapis/gnostic v0.2.0 // indirect
2731
github.com/gophercloud/gophercloud v0.0.0-20190206021053-df38e1611dbe // indirect
@@ -45,14 +49,14 @@ require (
4549
github.com/onsi/gomega v1.4.3 // indirect
4650
github.com/opentracing/opentracing-go v1.0.2 // indirect
4751
github.com/openzipkin/zipkin-go v0.1.3
48-
github.com/orijtech/prometheus-go-metrics-exporter v0.0.3-0.20190313163149-b321c5297f60
49-
github.com/orijtech/promreceiver v0.0.5
52+
github.com/orijtech/prometheus-go-metrics-exporter v0.0.2
53+
github.com/orijtech/promreceiver v0.0.3
5054
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5155
github.com/philhofer/fwd v1.0.0 // indirect
5256
github.com/pkg/errors v0.8.0
5357
github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect
54-
github.com/prometheus/client_golang v0.9.2
55-
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
58+
github.com/prometheus/client_golang v0.9.1
59+
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d
5660
github.com/prometheus/prometheus v0.0.0-20190131111325-62e591f928dd
5761
github.com/rs/cors v1.6.0
5862
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
@@ -68,18 +72,23 @@ require (
6872
github.com/uber/jaeger-lib v2.0.0+incompatible
6973
github.com/uber/tchannel-go v1.10.0
7074
github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb
71-
go.opencensus.io v0.19.0
75+
go.opencensus.io v0.18.1-0.20181204023538-aab39bd6a98b
7276
go.uber.org/atomic v1.3.2 // indirect
7377
go.uber.org/multierr v1.1.0 // indirect
7478
go.uber.org/zap v1.9.1
7579
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
76-
google.golang.org/api v0.1.0
80+
golang.org/x/oauth2 v0.0.0-20181102170140-232e45548389 // indirect
81+
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
82+
google.golang.org/api v0.0.0-20181102150758-04bb50b6b83d
83+
google.golang.org/appengine v1.3.0 // indirect
7784
google.golang.org/genproto v0.0.0-20190215211957-bd968387e4aa // indirect
78-
google.golang.org/grpc v1.18.0
85+
google.golang.org/grpc v1.17.0
7986
gopkg.in/DataDog/dd-trace-go.v1 v1.4.0 // indirect
8087
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
88+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
8189
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
82-
gopkg.in/yaml.v2 v2.2.2
90+
gopkg.in/inf.v0 v0.9.1 // indirect
91+
gopkg.in/yaml.v2 v2.2.1
8392
k8s.io/apimachinery v0.0.0-20190207091153-095b9d203467 // indirect
8493
k8s.io/kube-openapi v0.0.0-20190205224424-fd29a9f2f429 // indirect
8594
sigs.k8s.io/structured-merge-diff v0.0.0-20190130003954-e5e029740eb8 // indirect

0 commit comments

Comments
 (0)