Rename Topic's Name method to String.

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"
         "errors"
         "fmt"
         "sync"
         "time"
 
         "cloud.google.com/go/pubsub"
         "github.com/luci/luci-go/common/data/recordio"
         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/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"
         "golang.org/x/net/context"
 )
 
 // Topic is an interface for a Pub/Sub topic.
 //
 // pubsub.Topic implements Topic.
 type Topic interface {
-        // Name returns the name of the topic.
-        Name() string
+        // String returns the name of the topic.
+        String() string
 
         // Publish mirrors the pubsub.Connection Publish method.
         Publish(context.Context, ...*pubsub.Message) ([]string, error)
 }
 
 var _ Topic = (*pubsub.Topic)(nil)
 
 // Config is a configuration structure for Pub/Sub output.
 type Config struct {
         // Topic is the Pub/Sub topic to publish to.
@@ skipping 41 matching lines @@
 
         if c.Track {
                 o.et = &output.EntryTracker{}
         }
 
         o.Context = log.SetField(ctx, "pubsub", &o)
         return &o
 }
 
 func (o *pubSubOutput) String() string {
-        return fmt.Sprintf("pubsub(%s)", o.Topic.Name())
+        return fmt.Sprintf("pubsub(%s)", o.Topic.String())
 }
 
 func (o *pubSubOutput) SendBundle(bundle *logpb.ButlerLogBundle) error {
         st := output.StatsBase{}
         defer o.mergeStats(&st)
 
         b := o.bufferPool.Get().(*buffer)
         defer o.bufferPool.Put(b)
 
         bundle.Secret = []byte(o.Secret)
@@ skipping 116 matching lines @@
 // indefiniteRetry is a retry.Iterator that will indefinitely retry errors with
 // a maximum backoff.
 func indefiniteRetry() retry.Iterator {
         return &retry.ExponentialBackoff{
                 Limited: retry.Limited{
                         Retries: -1,
                 },
                 MaxDelay: 30 * time.Second,
         }
 }