From 0632909af4028fc165099135837a61d2596a6555 Mon Sep 17 00:00:00 2001 From: Vlad Daniel Barosan Date: Tue, 16 Oct 2018 09:08:13 -0700 Subject: [PATCH] Update dependencies --- Gopkg.lock | 174 ++++++++++++++++++++++++++++++++++- Gopkg.toml | 8 ++ autorest/azure/async.go | 18 +++- autorest/azure/async_test.go | 15 +-- autorest/tracing/tracing.go | 2 - 5 files changed, 204 insertions(+), 13 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 22538d707..75051618b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,6 +1,26 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + digest = "1:e1b859e3d9e90007d5fbf25edf57733b224f1857f6592636130afab3af8cfae7" + name = "contrib.go.opencensus.io/exporter/ocagent" + packages = ["."] + pruneopts = "" + revision = "00af367e65149ff1f2f4b93bbfbb84fd9297170d" + version = "v0.2.0" + +[[projects]] + digest = "1:e0a4505d5cf7ac6b5d92e3aee79d838b5f1ae8e9641ec7fa5d1e9b01d7a7ea95" + name = "github.com/census-instrumentation/opencensus-proto" + packages = [ + "gen-go/agent/common/v1", + "gen-go/agent/trace/v1", + "gen-go/trace/v1", + ] + pruneopts = "" + revision = "24333298e36590ea0716598caacc8959fc393c48" + version = "v0.0.2" + [[projects]] digest = "1:0deddd908b6b4b768cfc272c16ee61e7088a60f7fe2f06c547bd3d8e1f8b8e77" name = "github.com/davecgh/go-spew" @@ -25,6 +45,21 @@ revision = "5448fe645cb1964ba70ac8f9f2ffe975e61a536c" version = "v1.0.0" +[[projects]] + digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18" + name = "github.com/golang/protobuf" + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp", + "ptypes/wrappers", + ] + pruneopts = "" + revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + version = "v1.2.0" + [[projects]] digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf" name = "github.com/mitchellh/go-homedir" @@ -54,23 +89,158 @@ [[projects]] branch = "master" - digest = "1:d10ba2393047dc9ba61df4d36c849a03017175edfa3ee4da23c3a12e10326443" + digest = "1:823ae1db8fa98668e52990ee27a0509f5c5770f23f4afbc6f87a9ee5fbdea88a" + name = "go.opencensus.io" + packages = [ + ".", + "exemplar", + "internal", + "internal/tagencoding", + "plugin/ochttp", + "plugin/ochttp/propagation/b3", + "plugin/ochttp/propagation/tracecontext", + "stats", + "stats/internal", + "stats/view", + "tag", + "trace", + "trace/internal", + "trace/propagation", + "trace/tracestate", + ] + pruneopts = "" + revision = "1eb9a13c7dd02141e065a665f6bf5c99a090a16a" + +[[projects]] + branch = "master" + digest = "1:78f41d38365ccef743e54ed854a2faf73313ba0750c621116a8eeb0395590bd0" name = "golang.org/x/crypto" packages = [ "pkcs12", "pkcs12/internal/rc2", ] pruneopts = "" - revision = "5295e8364332db77d75fce11f1d19c053919a9c9" + revision = "0c41d7ab0a0ee717d4590a44bcb987dfd9e183eb" + +[[projects]] + branch = "master" + digest = "1:547dcb6aebfb7fb17947660ebb034470c13f4d63d893def190a2f7ba3d09bc38" + name = "golang.org/x/net" + packages = [ + "context", + "http/httpguts", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "trace", + ] + pruneopts = "" + revision = "49bb7cea24b1df9410e1712aa6433dae904ff66a" + +[[projects]] + branch = "master" + digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1" + name = "golang.org/x/sync" + packages = ["semaphore"] + pruneopts = "" + revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" + +[[projects]] + branch = "master" + digest = "1:2ed0bf267e44950120acd95570227e28184573ffb099bd85b529ee148e004ddb" + name = "golang.org/x/sys" + packages = ["unix"] + pruneopts = "" + revision = "fa43e7bc11baaae89f3f902b2b4d832b68234844" + +[[projects]] + digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4" + name = "golang.org/x/text" + packages = [ + "collate", + "collate/build", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "language", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable", + ] + pruneopts = "" + revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" + version = "v0.3.0" + +[[projects]] + branch = "master" + digest = "1:ca2e72555afbcebdead7c961b135650b5111dbbaf37a874de63976fdda57f129" + name = "google.golang.org/api" + packages = ["support/bundler"] + pruneopts = "" + revision = "c51f30376ab7ec4f22b65de846a41593c8b70f07" + +[[projects]] + branch = "master" + digest = "1:1b3b4ec811695907c4a3cb92e4f32834a4a42459bff7e02068b6b2b5344803cd" + name = "google.golang.org/genproto" + packages = ["googleapis/rpc/status"] + pruneopts = "" + revision = "af9cb2a35e7f169ec875002c1829c9b315cddc04" + +[[projects]] + digest = "1:15656947b87a6a240e61dcfae9e71a55a8d5677f240d12ab48f02cdbabf1e309" + name = "google.golang.org/grpc" + packages = [ + ".", + "balancer", + "balancer/base", + "balancer/roundrobin", + "codes", + "connectivity", + "credentials", + "encoding", + "encoding/proto", + "grpclog", + "internal", + "internal/backoff", + "internal/channelz", + "internal/envconfig", + "internal/grpcrand", + "internal/transport", + "keepalive", + "metadata", + "naming", + "peer", + "resolver", + "resolver/dns", + "resolver/passthrough", + "stats", + "status", + "tap", + ] + pruneopts = "" + revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" + version = "v1.15.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 input-imports = [ + "contrib.go.opencensus.io/exporter/ocagent", "github.com/dgrijalva/jwt-go", "github.com/dimchansky/utfbom", "github.com/mitchellh/go-homedir", "github.com/stretchr/testify/require", + "go.opencensus.io/plugin/ochttp", + "go.opencensus.io/plugin/ochttp/propagation/tracecontext", + "go.opencensus.io/stats/view", + "go.opencensus.io/trace", "golang.org/x/crypto/pkcs12", ] solver-name = "gps-cdcl" diff --git a/Gopkg.toml b/Gopkg.toml index 66589ce73..5b76538d5 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -35,3 +35,11 @@ [[constraint]] name = "github.com/stretchr/testify" version = "1.2.0" + +[[constraint]] + name = "go.opencensus.io" + branch = "master" + +[[constraint]] + name = "contrib.go.opencensus.io/exporter/ocagent" + version = "0.2.0" diff --git a/autorest/azure/async.go b/autorest/azure/async.go index 603102826..6c4e7fb93 100644 --- a/autorest/azure/async.go +++ b/autorest/azure/async.go @@ -96,7 +96,14 @@ func (f *Future) Done(sender autorest.Sender) (bool, error) { // DoneWithContext queries the service to see if the operation has completed. func (f *Future) DoneWithContext(ctx context.Context, sender autorest.Sender) (done bool, err error) { ctx = tracing.StartSpan(ctx, "github.com/Azure/go-autorest/autorest/azure/async.DoneWithContext") - defer func() { tracing.EndSpan(ctx, f.Response().StatusCode, err) }() + defer func() { + sc := -1 + resp := f.Response() + if resp != nil { + sc = resp.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() // support for legacy Future implementation if f.req != nil { @@ -177,7 +184,14 @@ func (f Future) WaitForCompletion(ctx context.Context, client autorest.Client) e // the retry value defined in the client up to the maximum retry attempts. func (f *Future) WaitForCompletionRef(ctx context.Context, client autorest.Client) (err error) { ctx = tracing.StartSpan(ctx, "github.com/Azure/go-autorest/autorest/azure/async.WaitForCompletionRef") - defer func() { tracing.EndSpan(ctx, f.Response().StatusCode, err) }() + defer func() { + sc := -1 + resp := f.Response() + if resp != nil { + sc = resp.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() cancelCtx := ctx if d := client.PollingDuration; d != 0 { var cancel context.CancelFunc diff --git a/autorest/azure/async_test.go b/autorest/azure/async_test.go index e1e3fcf3c..61cb821e7 100644 --- a/autorest/azure/async_test.go +++ b/autorest/azure/async_test.go @@ -488,7 +488,7 @@ func TestPollPutTrackerSuccessNoHeaders(t *testing.T) { } sender := mocks.NewSender() sender.AppendResponse(newProvisioningStatusResponse("InProgress")) - err = pt.pollForStatus(sender) + err = pt.pollForStatus(context.Background(), sender) if err != nil { t.Fatalf("failed to poll for status: %v", err) } @@ -506,7 +506,7 @@ func TestPollPutTrackerFailNoHeadersEmptyBody(t *testing.T) { } sender := mocks.NewSender() sender.AppendResponse(mocks.NewResponseWithBodyAndStatus(&mocks.Body{}, http.StatusOK, "status ok")) - err = pt.pollForStatus(sender) + err = pt.pollForStatus(context.Background(), sender) if err != nil { t.Fatalf("failed to poll for status: %v", err) } @@ -526,7 +526,7 @@ func TestAsyncPollingReturnsWrappedError(t *testing.T) { } sender := mocks.NewSender() sender.AppendResponse(newOperationResourceErrorResponse("Failed")) - err = pt.pollForStatus(sender) + err = pt.pollForStatus(context.Background(), sender) if err == nil { t.Fatal("unexpected nil polling error") } @@ -551,7 +551,7 @@ func TestLocationPollingReturnsWrappedError(t *testing.T) { } sender := mocks.NewSender() sender.AppendResponse(newProvisioningStatusErrorResponse("Failed")) - err = pt.pollForStatus(sender) + err = pt.pollForStatus(context.Background(), sender) if err == nil { t.Fatal("unexpected nil polling error") } @@ -576,7 +576,7 @@ func TestLocationPollingReturnsUnwrappedError(t *testing.T) { } sender := mocks.NewSender() sender.AppendResponse(newProvisioningStatusUnwrappedErrorResponse("Failed")) - err = pt.pollForStatus(sender) + err = pt.pollForStatus(context.Background(), sender) if err == nil { t.Fatal("unexpected nil polling error") } @@ -684,6 +684,7 @@ func TestFuture_PollsUntilProvisioningStatusSucceeds(t *testing.T) { r3 := newOperationResourceResponse(operationSucceeded) sender := mocks.NewSender() + ctx := context.Background() sender.AppendAndRepeatResponse(r2, 2) sender.AppendResponse(r3) @@ -692,7 +693,7 @@ func TestFuture_PollsUntilProvisioningStatusSucceeds(t *testing.T) { t.Fatalf("failed to create future: %v", err) } - for done, err := future.Done(sender); !done; done, err = future.Done(sender) { + for done, err := future.DoneWithContext(ctx, sender); !done; done, err = future.DoneWithContext(ctx, sender) { if future.PollingMethod() != PollingAsyncOperation { t.Fatalf("wrong future polling method: %s", future.PollingMethod()) } @@ -955,7 +956,7 @@ func TestFuture_GetResultFromNonAsyncOperation(t *testing.T) { if pm := future.PollingMethod(); pm != PollingUnknown { t.Fatalf("wrong polling method: %s", pm) } - done, err := future.Done(nil) + done, err := future.DoneWithContext(context.Background(), nil) if err != nil { t.Fatalf("failed to check status: %v", err) } diff --git a/autorest/tracing/tracing.go b/autorest/tracing/tracing.go index a03445b0f..9e95ae3ad 100644 --- a/autorest/tracing/tracing.go +++ b/autorest/tracing/tracing.go @@ -95,11 +95,9 @@ func initStats() (err error) { ochttp.ClientReceivedBytesDistribution, ochttp.ClientSentBytesDistribution, } - if err = view.Register(clientViews...); err != nil { return err } - return }