From 1fbc85ec9917eb29047461cec09157f70b1afe78 Mon Sep 17 00:00:00 2001
From: Kha Truong <64438356+khatruong2009@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:02:44 -0800
Subject: [PATCH] Chore(logging): move queued-item-store into
 aws_logging_cloudwatch (#4086)

---
 .github/dependabot.yaml                       |  95 ++++---
 .github/workflows/amplify_api_dart.yaml       |   4 +
 .github/workflows/amplify_core.yaml           |   4 +
 .github/workflows/amplify_datastore.yaml      |   4 +
 .../amplify_datastore_plugin_interface.yaml   |   4 +
 .../workflows/amplify_push_notifications.yaml |   4 +
 .../amplify_push_notifications_example.yaml   |   4 +
 .github/workflows/aws_logging_cloudwatch.yaml |   4 +
 .../src/amplify_cloudwatch_logger_plugin.dart |   2 -
 .../amplify_logging_cloudwatch/pubspec.yaml   |   3 -
 .../test/queued_item_store_test.dart          | 248 ------------------
 .../com.amplify.logging_cached_logs.sqlite    | Bin 0 -> 1302528 bytes
 .../lib/src/cloudwatch_logger_plugin.dart     |  11 +-
 .../src/path_provider/app_path_provider.dart  |   6 +
 .../path_provider/app_path_provider_html.dart |  22 ++
 .../path_provider/app_path_provider_io.dart   |  24 ++
 .../path_provider/app_path_provider_stub.dart |  26 ++
 .../dart_queued_item_store.dart               |   0
 .../dart_queued_item_store.stub.dart          |   4 +-
 .../dart_queued_item_store.vm.dart            |  14 +-
 .../dart_queued_item_store.web.dart           |   4 +-
 .../drift/drift_queued_item_store.dart        |   0
 .../drift/drift_queued_item_store.g.dart      |   0
 .../index_db/indexed_db_adapter.dart          |   0
 .../aws_logging_cloudwatch/pubspec.yaml       |   3 +
 .../queued_item_store_test.dart               | 244 ++++++++++++++++-
 26 files changed, 418 insertions(+), 316 deletions(-)
 delete mode 100644 packages/logging_cloudwatch/amplify_logging_cloudwatch/test/queued_item_store_test.dart
 create mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/com.amplify.logging_cached_logs.sqlite
 create mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider.dart
 create mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart
 create mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart
 create mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/dart_queued_item_store.dart (100%)
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/dart_queued_item_store.stub.dart (94%)
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/dart_queued_item_store.vm.dart (77%)
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/dart_queued_item_store.web.dart (93%)
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/drift/drift_queued_item_store.dart (100%)
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart (100%)
 rename packages/logging_cloudwatch/{amplify_logging_cloudwatch => aws_logging_cloudwatch}/lib/src/queued_item_store/index_db/indexed_db_adapter.dart (100%)

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 896d93cf4e..5005f3e58d 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -174,10 +174,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -209,6 +209,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -275,11 +276,11 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -308,10 +309,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -344,10 +345,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -377,6 +378,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -428,10 +430,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -471,6 +473,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -520,12 +523,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -551,12 +554,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -580,6 +583,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -671,10 +675,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -729,10 +733,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -775,10 +779,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -819,10 +823,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -870,12 +874,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -904,12 +908,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -942,12 +946,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -978,6 +982,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -1014,10 +1019,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1073,12 +1078,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -1121,12 +1126,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -1168,10 +1173,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1236,10 +1241,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1276,10 +1281,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1315,10 +1320,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1361,10 +1366,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1405,10 +1410,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1443,10 +1448,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1482,10 +1487,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1513,10 +1518,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1904,10 +1909,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
     # Group dependencies which have a constraint set in the global "pubspec.yaml"
     groups:
       device_info_plus:
@@ -1948,10 +1953,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -1979,10 +1984,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -2007,6 +2012,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_signature_v4"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
     # Group dependencies which have a constraint set in the global "pubspec.yaml"
@@ -2014,6 +2020,9 @@ updates:
       built_value:
         patterns:
           - "built_value"
+      drift:
+        patterns:
+          - "drift"
       intl:
         patterns:
           - "intl"
@@ -2050,6 +2059,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_signature_v4"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
     # Group dependencies which have a constraint set in the global "pubspec.yaml"
@@ -2075,6 +2085,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_signature_v4"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
     # Group dependencies which have a constraint set in the global "pubspec.yaml"
@@ -2099,6 +2110,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -2160,6 +2172,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -2182,6 +2195,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -2205,10 +2219,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -2248,10 +2262,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -2280,10 +2294,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -3187,11 +3201,11 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_db_common"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_storage_s3_dart"
   - package-ecosystem: "pub"
     directory: "packages/storage/amplify_storage_s3/example"
@@ -3210,10 +3224,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -3257,10 +3271,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -3301,10 +3315,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
     # Group dependencies which have a constraint set in the global "pubspec.yaml"
     groups:
       async:
@@ -3350,10 +3364,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -3384,10 +3398,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -3418,12 +3432,12 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
@@ -3458,10 +3472,10 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
-      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "amplify_secure_storage_dart"
       - dependency-name: "worker_bee"
       - dependency-name: "worker_bee_builder"
@@ -3497,6 +3511,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_db_common_dart"
       - dependency-name: "aws_signature_v4"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
diff --git a/.github/workflows/amplify_api_dart.yaml b/.github/workflows/amplify_api_dart.yaml
index 6961d7a08f..88a3a85db4 100644
--- a/.github/workflows/amplify_api_dart.yaml
+++ b/.github/workflows/amplify_api_dart.yaml
@@ -24,6 +24,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
@@ -50,6 +52,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
diff --git a/.github/workflows/amplify_core.yaml b/.github/workflows/amplify_core.yaml
index 4e860cb45e..60bb40b7ff 100644
--- a/.github/workflows/amplify_core.yaml
+++ b/.github/workflows/amplify_core.yaml
@@ -22,6 +22,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
@@ -46,6 +48,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
diff --git a/.github/workflows/amplify_datastore.yaml b/.github/workflows/amplify_datastore.yaml
index 9d6f8f5958..03facfd76b 100644
--- a/.github/workflows/amplify_datastore.yaml
+++ b/.github/workflows/amplify_datastore.yaml
@@ -22,6 +22,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
@@ -46,6 +48,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
diff --git a/.github/workflows/amplify_datastore_plugin_interface.yaml b/.github/workflows/amplify_datastore_plugin_interface.yaml
index a6550afd87..4399997ded 100644
--- a/.github/workflows/amplify_datastore_plugin_interface.yaml
+++ b/.github/workflows/amplify_datastore_plugin_interface.yaml
@@ -20,6 +20,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
@@ -42,6 +44,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
diff --git a/.github/workflows/amplify_push_notifications.yaml b/.github/workflows/amplify_push_notifications.yaml
index 93f79bffde..db29a6a34c 100644
--- a/.github/workflows/amplify_push_notifications.yaml
+++ b/.github/workflows/amplify_push_notifications.yaml
@@ -19,6 +19,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/notifications/push/amplify_push_notifications/**/*.dart'
@@ -52,6 +54,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/notifications/push/amplify_push_notifications/**/*.dart'
diff --git a/.github/workflows/amplify_push_notifications_example.yaml b/.github/workflows/amplify_push_notifications_example.yaml
index 97b9b0ad30..730d5f4750 100644
--- a/.github/workflows/amplify_push_notifications_example.yaml
+++ b/.github/workflows/amplify_push_notifications_example.yaml
@@ -16,6 +16,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/notifications/push/amplify_push_notifications/example/**/*.dart'
@@ -48,6 +50,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
       - 'packages/notifications/push/amplify_push_notifications/example/**/*.dart'
diff --git a/.github/workflows/aws_logging_cloudwatch.yaml b/.github/workflows/aws_logging_cloudwatch.yaml
index 90af71948a..936449a852 100644
--- a/.github/workflows/aws_logging_cloudwatch.yaml
+++ b/.github/workflows/aws_logging_cloudwatch.yaml
@@ -20,6 +20,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*'
@@ -44,6 +46,8 @@ on:
       - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
       - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
+      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.dart'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.yaml'
       - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*'
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart b/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart
index ac54bd8ac1..d06246afdf 100644
--- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart
+++ b/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart
@@ -1,6 +1,5 @@
 import 'package:amplify_logging_cloudwatch/src/amplify_log_stream_name_provider.dart';
 import 'package:amplify_logging_cloudwatch/src/path_provider/flutter_path_provider.dart';
-import 'package:amplify_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
 import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart';
 
 /// {@macro aws_logging_cloudwatch.cloudwatch_logger_plugin}
@@ -17,7 +16,6 @@ class AmplifyCloudWatchLoggerPlugin extends CloudWatchLoggerPlugin {
             defaultLogStreamNameProvider:
                 AmplifyLogStreamNameProvider().defaultLogStreamName,
           ),
-          logStore: DartQueuedItemStore(null),
           remoteLoggingConstraintProvider:
               pluginConfig.defaultRemoteConfiguration == null
                   ? null
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml b/packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml
index 91bea196cd..13b701cbba 100644
--- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml
+++ b/packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml
@@ -11,12 +11,9 @@ environment:
 
 dependencies:
   amplify_core: ">=1.4.0 <1.5.0"
-  amplify_db_common_dart: ">=0.3.0+1 <0.4.0"
   aws_common: ">=0.6.0 <0.7.0"
   aws_logging_cloudwatch: ^0.1.0
-  collection: ^1.15.0
   device_info_plus: ^9.0.0
-  drift: ">=2.12.0 <2.13.0"
   flutter:
     sdk: flutter
   intl: ">=0.18.0 <1.0.0"
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/test/queued_item_store_test.dart b/packages/logging_cloudwatch/amplify_logging_cloudwatch/test/queued_item_store_test.dart
deleted file mode 100644
index c49b105780..0000000000
--- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/test/queued_item_store_test.dart
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import 'package:amplify_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
-import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
-import 'package:test/test.dart';
-
-void main() {
-  late DartQueuedItemStore db;
-
-  group('DartQueuedItemStore ', () {
-    setUpAll(() {
-      db = DartQueuedItemStore('/tmp');
-    });
-
-    tearDownAll(() async {
-      await db.clear();
-    });
-
-    setUp(() async {
-      await db.clear();
-    });
-
-    Future<Iterable<QueuedItem>> getAll() async {
-      return db.getCount(100);
-    }
-
-    test('writes values to storage', () async {
-      const values = ['0', '1', '2', '3', '4', '5'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final readItems = await db.getCount(values.length);
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, equals(values));
-    });
-
-    test('writes values to storage with enable queue rotation', () async {
-      const values = ['0', '1', '2', '3', '4', '5'];
-      for (final value in values) {
-        await db.addItem(
-          value,
-          DateTime.now().toIso8601String(),
-          enableQueueRotation: true,
-        );
-      }
-
-      final readItems = await getAll();
-      expect(readItems.length, 1);
-      expect(readItems.first.value, values.last);
-    });
-
-    test('returns first n items in storage', () async {
-      const values = ['0', '1', '2', '3', '4', '5'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final readItems = await db.getCount(3);
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, equals(values.sublist(0, 3)));
-    });
-
-    test(
-        'returns all stored items when get request size exceeds stored item count',
-        () async {
-      const values = ['0', '1', '2', '3', '4', '5'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final readItems = await db.getCount(100);
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, values);
-    });
-
-    test('deletes all items in storage', () async {
-      const values = ['0', '1', '2', '3', '4', '5'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      await db.deleteItems(await getAll());
-
-      final readItems = await getAll();
-      expect(readItems, isEmpty);
-    });
-
-    test('deletes first subset of stored items', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      await db.deleteItems(await db.getCount(3));
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, values.sublist(3));
-    });
-
-    test('deletes middle subset of stored items', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final itemsToDelete = (await getAll()).toList().sublist(3, 7);
-      await db.deleteItems(itemsToDelete);
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, const ['0', '1', '2', '7', '8', '9']);
-    });
-
-    test('deletes last subset of stored items', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final itemsToDelete = (await getAll()).toList().sublist(7);
-      await db.deleteItems(itemsToDelete);
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, values.sublist(0, 7));
-    });
-
-    test('deletes first, middle, and last subsets of stored items', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      const valuesToDelete = ['0', '1', '4', '5', '8', '9'];
-      final itemsToDelete = (await getAll()).where((item) {
-        return valuesToDelete.contains(item.value);
-      });
-      await db.deleteItems(itemsToDelete);
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, const ['2', '3', '6', '7']);
-    });
-
-    test('deletes inner left and right subsets of stored items', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      const valuesToDelete = ['1', '2', '4', '5', '7', '8'];
-      final itemsToDelete = (await getAll()).where((item) {
-        return valuesToDelete.contains(item.value);
-      });
-      await db.deleteItems(itemsToDelete);
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, const ['0', '3', '6', '9']);
-    });
-
-    test('deletes the first stored item', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final itemsToDelete = (await getAll()).toList().sublist(0, 1);
-      await db.deleteItems(itemsToDelete);
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, values.sublist(1));
-    });
-
-    test('deletes the last stored item', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final itemsToDelete = (await getAll()).toList().sublist(9);
-      await db.deleteItems(itemsToDelete);
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, values.sublist(0, 9));
-    });
-
-    test('throws no error when deleting all items twice', () async {
-      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      var readValues = await getAll();
-
-      await db.deleteItems(readValues);
-      await db.deleteItems(readValues);
-
-      readValues = await getAll();
-
-      expect(readValues, isEmpty);
-    });
-
-    test('returns all stored items', () async {
-      const values = ['0', '1', '2', '3', '4', '5'];
-      for (final value in values) {
-        await db.addItem(value, DateTime.now().toIso8601String());
-      }
-
-      final readItems = await getAll();
-      final readValues = readItems.map((e) => e.value);
-      expect(readValues, values);
-    });
-
-    test('returns empty list when no items are stored', () async {
-      final readItems = await getAll();
-      expect(readItems, isEmpty);
-    });
-
-    test(
-      'checks if storage is full',
-      () async {
-        const capacityLimit = 1;
-
-        final largeItem = '0' * 10240; // 10KB for example
-
-        for (var i = 0; i < 5; i++) {
-          await db.addItem(largeItem, DateTime.now().toIso8601String());
-        }
-
-        var result = db.isFull(capacityLimit);
-        expect(result, isFalse);
-
-        for (var i = 0; i < 100; i++) {
-          await db.addItem(largeItem, DateTime.now().toIso8601String());
-        }
-
-        result = db.isFull(capacityLimit);
-        expect(result, isTrue);
-      },
-    );
-  });
-}
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/com.amplify.logging_cached_logs.sqlite b/packages/logging_cloudwatch/aws_logging_cloudwatch/com.amplify.logging_cached_logs.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..89304fcb4bae48f9b5a30c59759197e9c69a3688
GIT binary patch
literal 1302528
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
K0RkVK0{;)O@G<cK

literal 0
HcmV?d00001

diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart
index 49b7f09715..a39904a5d4 100644
--- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart
@@ -8,7 +8,8 @@ import 'package:amplify_core/amplify_core.dart';
 // ignore: invalid_use_of_internal_member, implementation_imports
 import 'package:amplify_core/src/http/amplify_category_method.dart';
 import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart';
-import 'package:aws_logging_cloudwatch/src/queued_item_store/in_memory_queued_item_store.dart';
+import 'package:aws_logging_cloudwatch/src/path_provider/app_path_provider.dart';
+import 'package:aws_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
 import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
 import 'package:aws_logging_cloudwatch/src/sdk/cloud_watch_logs.dart';
 import 'package:aws_logging_cloudwatch/src/stoppable_timer.dart';
@@ -54,8 +55,6 @@ class CloudWatchLoggerPlugin extends AWSLoggerPlugin
     required CloudWatchPluginConfig pluginConfig,
     RemoteLoggingConstraintProvider? remoteLoggingConstraintProvider,
     CloudWatchLogStreamProvider? logStreamProvider,
-    // TODO(nikahsn): remove after moving queued item store implementation from
-    // amplify_logging_cloudwath to aws_logging_cloudwatch
     @protected QueuedItemStore? logStore,
   })  : _enabled = pluginConfig.enable,
         _pluginConfig = pluginConfig,
@@ -71,10 +70,8 @@ class CloudWatchLoggerPlugin extends AWSLoggerPlugin
           region: pluginConfig.region,
           credentialsProvider: credentialsProvider,
         ),
-        // TODO(nikahsn): move queued item store implementation from
-        // amplify_logging_cloudwath to aws_logging_cloudwatch and use
-        // DartQueueItemStore instead of InMemoryQueuedItemStore
-        _logStore = logStore ?? InMemoryQueuedItemStore(),
+        _logStore =
+            logStore ?? DartQueuedItemStore(const DartAppPathProvider()),
         _logStreamProvider = logStreamProvider ??
             DefaultCloudWatchLogStreamProvider(
               logGroupName: pluginConfig.logGroupName,
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider.dart
new file mode 100644
index 0000000000..646ebc61d7
--- /dev/null
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider.dart
@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export 'app_path_provider_stub.dart'
+    if (dart.library.html) 'app_path_provider_html.dart'
+    if (dart.library.io) 'app_path_provider_io.dart';
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart
new file mode 100644
index 0000000000..bf50dca4a6
--- /dev/null
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart
@@ -0,0 +1,22 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import 'package:amplify_core/amplify_core.dart';
+
+/// {@template aws_logging_cloudwatch.app_path_provider}
+/// Provides App paths for aws_logging_cloudwatch package.
+/// {@endtemplate}
+class DartAppPathProvider implements AppPathProvider {
+  /// {@macro aws_logging_cloudwatch.app_path_provider}
+  const DartAppPathProvider();
+
+  @override
+  Future<String> getApplicationSupportPath() async {
+    return '';
+  }
+
+  @override
+  Future<String> getTemporaryPath() async {
+    return '';
+  }
+}
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart
new file mode 100644
index 0000000000..87fe157320
--- /dev/null
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart
@@ -0,0 +1,24 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import 'dart:io';
+
+import 'package:amplify_core/amplify_core.dart';
+
+/// {@template aws_logging_cloudwatch.app_path_provider}
+/// Provides App paths for aws_logging_cloudwatch package.
+/// {@endtemplate}
+class DartAppPathProvider implements AppPathProvider {
+  /// {@macro aws_logging_cloudwatch.app_path_provider}
+  const DartAppPathProvider();
+
+  @override
+  Future<String> getApplicationSupportPath() async {
+    return Directory.current.path;
+  }
+
+  @override
+  Future<String> getTemporaryPath() async {
+    return Directory.systemTemp.path;
+  }
+}
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart
new file mode 100644
index 0000000000..068f8f04f2
--- /dev/null
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart
@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import 'package:amplify_core/amplify_core.dart';
+
+/// {@template aws_logging_cloudwatch.app_path_provider}
+/// Provides App paths for aws_logging_cloudwatch package.
+/// {@endtemplate}
+class DartAppPathProvider implements AppPathProvider {
+  /// {@macro aws_logging_cloudwatch.app_path_provider}
+  const DartAppPathProvider();
+
+  @override
+  Future<String> getApplicationSupportPath() async {
+    throw UnimplementedError(
+      'getApplicationSupportPath() has not been implemented in the current platform.',
+    );
+  }
+
+  @override
+  Future<String> getTemporaryPath() async {
+    throw UnimplementedError(
+      'getTemporaryPath() has not been implemented in the current platform.',
+    );
+  }
+}
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.dart
similarity index 100%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.dart
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart
similarity index 94%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart
index fd2bd1fee4..5db1a8d647 100644
--- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart
@@ -3,7 +3,7 @@
 
 import 'dart:async';
 
-import 'package:aws_common/aws_common.dart';
+import 'package:amplify_core/amplify_core.dart';
 // ignore: implementation_imports
 import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
 import 'package:meta/meta.dart';
@@ -14,7 +14,7 @@ import 'package:meta/meta.dart';
 class DartQueuedItemStore implements QueuedItemStore, Closeable {
   /// {@macro amplify_logging_cloudwatch.dart_queued_item_store}
   // ignore: avoid_unused_constructor_parameters
-  DartQueuedItemStore(String? storagePath) {
+  DartQueuedItemStore(AppPathProvider appPathProvider) {
     throw UnimplementedError('constructor has not been implemented.');
   }
 
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart
similarity index 77%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart
index c4cb9ef090..2ea1ae0c5a 100644
--- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart
@@ -3,23 +3,17 @@
 
 import 'dart:async';
 
-import 'package:amplify_logging_cloudwatch/src/queued_item_store/drift/drift_queued_item_store.dart';
-import 'package:aws_common/aws_common.dart';
+import 'package:amplify_core/amplify_core.dart';
+import 'package:aws_logging_cloudwatch/src/queued_item_store/drift/drift_queued_item_store.dart';
 // ignore: implementation_imports
 import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
 import 'package:meta/meta.dart';
-import 'package:path_provider/path_provider.dart';
 
 /// {@macro amplify_logging_cloudwatch.dart_queued_item_store}
 class DartQueuedItemStore implements QueuedItemStore, Closeable {
   /// {@macro amplify_logging_cloudwatch.dart_queued_item_store}
-  factory DartQueuedItemStore(String? storagePath) {
-    final FutureOr<String> path;
-    if (storagePath == null) {
-      path = getApplicationSupportDirectory().then((value) => value.path);
-    } else {
-      path = storagePath;
-    }
+  factory DartQueuedItemStore(AppPathProvider pathProvider) {
+    final FutureOr<String> path = pathProvider.getApplicationSupportPath();
     final database = DriftQueuedItemStore(path);
     return DartQueuedItemStore._(database);
   }
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart
similarity index 93%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart
index 9cc7c50b96..deac3ff6cb 100644
--- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart
@@ -6,8 +6,8 @@
 import 'dart:async';
 
 import 'package:amplify_core/amplify_core.dart';
-import 'package:amplify_logging_cloudwatch/src/queued_item_store/index_db/indexed_db_adapter.dart';
 import 'package:aws_logging_cloudwatch/src/queued_item_store/in_memory_queued_item_store.dart';
+import 'package:aws_logging_cloudwatch/src/queued_item_store/index_db/indexed_db_adapter.dart';
 import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
 import 'package:meta/meta.dart';
 
@@ -17,7 +17,7 @@ class DartQueuedItemStore
     implements QueuedItemStore, Closeable {
   /// {@macro amplify_logging_cloudwatch.index_db_queued_item_store}
   // ignore: avoid_unused_constructor_parameters
-  DartQueuedItemStore(String? storagePath);
+  DartQueuedItemStore(AppPathProvider appPathProvider);
 
   late final Future<QueuedItemStore> _database = () async {
     if (await IndexedDbAdapter.checkIsIndexedDBSupported()) {
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart
similarity index 100%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart
similarity index 100%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart
diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart
similarity index 100%
rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart
rename to packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml b/packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml
index 095c3f2ee3..90d70b085f 100644
--- a/packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml
@@ -10,10 +10,13 @@ environment:
 
 dependencies:
   amplify_core: ">=1.4.0 <1.5.0"
+  amplify_db_common_dart: ">=0.3.0+1 <0.4.0"
   aws_common: ">=0.6.0 <0.7.0"
   aws_signature_v4: ">=0.5.0 <0.6.0"
   built_collection: ^5.1.1
   built_value: ">=8.6.0 <8.7.0"
+  collection: ^1.15.0
+  drift: ">=2.12.0 <2.13.0"
   fixnum: ^1.1.0
   intl: ">=0.18.0 <1.0.0"
   json_annotation: ">=4.8.1 <4.9.0"
diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart
index ab035a6ca2..3576e0daa0 100644
--- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart
+++ b/packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart
@@ -1,6 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import 'package:aws_logging_cloudwatch/src/path_provider/app_path_provider.dart';
+import 'package:aws_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
 import 'package:aws_logging_cloudwatch/src/queued_item_store/in_memory_queued_item_store.dart';
 import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
 import 'package:test/test.dart';
@@ -231,7 +233,7 @@ void main() {
           await db.addItem('0', DateTime.now().toIso8601String());
         }
 
-        var result = db.isFull(capacityLimit);
+        var result = await db.isFull(capacityLimit);
         expect(result, isFalse);
 
         // add enough items to exceed capacity limit of 1mb
@@ -239,7 +241,245 @@ void main() {
           await db.addItem('0', DateTime.now().toIso8601String());
         }
 
-        result = db.isFull(capacityLimit);
+        result = await db.isFull(capacityLimit);
+        expect(result, isTrue);
+      },
+    );
+  });
+
+  group('DartQueuedItemStore ', () {
+    setUpAll(() {
+      db = DartQueuedItemStore(const DartAppPathProvider());
+    });
+
+    tearDownAll(() async {
+      await db.clear();
+    });
+
+    setUp(() async {
+      await db.clear();
+    });
+
+    Future<Iterable<QueuedItem>> getAll() async {
+      return db.getCount(100);
+    }
+
+    test('writes values to storage', () async {
+      const values = ['0', '1', '2', '3', '4', '5'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final readItems = await db.getCount(values.length);
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, equals(values));
+    });
+
+    test('writes values to storage with enable queue rotation', () async {
+      const values = ['0', '1', '2', '3', '4', '5'];
+      for (final value in values) {
+        await db.addItem(
+          value,
+          DateTime.now().toIso8601String(),
+          enableQueueRotation: true,
+        );
+      }
+
+      final readItems = await getAll();
+      expect(readItems.length, 1);
+      expect(readItems.first.value, values.last);
+    });
+
+    test('returns first n items in storage', () async {
+      const values = ['0', '1', '2', '3', '4', '5'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final readItems = await db.getCount(3);
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, equals(values.sublist(0, 3)));
+    });
+
+    test(
+        'returns all stored items when get request size exceeds stored item count',
+        () async {
+      const values = ['0', '1', '2', '3', '4', '5'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final readItems = await db.getCount(100);
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, values);
+    });
+
+    test('deletes all items in storage', () async {
+      const values = ['0', '1', '2', '3', '4', '5'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      await db.deleteItems(await getAll());
+
+      final readItems = await getAll();
+      expect(readItems, isEmpty);
+    });
+
+    test('deletes first subset of stored items', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      await db.deleteItems(await db.getCount(3));
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, values.sublist(3));
+    });
+
+    test('deletes middle subset of stored items', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final itemsToDelete = (await getAll()).toList().sublist(3, 7);
+      await db.deleteItems(itemsToDelete);
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, const ['0', '1', '2', '7', '8', '9']);
+    });
+
+    test('deletes last subset of stored items', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final itemsToDelete = (await getAll()).toList().sublist(7);
+      await db.deleteItems(itemsToDelete);
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, values.sublist(0, 7));
+    });
+
+    test('deletes first, middle, and last subsets of stored items', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      const valuesToDelete = ['0', '1', '4', '5', '8', '9'];
+      final itemsToDelete = (await getAll()).where((item) {
+        return valuesToDelete.contains(item.value);
+      });
+      await db.deleteItems(itemsToDelete);
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, const ['2', '3', '6', '7']);
+    });
+
+    test('deletes inner left and right subsets of stored items', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      const valuesToDelete = ['1', '2', '4', '5', '7', '8'];
+      final itemsToDelete = (await getAll()).where((item) {
+        return valuesToDelete.contains(item.value);
+      });
+      await db.deleteItems(itemsToDelete);
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, const ['0', '3', '6', '9']);
+    });
+
+    test('deletes the first stored item', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final itemsToDelete = (await getAll()).toList().sublist(0, 1);
+      await db.deleteItems(itemsToDelete);
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, values.sublist(1));
+    });
+
+    test('deletes the last stored item', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final itemsToDelete = (await getAll()).toList().sublist(9);
+      await db.deleteItems(itemsToDelete);
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, values.sublist(0, 9));
+    });
+
+    test('throws no error when deleting all items twice', () async {
+      const values = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      var readValues = await getAll();
+
+      await db.deleteItems(readValues);
+      await db.deleteItems(readValues);
+
+      readValues = await getAll();
+
+      expect(readValues, isEmpty);
+    });
+
+    test('returns all stored items', () async {
+      const values = ['0', '1', '2', '3', '4', '5'];
+      for (final value in values) {
+        await db.addItem(value, DateTime.now().toIso8601String());
+      }
+
+      final readItems = await getAll();
+      final readValues = readItems.map((e) => e.value);
+      expect(readValues, values);
+    });
+
+    test('returns empty list when no items are stored', () async {
+      final readItems = await getAll();
+      expect(readItems, isEmpty);
+    });
+
+    test(
+      'checks if storage is full',
+      () async {
+        const capacityLimit = 1;
+
+        final largeItem = '0' * 10240; // 10KB for example
+
+        for (var i = 0; i < 5; i++) {
+          await db.addItem(largeItem, DateTime.now().toIso8601String());
+        }
+
+        var result = await db.isFull(capacityLimit);
+        expect(result, isFalse);
+
+        for (var i = 0; i < 100; i++) {
+          await db.addItem(largeItem, DateTime.now().toIso8601String());
+        }
+
+        result = await db.isFull(capacityLimit);
         expect(result, isTrue);
       },
     );