diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart index 649e1a7517..6e4cdde266 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart +++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart @@ -8,8 +8,8 @@ export 'file_storage_stub.dart' /// File storage interface for saving and loading constraint locally abstract interface class FileStorage { /// Save constraint locally to file - Future saveConstraintLocally(String filename, String data); + Future save(String filename, String data); /// Load constraint from file - Future loadConstraint(String filename); + Future load(String filename); } diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart index 8f71d4c5e8..6b8971325c 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart +++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart @@ -13,12 +13,12 @@ class FileStorageImpl implements FileStorage { final AppPathProvider pathProvider; @override - Future loadConstraint(String fileName) async { + Future load(String fileName) async { throw UnimplementedError(); } @override - Future saveConstraintLocally(String fileName, String content) async { + Future save(String fileName, String content) async { throw UnimplementedError(); } } diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart index 7deb4ec801..30c39773e0 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart +++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart @@ -16,7 +16,7 @@ class FileStorageImpl implements FileStorage { final AppPathProvider pathProvider; @override - Future loadConstraint(String fileName) async { + Future load(String fileName) async { final file = File(p.join(await pathProvider.getApplicationSupportPath(), fileName)); if (await file.exists()) { @@ -26,7 +26,7 @@ class FileStorageImpl implements FileStorage { } @override - Future saveConstraintLocally(String fileName, String content) async { + Future save(String fileName, String content) async { final file = File(p.join(await pathProvider.getApplicationSupportPath(), fileName)); await file.writeAsString(content); diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart index 4bdf07efec..4475a00b62 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart +++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart @@ -15,12 +15,12 @@ class FileStorageImpl implements FileStorage { static const _prefix = 'aws.cloudwatch'; @override - Future loadConstraint(String fileName) async { + Future load(String fileName) async { return window.localStorage['$_prefix.$fileName']; } @override - Future saveConstraintLocally(String fileName, String content) async { + Future save(String fileName, String content) async { window.localStorage['$_prefix.$fileName'] = content; } } diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart index 18b86511c3..e964e3e49c 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart +++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart @@ -113,7 +113,7 @@ base class BaseRemoteLoggingConstraintProvider _loggingConstraint = fetchedConstraint; if (_fileStorage != null) { - await _fileStorage!.saveConstraintLocally( + await _fileStorage!.save( 'remoteloggingconstraints.json', jsonEncode(fetchedConstraint.toJson()), ); @@ -122,7 +122,7 @@ base class BaseRemoteLoggingConstraintProvider await _loadConstraintFromLocalCache(); } } on Exception catch (exception) { - logger.debug( + logger.error( 'Failed to fetch logging constraint from ${_config.endpoint}: $exception', ); await _loadConstraintFromLocalCache(); @@ -140,7 +140,7 @@ base class BaseRemoteLoggingConstraintProvider Future _loadConstraintFromLocalCache() async { final localConstraint = - await _fileStorage!.loadConstraint('remoteloggingconstraints.json'); + await _fileStorage!.load('remoteloggingconstraints.json'); if (localConstraint != null) { _loggingConstraint = LoggingConstraint.fromJson( jsonDecode(localConstraint) as Map, diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart index b62e03e5ed..b975bd1e68 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart +++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart @@ -35,7 +35,7 @@ class MockFileStorage extends Mock implements FileStorageImpl { MockFileStorage(); @override - Future saveConstraintLocally(String fileName, String content) async {} + Future save(String fileName, String content) async {} } class MockAWSHttpClient extends Mock implements AWSHttpClient {} @@ -115,7 +115,7 @@ void main() { return mockOperation; }); - when(() => mockFileStorage.loadConstraint(any())) + when(() => mockFileStorage.load(any())) .thenAnswer((_) async => Future.value(sampleJson)); provider = BaseRemoteLoggingConstraintProvider.forTesting( @@ -151,7 +151,7 @@ void main() { }); // mock load constraint returns null - when(() => mockFileStorage.loadConstraint(any())) + when(() => mockFileStorage.load(any())) .thenAnswer((_) async => Future.value(null)); await Future.delayed(const Duration(seconds: 3)); @@ -168,7 +168,7 @@ void main() { ); }); - when(() => mockFileStorage.loadConstraint(any())) + when(() => mockFileStorage.load(any())) .thenAnswer((_) async => Future.value(sampleJson)); await Future.delayed(const Duration(seconds: 3));