Mark deadline exceeded errors as recoverable errors. (#180)

Author: StevenYCChou

stackdriver/client.go

@@ -130,6 +130,9 @@ func (c *Client) getConnection(ctx context.Context) (*grpc.ClientConn, error) {
 	}
 	conn, err := grpc.DialContext(ctx, address, dopts...)
 	c.conn = conn
+	if err == context.DeadlineExceeded {
+		return conn, recoverableError{err}
+	}
 	return conn, err
 }
 
@@ -176,9 +179,10 @@ func (c *Client) Store(req *monitoring.CreateTimeSeriesRequest) error {
 					errors <- err
 					return
 				}
-				if status.Code() == codes.Unavailable {
+				switch status.Code() {
+				case codes.DeadlineExceeded, codes.Unavailable:
 					errors <- recoverableError{err}
-				} else {
+				default:
 					errors <- err
 				}
 			}

stackdriver/client_test.go

@@ -43,6 +43,32 @@ func newLocalListener() net.Listener {
 	return l
 }
 
+func TestStoreErrorHandlingOnTimeout(t *testing.T) {
+	listener := newLocalListener()
+	grpcServer := grpc.NewServer()
+	monitoring.RegisterMetricServiceServer(grpcServer, &metricServiceServer{nil})
+	go grpcServer.Serve(listener)
+	defer grpcServer.Stop()
+
+	serverURL, err := url.Parse("https://" + listener.Addr().String() + "?auth=false")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	c := NewClient(&ClientConfig{
+		URL:     serverURL,
+		Timeout: 0, // Immeditate Timeout.
+	})
+	err = c.Store(&monitoring.CreateTimeSeriesRequest{
+		TimeSeries: []*monitoring.TimeSeries{
+			&monitoring.TimeSeries{},
+		},
+	})
+	if _, recoverable := err.(recoverableError); !recoverable {
+		t.Errorf("expected recoverableError in error %v", err)
+	}
+}
+
 func TestStoreErrorHandling(t *testing.T) {
 	tests := []struct {
 		status      *status.Status
@@ -59,6 +85,10 @@ func TestStoreErrorHandling(t *testing.T) {
 			status:      status.New(codes.Unavailable, longErrMessage),
 			recoverable: true,
 		},
+		{
+			status:      status.New(codes.DeadlineExceeded, longErrMessage),
+			recoverable: true,
+		},
 	}
 
 	for i, test := range tests {