[errors] de-specialize Transient in favor of Tags.

logdog/client/butler/output/pubsub/pubsubOutput.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package pubsub
 
 import (
         "bytes"
         "fmt"
         "sync"
         "time"
 
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/data/recordio"
         "github.com/luci/luci-go/common/errors"
         gcps "github.com/luci/luci-go/common/gcloud/pubsub"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/retry"
+        "github.com/luci/luci-go/common/retry/transient"
         "github.com/luci/luci-go/grpc/grpcutil"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/client/butler/output"
         "github.com/luci/luci-go/logdog/client/butlerproto"
         "github.com/luci/luci-go/logdog/common/types"
 
         "cloud.google.com/go/pubsub"
         "golang.org/x/net/context"
 )
 
@@ skipping 158 matching lines @@
         return &pubsub.Message{
                 Data: buf.Bytes(),
         }, nil
 }
 
 // publishMessage handles an individual publish request. It will indefinitely
 // retry transient errors until the publish succeeds.
 func (o *pubSubOutput) publishMessage(message *pubsub.Message) error {
         var messageID string
         transientErrors := 0
-        err := retry.Retry(o, retry.TransientOnly(indefiniteRetry), func() (err error) {
+        err := retry.Retry(o, transient.Only(indefiniteRetry), func() (err error) {
                 ctx := o.Context
                 if o.RPCTimeout > 0 {
                         var cancelFunc context.CancelFunc
                         ctx, cancelFunc = clock.WithTimeout(o, o.RPCTimeout)
                         defer cancelFunc()
                 }
 
                 messageID, err = o.Topic.Publish(ctx, message)
                 if err == context.DeadlineExceeded {
                         // If we hit our publish deadline, retry.
-                        err = errors.WrapTransient(err)
+                        err = transient.Tag.Apply(err)
                 } else {
                         err = grpcutil.WrapIfTransient(err)
                 }
                 return
         }, func(err error, d time.Duration) {
                 log.Fields{
                         log.ErrorKey: err,
                         "delay":      d,
                 }.Warningf(o, "TRANSIENT error publishing messages; retrying...")
                 transientErrors++
@@ skipping 29 matching lines @@
 // a maximum backoff.
 func indefiniteRetry() retry.Iterator {
         return &retry.ExponentialBackoff{
                 Limited: retry.Limited{
                         Retries: -1,
                         Delay:   500 * time.Millisecond,
                 },
                 MaxDelay: 30 * time.Second,
         }
 }