Skip to content
This repository has been archived by the owner on Feb 12, 2025. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Vlad Daniel Barosan committed Oct 16, 2018
1 parent dfbbd78 commit 0632909
Show file tree
Hide file tree
Showing 5 changed files with 204 additions and 13 deletions.
174 changes: 172 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
18 changes: 16 additions & 2 deletions autorest/azure/async.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions autorest/azure/async_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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")
}
Expand All @@ -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")
}
Expand All @@ -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")
}
Expand Down Expand Up @@ -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)

Expand All @@ -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())
}
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 0 additions & 2 deletions autorest/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,9 @@ func initStats() (err error) {
ochttp.ClientReceivedBytesDistribution,
ochttp.ClientSentBytesDistribution,
}

if err = view.Register(clientViews...); err != nil {
return err
}

return
}

Expand Down

0 comments on commit 0632909

Please sign in to comment.