Minor error handling improvements

Author: kinyoklion

packages/common_client/lib/src/data_sources/polling_data_source.dart

@@ -5,6 +5,7 @@ import 'dart:math';
 
 import '../config/data_source_config.dart';
 import 'data_source.dart';
+import 'data_source_status.dart';
 import 'requestor.dart';
 
 HttpClient _defaultHttpClientFactory(HttpProperties httpProperties) {
@@ -100,14 +101,17 @@ final class PollingDataSource implements DataSource {
         _eventController.sink.add(event);
       case StatusEvent():
         _eventController.sink.add(event);
+        final suffix = event.shutdown ? 'stopping polling' : 'will retry';
+        final message = event.kind == ErrorKind.errorResponse
+            ? 'received unexpected status code when polling'
+            : 'encountered error with polling request';
+        final argument = event.kind == ErrorKind.errorResponse
+            ? event.statusCode
+            : event.message;
+        _logger.error('$message: $argument, $suffix');
         if (event.shutdown) {
-          _logger.error(
-              'received unexpected status code when polling: ${event.statusCode}, stopping polling');
           _permanentShutdown = true;
           stop();
-        } else {
-          _logger.error(
-              'received unexpected status code when polling: ${event.statusCode}, will retry');
         }
     }
 

packages/common_client/lib/src/data_sources/requestor.dart

@@ -63,7 +63,6 @@ final class Requestor {
           body: _method != RequestMethod.get ? _contextString : null);
       return await _handleResponse(res);
     } catch (err) {
-      _logger.error('encountered error with polling request: $err, will retry');
       return StatusEvent(ErrorKind.networkError, null, err.toString());
     }
   }
@@ -91,10 +90,10 @@ final class Requestor {
       return DataEvent('put', res.body, environmentId: environmentId);
     } else {
       if (isHttpGloballyRecoverable(res.statusCode)) {
-        return StatusEvent(ErrorKind.networkError, res.statusCode,
+        return StatusEvent(ErrorKind.errorResponse, res.statusCode,
             'Received unexpected status code: ${res.statusCode}');
       } else {
-        return StatusEvent(ErrorKind.networkError, res.statusCode,
+        return StatusEvent(ErrorKind.errorResponse, res.statusCode,
             'Received unexpected status code: ${res.statusCode}',
             shutdown: true);
       }

packages/common_client/lib/src/data_sources/streaming_data_source.dart

@@ -166,8 +166,13 @@ final class StreamingDataSource implements DataSource {
               case DataEvent():
                 _dataController.sink.add(res);
               case StatusEvent():
-                _logger.error(
-                    'received unexpected status code when polling in response to a ping event: ${res.statusCode}');
+                final message = res.kind == ErrorKind.errorResponse
+                    ? 'received unexpected status code when polling in response to a ping event'
+                    : 'encountered error with polling request in response to a ping event';
+                final argument = res.kind == ErrorKind.errorResponse
+                    ? res.statusCode
+                    : res.message;
+                _logger.error('$message: $argument');
                 _dataController.sink.add(res);
             }
           } else {