Skip to content

Commit

Permalink
Upgrade opencensus-proto version to v0.2.0. (census-instrumentation#490)
Browse files Browse the repository at this point in the history 
* 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.
  • Loading branch information
@songy23
songy23 authored Mar 13, 2019
1 parent 953218b commit 392ee4a
Show file tree
Hide file tree
Showing 6 changed files with 164 additions and 99 deletions.
18 changes: 8 additions & 10 deletions exporter/prometheusexporter/prometheus_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,13 @@ prometheus:
}

var metric1 = &metricspb.Metric{
Descriptor_: &metricspb.Metric_MetricDescriptor{
MetricDescriptor: &metricspb.MetricDescriptor{
Name: "this/one/there(where)",
Description: "Extra ones",
Unit: "1",
LabelKeys: []*metricspb.LabelKey{
{Key: "os", Description: "Operating system"},
{Key: "arch", Description: "Architecture"},
},
MetricDescriptor: &metricspb.MetricDescriptor{
Name: "this/one/there(where)",
Description: "Extra ones",
Unit: "1",
LabelKeys: []*metricspb.LabelKey{
{Key: "os", Description: "Operating system"},
{Key: "arch", Description: "Architecture"},
},
},
Timeseries: []*metricspb.TimeSeries{
Expand Down Expand Up @@ -169,7 +167,7 @@ prometheus:
_ = res.Body.Close()
want := `# HELP test_this_one_there_where_ Extra ones
# TYPE test_this_one_there_where_ counter
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99
test_this_one_there_where_{arch="x86",code="one",foo="bar",os="windows"} 99.0
`
if got := string(blob); got != want {
t.Errorf("Response mismatch\nGot:\n%s\n\nWant:\n%s", got, want)
Expand Down
34 changes: 12 additions & 22 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
module github.com/census-instrumentation/opencensus-service

require (
cloud.google.com/go v0.32.0 // indirect
contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0
contrib.go.opencensus.io/exporter/ocagent v0.4.6
contrib.go.opencensus.io/exporter/stackdriver v0.9.1
git.apache.org/thrift.git v0.0.0-20181101003639-92be4f312b88 // indirect
contrib.go.opencensus.io/exporter/ocagent v0.4.7
contrib.go.opencensus.io/exporter/stackdriver v0.9.2
github.com/Azure/azure-sdk-for-go v6.0.0-beta+incompatible // indirect
github.com/Azure/go-autorest v11.4.0+incompatible // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 // indirect
github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329
github.com/VividCortex/gohistogram v1.0.0 // indirect
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
github.com/aws/aws-sdk-go v1.15.68 // indirect
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8
github.com/census-instrumentation/opencensus-proto v0.2.0
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
Expand All @@ -25,7 +21,7 @@ require (
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/gogo/googleapis v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/golang/protobuf v1.2.0
github.com/golang/protobuf v1.3.0
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gophercloud/gophercloud v0.0.0-20190206021053-df38e1611dbe // indirect
Expand All @@ -41,7 +37,6 @@ require (
github.com/honeycombio/opencensus-exporter v0.0.0-20181101214123-9be2bb327b5a
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jaegertracing/jaeger v1.8.2
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
github.com/json-iterator/go v1.1.5 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
Expand All @@ -50,14 +45,14 @@ require (
github.com/onsi/gomega v1.4.3 // indirect
github.com/opentracing/opentracing-go v1.0.2 // indirect
github.com/openzipkin/zipkin-go v0.1.3
github.com/orijtech/prometheus-go-metrics-exporter v0.0.2
github.com/orijtech/promreceiver v0.0.3
github.com/orijtech/prometheus-go-metrics-exporter v0.0.3-0.20190313163149-b321c5297f60
github.com/orijtech/promreceiver v0.0.5
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/philhofer/fwd v1.0.0 // indirect
github.com/pkg/errors v0.8.0
github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect
github.com/prometheus/client_golang v0.9.1
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
github.com/prometheus/prometheus v0.0.0-20190131111325-62e591f928dd
github.com/rs/cors v1.6.0
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
Expand All @@ -73,23 +68,18 @@ require (
github.com/uber/jaeger-lib v1.5.0
github.com/uber/tchannel-go v1.10.0
github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb
go.opencensus.io v0.18.1-0.20181204023538-aab39bd6a98b
go.opencensus.io v0.19.0
go.uber.org/atomic v1.3.2 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.9.1
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
golang.org/x/oauth2 v0.0.0-20181102170140-232e45548389 // indirect
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
google.golang.org/api v0.0.0-20181102150758-04bb50b6b83d
google.golang.org/appengine v1.3.0 // indirect
google.golang.org/api v0.1.0
google.golang.org/genproto v0.0.0-20190215211957-bd968387e4aa // indirect
google.golang.org/grpc v1.17.0
google.golang.org/grpc v1.18.0
gopkg.in/DataDog/dd-trace-go.v1 v1.4.0 // indirect
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.2.1
gopkg.in/yaml.v2 v2.2.2
k8s.io/apimachinery v0.0.0-20190207091153-095b9d203467 // indirect
k8s.io/kube-openapi v0.0.0-20190205224424-fd29a9f2f429 // indirect
sigs.k8s.io/structured-merge-diff v0.0.0-20190130003954-e5e029740eb8 // indirect
Expand Down
Loading

0 comments on commit 392ee4a

Please sign in to comment.