vendor: google.golang.org/cloud -> cloud.google.com/go

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>

Author: AkihiroSuda

daemon/logger/gcplogs/gcplogging.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/docker/docker/daemon/logger"
 
+	"cloud.google.com/go/compute/metadata"
+	"cloud.google.com/go/logging"
 	"github.com/Sirupsen/logrus"
 	"golang.org/x/net/context"
-	"google.golang.org/cloud/compute/metadata"
-	"google.golang.org/cloud/logging"
 )
 
 const (
@@ -51,7 +51,7 @@ func init() {
 }
 
 type gcplogs struct {
-	client    *logging.Client
+	logger    *logging.Logger
 	instance  *instanceInfo
 	container *containerInfo
 }
@@ -114,17 +114,18 @@ func New(info logger.Info) (logger.Logger, error) {
 		return nil, fmt.Errorf("No project was specified and couldn't read project from the meatadata server. Please specify a project")
 	}
 
-	c, err := logging.NewClient(context.Background(), project, "gcplogs-docker-driver")
+	c, err := logging.NewClient(context.Background(), project)
 	if err != nil {
 		return nil, err
 	}
+	lg := c.Logger("gcplogs-docker-driver")
 
-	if err := c.Ping(); err != nil {
+	if err := c.Ping(context.Background()); err != nil {
 		return nil, fmt.Errorf("unable to connect or authenticate with Google Cloud Logging: %v", err)
 	}
 
 	l := &gcplogs{
-		client: c,
+		logger: lg,
 		container: &containerInfo{
 			Name:      info.ContainerName,
 			ID:        info.ContainerID,
@@ -157,11 +158,14 @@ func New(info logger.Info) (logger.Logger, error) {
 	// overflow func is called. We want to surface the error to the user
 	// without overly spamming /var/log/docker.log so we log the first time
 	// we overflow and every 1000th time after.
-	c.Overflow = func(_ *logging.Client, _ logging.Entry) error {
-		if i := atomic.AddUint64(&droppedLogs, 1); i%1000 == 1 {
-			logrus.Errorf("gcplogs driver has dropped %v logs", i)
+	c.OnError = func(err error) {
+		if err == logging.ErrOverflow {
+			if i := atomic.AddUint64(&droppedLogs, 1); i%1000 == 1 {
+				logrus.Errorf("gcplogs driver has dropped %v logs", i)
+			}
+		} else {
+			logrus.Error(err)
 		}
-		return nil
 	}
 
 	return l, nil
@@ -181,18 +185,20 @@ func ValidateLogOpts(cfg map[string]string) error {
 }
 
 func (l *gcplogs) Log(m *logger.Message) error {
-	return l.client.Log(logging.Entry{
-		Time: m.Timestamp,
+	l.logger.Log(logging.Entry{
+		Timestamp: m.Timestamp,
 		Payload: &dockerLogEntry{
 			Instance:  l.instance,
 			Container: l.container,
 			Data:      string(m.Line),
 		},
 	})
+	return nil
 }
 
 func (l *gcplogs) Close() error {
-	return l.client.Flush()
+	l.logger.Flush()
+	return nil
 }
 
 func (l *gcplogs) Name() string {

vendor.conf

@@ -89,9 +89,11 @@ github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
 github.com/bsphere/le_go d3308aafe090956bc89a65f0769f58251a1b4f03
 
 # gcplogs deps
-golang.org/x/oauth2 2baa8a1b9338cf13d9eeb27696d761155fa480be
-google.golang.org/api dc6d2353af16e2a2b0ff6986af051d473a4ed468
-google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0
+golang.org/x/oauth2 96382aa079b72d8c014eb0c50f6c223d1e6a2de0
+google.golang.org/api 3cc2e591b550923a2c5f0ab5a803feda924d5823
+cloud.google.com/go 9d965e63e8cceb1b5d7977a202f0fcb8866d6525
+github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7
+google.golang.org/genproto 9359a8d303c45e3212571b77610f1cefb0c6f3eb
 
 # native credentials
 github.com/docker/docker-credential-helpers f72c04f1d8e71959a6d103f808c50ccbad79b9fd