report timeout errors separately

internal/reddit/client.go

@@ -107,6 +107,9 @@ func (rac *AuthenticatedClient) request(r *Request, rh ResponseHandler, empty in
 
 	if err != nil {
 		rac.statsd.Incr("reddit.api.errors", r.tags, 0.1)
+		if strings.Contains(err.Error(), "http2: timeout awaiting response headers") {
+			return nil, ErrTimeout
+		}
 		return nil, err
 	}
 	defer resp.Body.Close()

internal/reddit/errors.go

@@ -16,4 +16,6 @@ func (se ServerError) Error() string {
 var (
 	// ErrOauthRevoked .
 	ErrOauthRevoked = errors.New("oauth revoked")
+	// ErrTimeout .
+	ErrTimeout = errors.New("timeout")
 )

internal/worker/notifications.go

@@ -243,25 +243,28 @@ func (nc *notificationsConsumer) Consume(delivery rmq.Delivery) {
 	msgs, err := rac.MessageInbox(opts...)
 
 	if err != nil {
-		if err != reddit.ErrOauthRevoked {
+		switch err {
+		case reddit.ErrTimeout: // Don't log timeouts
+			break
+		case reddit.ErrOauthRevoked:
+			err = nc.deleteAccount(ctx, account)
+			if err != nil {
+				nc.logger.WithFields(logrus.Fields{
+					"account#username": account.NormalizedUsername(),
+					"err":              err,
+				}).Error("failed to remove revoked account")
+				return
+			}
+			nc.logger.WithFields(logrus.Fields{
+				"account#username": account.NormalizedUsername(),
+			}).Info("removed revoked account")
+			break
+		default:
 			nc.logger.WithFields(logrus.Fields{
 				"account#username": account.NormalizedUsername(),
 				"err":              err,
 			}).Error("failed to fetch message inbox")
-			return
 		}
-
-		err = nc.deleteAccount(ctx, account)
-		if err != nil {
-			nc.logger.WithFields(logrus.Fields{
-				"account#username": account.NormalizedUsername(),
-				"err":              err,
-			}).Error("failed to remove revoked account")
-			return
-		}
-		nc.logger.WithFields(logrus.Fields{
-			"account#username": account.NormalizedUsername(),
-		}).Info("removed revoked account")
 		return
 	}