Skip to content

Commit

Permalink
update dependencies (#320)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dashpole
dashpole authored Feb 9, 2022
1 parent df653dc commit 35c7f3e
Show file tree
Hide file tree
Showing 17 changed files with 568 additions and 193 deletions.
5 changes: 3 additions & 2 deletions e2e-test-server/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-serve
go 1.16

require (
cloud.google.com/go/pubsub v1.13.0
cloud.google.com/go/iam v0.1.1 // indirect
cloud.google.com/go/pubsub v1.17.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.0.0
go.opentelemetry.io/otel v1.3.0
go.opentelemetry.io/otel/sdk v1.3.0
go.opentelemetry.io/otel/trace v1.3.0
google.golang.org/genproto v0.0.0-20210722135532-667f2b7c528f
google.golang.org/genproto v0.0.0-20220207185906-7721543eae58
)

replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace => ../exporter/trace
125 changes: 100 additions & 25 deletions e2e-test-server/go.sum
View file

Large diffs are not rendered by default.

90 changes: 74 additions & 16 deletions example/metric/go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion example/trace/http/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trac
require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.0.0
github.com/davecgh/go-spew v1.1.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0
go.opentelemetry.io/otel v1.3.0
go.opentelemetry.io/otel/sdk v1.3.0
go.opentelemetry.io/otel/trace v1.3.0
Expand Down
110 changes: 90 additions & 20 deletions example/trace/http/go.sum
View file

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions exporter/collector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.40.0
github.com/stretchr/testify v1.7.0
go.opencensus.io v0.23.0
go.opentelemetry.io/collector/model v0.40.0
go.opentelemetry.io/collector/model v0.44.0
go.opentelemetry.io/otel v1.3.0
go.opentelemetry.io/otel/sdk v1.3.0
go.opentelemetry.io/otel/trace v1.3.0
google.golang.org/api v0.60.0
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c
google.golang.org/grpc v1.42.0
google.golang.org/api v0.68.0
google.golang.org/genproto v0.0.0-20220207185906-7721543eae58
google.golang.org/grpc v1.44.0
google.golang.org/protobuf v1.27.1
)

require (
cloud.google.com/go/monitoring v1.1.0
cloud.google.com/go/trace v1.0.0 // indirect
github.com/google/go-cmp v0.5.6
go.uber.org/zap v1.19.1
cloud.google.com/go/monitoring v1.2.0
github.com/google/go-cmp v0.5.7
go.uber.org/zap v1.21.0
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
)

Expand Down
85 changes: 50 additions & 35 deletions exporter/collector/go.sum
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion exporter/collector/googlecloud.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"google.golang.org/api/option"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

cloudtrace "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace"
)
Expand Down Expand Up @@ -57,7 +58,7 @@ func generateClientOptions(cfg *ClientConfig, userAgent string) ([]option.Client
// following user agent will be used by both exporters if we reach this branch
dialOpts := []grpc.DialOption{
grpc.WithStatsHandler(&ocgrpc.ClientHandler{}),
grpc.WithInsecure(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
}
if userAgent != "" {
dialOpts = append(dialOpts, grpc.WithUserAgent(userAgent))
Expand Down
15 changes: 8 additions & 7 deletions exporter/collector/integrationtest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ go 1.16

require (
contrib.go.opencensus.io/exporter/stackdriver v0.13.10
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.0.0-20220111155622-771af0772772
github.com/google/go-cmp v0.5.6
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.0.0-20220208161221-df653dc6cb10
github.com/aws/aws-sdk-go v1.42.49 // indirect
github.com/google/go-cmp v0.5.7
github.com/stretchr/testify v1.7.0
go.opencensus.io v0.23.0
go.opentelemetry.io/collector v0.40.0
go.opentelemetry.io/collector/model v0.40.0
go.uber.org/zap v1.19.1
google.golang.org/api v0.60.0
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c
google.golang.org/grpc v1.42.0
go.opentelemetry.io/collector/model v0.44.0
go.uber.org/zap v1.21.0
google.golang.org/api v0.68.0
google.golang.org/genproto v0.0.0-20220207185906-7721543eae58
google.golang.org/grpc v1.44.0
google.golang.org/protobuf v1.27.1
)

Expand Down
83 changes: 53 additions & 30 deletions exporter/collector/integrationtest/go.sum
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion exporter/collector/integrationtest/inmemoryocexporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"go.opencensus.io/stats/view"
"google.golang.org/api/option"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
)
Expand Down Expand Up @@ -91,7 +92,7 @@ func NewInMemoryOCViewExporter() (*InMemoryOCExporter, error) {
return nil, err
}
go testServer.Serve()
conn, err := grpc.Dial(testServer.Endpoint, grpc.WithInsecure())
conn, err := grpc.Dial(testServer.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
return nil, err
}
Expand Down
14 changes: 8 additions & 6 deletions exporter/metric/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metri
go 1.16

require (
cloud.google.com/go/monitoring v0.1.0
cloud.google.com/go/monitoring v1.2.0
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3
github.com/stretchr/testify v1.7.0
Expand All @@ -13,11 +14,12 @@ require (
go.opentelemetry.io/otel/sdk v1.3.0
go.opentelemetry.io/otel/sdk/export/metric v0.26.0
go.opentelemetry.io/otel/sdk/metric v0.26.0
golang.org/x/net v0.0.0-20210716203947-853a461950ff // indirect
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a
google.golang.org/api v0.54.0
google.golang.org/genproto v0.0.0-20210813162853-db860fec028c
google.golang.org/grpc v1.39.1
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect
google.golang.org/api v0.68.0
google.golang.org/genproto v0.0.0-20220207185906-7721543eae58
google.golang.org/grpc v1.44.0
google.golang.org/protobuf v1.27.1
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
)
Expand Down
Loading

0 comments on commit 35c7f3e

Please sign in to comment.