Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 06d21f1

Browse files
authored
Bump cloud.google.com/go dependencies (#307)
* Bump cloud.google.com/go dependencies Signed-off-by: Luca Comellini <luca.com@gmail.com> * Remove deprecated imports Signed-off-by: Luca Comellini <luca.com@gmail.com>
1 parent 1759e7e commit 06d21f1

17 files changed

Lines changed: 490 additions & 60 deletions

equivalence_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
3131
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
3232

33+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
3334
"github.com/golang/protobuf/ptypes/empty"
3435
timestamp "github.com/golang/protobuf/ptypes/timestamp"
3536
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
3637
monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
37-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
3838
)
3939

4040
func TestStatsAndMetricsEquivalence(t *testing.T) {

go.mod

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,32 @@ module contrib.go.opencensus.io/exporter/stackdriver
33
go 1.17
44

55
require (
6-
cloud.google.com/go/compute v1.6.1
7-
cloud.google.com/go/monitoring v1.1.0
8-
cloud.google.com/go/trace v1.0.0
6+
cloud.google.com/go/compute/metadata v0.2.3
7+
cloud.google.com/go/monitoring v1.10.0
8+
cloud.google.com/go/trace v1.5.0
99
github.com/aws/aws-sdk-go v1.43.31
1010
github.com/census-instrumentation/opencensus-proto v0.3.0
1111
github.com/golang/protobuf v1.5.2
1212
github.com/google/go-cmp v0.5.9
1313
github.com/jstemmer/go-junit-report v0.9.1
1414
github.com/prometheus/prometheus v0.35.0
15-
go.opencensus.io v0.23.0
16-
golang.org/x/net v0.1.0
17-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
18-
google.golang.org/api v0.81.0
19-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
20-
google.golang.org/grpc v1.46.2
21-
google.golang.org/protobuf v1.28.0
15+
go.opencensus.io v0.24.0
16+
golang.org/x/net v0.5.0
17+
golang.org/x/oauth2 v0.4.0
18+
google.golang.org/api v0.106.0
19+
google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf
20+
google.golang.org/grpc v1.51.0
21+
google.golang.org/protobuf v1.28.1
2222
)
2323

2424
require (
25+
cloud.google.com/go/compute v1.14.0 // indirect
2526
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
26-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
27+
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
28+
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
2729
github.com/jmespath/go-jmespath v0.4.0 // indirect
28-
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
29-
golang.org/x/sys v0.1.0 // indirect
30-
golang.org/x/text v0.4.0 // indirect
30+
golang.org/x/sync v0.1.0 // indirect
31+
golang.org/x/sys v0.4.0 // indirect
32+
golang.org/x/text v0.6.0 // indirect
3133
google.golang.org/appengine v1.6.7 // indirect
3234
)

go.sum

Lines changed: 457 additions & 30 deletions
Large diffs are not rendered by default.

metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"go.opencensus.io/trace"
3030
"google.golang.org/protobuf/proto"
3131

32+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
3233
distributionpb "google.golang.org/genproto/googleapis/api/distribution"
3334
labelpb "google.golang.org/genproto/googleapis/api/label"
3435
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
3536
monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
36-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
3737

3838
"contrib.go.opencensus.io/exporter/stackdriver/monitoredresource"
3939
"go.opencensus.io/metric/metricdata"

metrics_batcher.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"time"
2525

2626
monitoring "cloud.google.com/go/monitoring/apiv3/v2"
27-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
27+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
2828
)
2929

3030
const (
@@ -209,7 +209,8 @@ func newWorker(
209209
reqsChan chan *monitoringpb.CreateTimeSeriesRequest,
210210
respsChan chan *response,
211211
wg *sync.WaitGroup,
212-
timeout time.Duration) *worker {
212+
timeout time.Duration,
213+
) *worker {
213214
return &worker{
214215
ctx: ctx,
215216
mc: mc,

metrics_batcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"testing"
2222

2323
monitoring "cloud.google.com/go/monitoring/apiv3/v2"
24+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
2425
"google.golang.org/api/option"
2526
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
26-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
2727
"google.golang.org/grpc"
2828
"google.golang.org/grpc/credentials/insecure"
2929
)

metrics_proto.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929

3030
"go.opencensus.io/resource"
3131

32+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
3233
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
3334
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
3435
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
@@ -38,7 +39,6 @@ import (
3839
labelpb "google.golang.org/genproto/googleapis/api/label"
3940
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
4041
monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
41-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
4242
)
4343

4444
var (

metrics_proto_api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"google.golang.org/protobuf/proto"
3232
"google.golang.org/protobuf/testing/protocmp"
3333

34+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
3435
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
3536
monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
36-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
3737
"google.golang.org/grpc"
3838

3939
sd "contrib.go.opencensus.io/exporter/stackdriver"

metrics_proto_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020
"strings"
2121
"testing"
2222

23+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
2324
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
2425
"github.com/golang/protobuf/ptypes/timestamp"
2526
"google.golang.org/api/option"
2627
distributionpb "google.golang.org/genproto/googleapis/api/distribution"
2728
labelpb "google.golang.org/genproto/googleapis/api/label"
2829
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
2930
monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
30-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
3131
"google.golang.org/grpc"
3232
"google.golang.org/grpc/credentials/insecure"
3333
"google.golang.org/protobuf/testing/protocmp"

metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"github.com/golang/protobuf/ptypes/timestamp"
2525
"google.golang.org/protobuf/proto"
2626

27+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
2728
distributionpb "google.golang.org/genproto/googleapis/api/distribution"
2829
labelpb "google.golang.org/genproto/googleapis/api/label"
2930
googlemetricpb "google.golang.org/genproto/googleapis/api/metric"
3031
monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
31-
monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
3232

3333
"contrib.go.opencensus.io/exporter/stackdriver/monitoredresource"
3434
"go.opencensus.io/metric/metricdata"

0 commit comments

Comments
 (0)