.../modules/media/src/Plugin/Filter/MediaEmbed.php | 28 +++++++++++++++-------
 .../src/Kernel/MediaEmbedFilterTranslationTest.php |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/core/modules/media/src/Plugin/Filter/MediaEmbed.php b/core/modules/media/src/Plugin/Filter/MediaEmbed.php
index bca5f70483..d2d2263eda 100644
--- a/core/modules/media/src/Plugin/Filter/MediaEmbed.php
+++ b/core/modules/media/src/Plugin/Filter/MediaEmbed.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceEntityFormatter;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\RenderContext;
@@ -52,6 +53,13 @@ class MediaEmbed extends FilterBase implements ContainerFactoryPluginInterface {
    */
   protected $renderer;
 
+  /**
+   * The logger factory.
+   *
+   * @var \Drupal\Core\Logger\LoggerChannelFactoryInterface
+   */
+  protected $loggerFactory;
+
   /**
    * An array of counters for the recursive rendering protection.
    *
@@ -73,18 +81,21 @@ class MediaEmbed extends FilterBase implements ContainerFactoryPluginInterface {
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityRepositoryInterface
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity repository.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
+   * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
+   *   The logger factory.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository, EntityTypeManagerInterface $entity_type_manager, RendererInterface $renderer) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository, EntityTypeManagerInterface $entity_type_manager, RendererInterface $renderer, LoggerChannelFactoryInterface $logger_factory) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityRepository = $entity_repository;
     $this->entityTypeManager = $entity_type_manager;
     $this->renderer = $renderer;
+    $this->loggerFactory = $logger_factory;
   }
 
   /**
@@ -97,7 +108,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_definition,
       $container->get('entity.repository'),
       $container->get('entity_type.manager'),
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('logger.factory')
     );
   }
 
@@ -130,7 +142,7 @@ protected function renderMedia(MediaInterface $media, $view_mode, $langcode) {
     }
     // Protect ourselves from recursive rendering: return an empty render array.
     if (static::$recursiveRenderDepth[$recursive_render_id] > EntityReferenceEntityFormatter::RECURSIVE_RENDER_LIMIT) {
-      \Drupal::logger('media')->error('Recursive rendering detected when rendering embedded media: %entity_id. Aborting rendering.', [
+      $this->loggerFactory->get('media')->error('Recursive rendering detected when rendering embedded media: %entity_id. Aborting rendering.', [
         '%entity_id' => $media->id(),
       ]);
       return [];
@@ -203,7 +215,7 @@ public function process($text, $langcode) {
         $media = $this->entityRepository->loadEntityByUuid('media', $uuid);
         assert($media === NULL || $media instanceof MediaInterface);
         if (!$media) {
-          \Drupal::logger('media')->error('The media item with UUID "@uuid" does not exist.', ['@uuid' => $uuid]);
+          $this->loggerFactory->get('media')->error('The media item with UUID "@uuid" does not exist.', ['@uuid' => $uuid]);
         }
         else {
           $media = $this->entityRepository->getTranslationFromContext($media, $langcode);
@@ -212,7 +224,7 @@ public function process($text, $langcode) {
 
         $view_mode = $this->entityRepository->loadEntityByConfigTarget('entity_view_mode', "media.$view_mode_id");
         if (!$view_mode) {
-          \Drupal::logger('media')->error('The view mode "@view-mode-id" does not exist.', ['@view-mode-id' => $view_mode_id]);
+          $this->loggerFactory->get('media')->error('The view mode "@view-mode-id" does not exist.', ['@view-mode-id' => $view_mode_id]);
         }
 
         $build = $media && $view_mode
@@ -259,7 +271,7 @@ public function tips($long = FALSE) {
    *
    * @param array $build
    *   The render array to render in isolation
-   * @param \DOMNode &$node
+   * @param \DOMNode $node
    *   The DOM node to render into.
    * @param \Drupal\filter\FilterProcessResult $result
    *   The accumulated result of filter processing, updated with the metadata
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php
index 8abebaddcc..94aca492fb 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php
@@ -27,7 +27,7 @@ protected function setUp() {
 
     ConfigurableLanguage::createFromLangcode('pt-br')->save();
     // Reload the entity to ensure it is aware of the newly created language.
-    $this->embeddedEntity = $this->container->get('entity.manager')
+    $this->embeddedEntity = $this->container->get('entity_type.manager')
       ->getStorage('media')
       ->load($this->embeddedEntity->id());