diff -u b/tests/src/Functional/MonitoringCaptchaTest.php b/tests/src/Functional/MonitoringCaptchaTest.php
--- b/tests/src/Functional/MonitoringCaptchaTest.php
+++ b/tests/src/Functional/MonitoringCaptchaTest.php
@@ -15,7 +15,7 @@
    *
    * @var array
    */
-  public static $modules = array('captcha');
+  protected static $modules = array('captcha');
 
   /**
    * {@inheritdoc}
diff -u b/tests/src/Functional/MonitoringCommerceTest.php b/tests/src/Functional/MonitoringCommerceTest.php
--- b/tests/src/Functional/MonitoringCommerceTest.php
+++ b/tests/src/Functional/MonitoringCommerceTest.php
@@ -19,7 +19,7 @@
    *
    * @var array
    */
-  public static $modules = ['commerce', 'commerce_order', 'node'];
+  protected static $modules = ['commerce', 'commerce_order', 'node'];
 
   /**
    * The account for testing.
diff -u b/tests/src/Functional/MonitoringServicesTest.php b/tests/src/Functional/MonitoringServicesTest.php
--- b/tests/src/Functional/MonitoringServicesTest.php
+++ b/tests/src/Functional/MonitoringServicesTest.php
@@ -18,7 +18,7 @@
    *
    * @var array
    */
-  public static $modules = array('dblog', 'basic_auth', 'monitoring', 'views', 'node', 'rest');
+  protected static $modules = array('dblog', 'basic_auth', 'monitoring', 'views', 'node', 'rest');
 
   /**
    * User account created.
diff -u b/tests/src/Functional/MonitoringTestBase.php b/tests/src/Functional/MonitoringTestBase.php
--- b/tests/src/Functional/MonitoringTestBase.php
+++ b/tests/src/Functional/MonitoringTestBase.php
@@ -16,7 +16,7 @@
    *
    * @var array
    */
-  public static $modules = ['block', 'monitoring', 'monitoring_test'];
+  protected static $modules = ['block', 'monitoring', 'monitoring_test'];
 
   /**
    * {@inheritdoc}
diff -u b/tests/src/Functional/MonitoringUITest.php b/tests/src/Functional/MonitoringUITest.php
--- b/tests/src/Functional/MonitoringUITest.php
+++ b/tests/src/Functional/MonitoringUITest.php
@@ -15,7 +15,7 @@
  */
 class MonitoringUITest extends MonitoringTestBase {
 
-  public static $modules = array('dblog', 'node', 'views', 'file', 'automated_cron');
+  protected static $modules = array('dblog', 'node', 'views', 'file', 'automated_cron');
 
   /**
    * {@inheritdoc}
diff -u b/tests/src/Functional/MonitoringViewDisplayTest.php b/tests/src/Functional/MonitoringViewDisplayTest.php
--- b/tests/src/Functional/MonitoringViewDisplayTest.php
+++ b/tests/src/Functional/MonitoringViewDisplayTest.php
@@ -11,7 +11,7 @@
  */
 class MonitoringViewDisplayTest extends MonitoringTestBase {
 
-  public static $modules = array('views', 'node');
+  protected static $modules = array('views', 'node');
 
   /**
    * Tests the view display sensor.
diff -u b/tests/src/Kernel/MonitoringApiTest.php b/tests/src/Kernel/MonitoringApiTest.php
--- b/tests/src/Kernel/MonitoringApiTest.php
+++ b/tests/src/Kernel/MonitoringApiTest.php
@@ -19,7 +19,7 @@
  */
 class MonitoringApiTest extends MonitoringUnitTestBase {
 
-  public static $modules = array('dblog');
+  protected static $modules = array('dblog');
 
   /**
    * {@inheritdoc}
diff -u b/tests/src/Kernel/MonitoringCoreKernelTest.php b/tests/src/Kernel/MonitoringCoreKernelTest.php
--- b/tests/src/Kernel/MonitoringCoreKernelTest.php
+++ b/tests/src/Kernel/MonitoringCoreKernelTest.php
@@ -16,7 +16,7 @@
  */
 class MonitoringCoreKernelTest extends MonitoringUnitTestBase {
 
-  public static $modules = [
+  protected static $modules = [
     'dblog',
     'image',
     'file',
diff -u b/tests/src/Kernel/MonitoringUnitTestBase.php b/tests/src/Kernel/MonitoringUnitTestBase.php
--- b/tests/src/Kernel/MonitoringUnitTestBase.php
+++ b/tests/src/Kernel/MonitoringUnitTestBase.php
@@ -13,7 +13,7 @@
  */
 abstract class MonitoringUnitTestBase extends KernelTestBase {
 
-  public static $modules = array('monitoring', 'monitoring_test', 'field', 'system', 'user', 'views', 'text', 'node');
+  protected static $modules = array('monitoring', 'monitoring_test', 'field', 'system', 'user', 'views', 'text', 'node');
 
   /**
    * {@inheritdoc}
only in patch2:
unchanged:
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,8 @@
     "type": "drupal-module",
     "license": "GPL-2.0",
     "require": {
-        "drupal/core": "^8.7.7 || ^9"
+        "drupal/core": "^9 || ^10",
+        "drupal/core": "monitoring_demo"
     },
     "require-dev": {
         "drupal/simplenews": "~2.0",
only in patch2:
unchanged:
--- a/monitoring.info.yml
+++ b/monitoring.info.yml
@@ -2,7 +2,7 @@ name: Monitoring
 type: module
 description: Monitoring base.
 package: Monitoring
-core_version_requirement: ^8.7.7 || ^9
+core_version_requirement: ^9 || ^10
 configure: monitoring.settings
 dependencies:
  - drupal:views
only in patch2:
unchanged:
--- a/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
@@ -14,6 +14,7 @@ use Drupal\monitoring\SensorPlugin\DatabaseAggregatorSensorPluginBase;
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Entity\Query\Sql\Condition;
 use Drupal\Core\Entity\Query\Sql\Tables;
+use Drupal\TestTools\Extension\SchemaInspector;
 
 /**
  * Database aggregator able to query a single db table.
@@ -387,7 +388,9 @@ class DatabaseAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase
     // with a hook_schema() hook and try to find the table.
     \Drupal::moduleHandler()->loadAllIncludes('install');
     foreach (\Drupal::moduleHandler()->getImplementations('schema') as $module) {
-      $schema = drupal_get_module_schema($module, $this->sensorConfig->getSetting('table'));
+      $module_handler = $this->container->get('module_handler');
+      $specification = SchemaInspector::getTablesSpecification($module_handler, $module);
+      $schema = $specification[$this->sensorConfig->getSetting('table')];
       if (isset($schema['module'])) {
         $this->addDependency('module', $schema['module']);
         break;