diff --git a/core/modules/aggregator/aggregator.services.yml b/core/modules/aggregator/aggregator.services.yml
index 639ed2d..d3056e8 100644
--- a/core/modules/aggregator/aggregator.services.yml
+++ b/core/modules/aggregator/aggregator.services.yml
@@ -8,3 +8,10 @@ services:
   plugin.manager.aggregator.processor:
     class: Drupal\aggregator\Plugin\AggregatorPluginManager
     arguments: [processor, '@container.namespaces']
+  watchdog.channel.aggregator:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['aggregator']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/file/file.services.yml b/core/modules/file/file.services.yml
index 2ded051..824077e 100644
--- a/core/modules/file/file.services.yml
+++ b/core/modules/file/file.services.yml
@@ -2,3 +2,10 @@ services:
   file.usage:
     class: Drupal\file\FileUsage\DatabaseFileUsageBackend
     arguments: ['@database']
+  watchdog.channel.file:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['file']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/filter/filter.services.yml b/core/modules/filter/filter.services.yml
index 306c6aa..10e6b9a 100644
--- a/core/modules/filter/filter.services.yml
+++ b/core/modules/filter/filter.services.yml
@@ -17,3 +17,10 @@ services:
   plugin.manager.filter:
     class: Drupal\filter\FilterPluginManager
     arguments: ['@container.namespaces']
+  watchdog.channel.filter:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['filter']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/forum/forum.services.yml b/core/modules/forum/forum.services.yml
index 19033e8..c3ff6cd 100644
--- a/core/modules/forum/forum.services.yml
+++ b/core/modules/forum/forum.services.yml
@@ -4,3 +4,10 @@ services:
     arguments: ['@plugin.manager.entity', '@config.factory']
     tags:
       - { name: breadcrumb_builder, priority: 1001 }
+  watchdog.channel.forum:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['forum']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/language/language.services.yml b/core/modules/language/language.services.yml
index d6599b3..1b6615d 100644
--- a/core/modules/language/language.services.yml
+++ b/core/modules/language/language.services.yml
@@ -5,3 +5,10 @@ services:
     tags:
       - { name: path_processor_inbound, priority: 300 }
       - { name: path_processor_outbound, priority: 100 }
+  watchdog.channel.language:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['language']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/locale/locale.services.yml b/core/modules/locale/locale.services.yml
index f632704..e0ac468 100644
--- a/core/modules/locale/locale.services.yml
+++ b/core/modules/locale/locale.services.yml
@@ -16,3 +16,10 @@ services:
     tags:
       - { name: string_translator }
       - { name: needs_destruction }
+  watchdog.channel.locale:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['locale']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/menu/menu.services.yml b/core/modules/menu/menu.services.yml
index f417d6f..dbe6840 100644
--- a/core/modules/menu/menu.services.yml
+++ b/core/modules/menu/menu.services.yml
@@ -7,3 +7,10 @@ services:
     class: Drupal\menu\Access\DeleteMenuAccessCheck
     tags:
       - { name: access_check }
+  watchdog.channel.menu:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['menu']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/rest/rest.services.yml b/core/modules/rest/rest.services.yml
index 97817ad..ba9c37f 100644
--- a/core/modules/rest/rest.services.yml
+++ b/core/modules/rest/rest.services.yml
@@ -20,3 +20,10 @@ services:
   rest.link_manager.relation:
     class: Drupal\rest\LinkManager\RelationLinkManager
     arguments: ['@cache.cache']
+  watchdog.channel.rest:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['rest']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/system/system.services.yml b/core/modules/system/system.services.yml
index 30f44c9..3a4fc73 100644
--- a/core/modules/system/system.services.yml
+++ b/core/modules/system/system.services.yml
@@ -17,7 +17,55 @@ services:
     class: Drupal\system\Routing\RouteSubscriber
     tags:
       - { name: event_subscriber }
-
+  watchdog.channel.access_denied:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['access denied']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.ajax:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['ajax']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.cron:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['cron']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.file_system:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['file system']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.form:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['form']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.mail:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['mail']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.theme:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['theme']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
   watchdog.channel.page_not_found:
     class: Drupal\Core\Watchdog\WatchdogChannel
     arguments: ['page not found']
@@ -25,9 +73,16 @@ services:
       - [setRequest, ['@?request']]
     tags:
       - { name: watchdog_channel }
-  watchdog.channel.access_denied:
+  watchdog.channel.php:
     class: Drupal\Core\Watchdog\WatchdogChannel
-    arguments: ['access denied']
+    arguments: ['php']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
+  watchdog.channel.security:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['security']
     calls:
       - [setRequest, ['@?request']]
     tags:
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 6fb7d47..66fa737 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -25,3 +25,10 @@ services:
     class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber
     tags:
       - { name: event_subscriber }
+  watchdog.channel.user:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['user']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }
diff --git a/core/modules/views/views.services.yml b/core/modules/views/views.services.yml
index d5ab9d9..354b2ee 100644
--- a/core/modules/views/views.services.yml
+++ b/core/modules/views/views.services.yml
@@ -90,3 +90,10 @@ services:
     class: Drupal\views\ViewsAccessCheck
     tags:
       - { name: 'access_check' }
+  watchdog.channel.views:
+    class: Drupal\Core\Watchdog\WatchdogChannel
+    arguments: ['views']
+    calls:
+      - [setRequest, ['@?request']]
+    tags:
+      - { name: watchdog_channel }