From 1b048ff388c047a0741bd3a3d1a5677a788943e4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 29 Nov 2023 10:40:19 -0700
Subject: [PATCH] Remove HomeAssistantAccessLogger (#104173)

---
 .../components/emulated_hue/__init__.py       |  3 +--
 homeassistant/components/http/__init__.py     | 24 +------------------
 tests/components/http/test_init.py            | 23 +-----------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/homeassistant/components/emulated_hue/__init__.py b/homeassistant/components/emulated_hue/__init__.py
index a98d2c08a48..1ba93da716c 100644
--- a/homeassistant/components/emulated_hue/__init__.py
+++ b/homeassistant/components/emulated_hue/__init__.py
@@ -6,7 +6,6 @@ import logging
 from aiohttp import web
 import voluptuous as vol
 
-from homeassistant.components.http import HomeAssistantAccessLogger
 from homeassistant.components.network import async_get_source_ip
 from homeassistant.const import (
     CONF_ENTITIES,
@@ -101,7 +100,7 @@ async def start_emulated_hue_bridge(
         config.advertise_port or config.listen_port,
     )
 
-    runner = web.AppRunner(app, access_log_class=HomeAssistantAccessLogger)
+    runner = web.AppRunner(app)
     await runner.setup()
 
     site = web.TCPSite(runner, config.host_ip_addr, config.listen_port)
diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index 5a1d182e80c..3ccfa18ef12 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -16,7 +16,6 @@ from aiohttp.http_parser import RawRequestMessage
 from aiohttp.streams import StreamReader
 from aiohttp.typedefs import JSONDecoder, StrOrURL
 from aiohttp.web_exceptions import HTTPMovedPermanently, HTTPRedirection
-from aiohttp.web_log import AccessLogger
 from aiohttp.web_protocol import RequestHandler
 from aiohttp_fast_url_dispatcher import FastUrlDispatcher, attach_fast_url_dispatcher
 from aiohttp_zlib_ng import enable_zlib_ng
@@ -238,25 +237,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-class HomeAssistantAccessLogger(AccessLogger):
-    """Access logger for Home Assistant that does not log when disabled."""
-
-    def log(
-        self, request: web.BaseRequest, response: web.StreamResponse, time: float
-    ) -> None:
-        """Log the request.
-
-        The default implementation logs the request to the logger
-        with the INFO level and than throws it away if the logger
-        is not enabled for the INFO level. This implementation
-        does not log the request if the logger is not enabled for
-        the INFO level.
-        """
-        if not self.logger.isEnabledFor(logging.INFO):
-            return
-        super().log(request, response, time)
-
-
 class HomeAssistantRequest(web.Request):
     """Home Assistant request object."""
 
@@ -540,9 +520,7 @@ class HomeAssistantHTTP:
         # pylint: disable-next=protected-access
         self.app._router.freeze = lambda: None  # type: ignore[method-assign]
 
-        self.runner = web.AppRunner(
-            self.app, access_log_class=HomeAssistantAccessLogger
-        )
+        self.runner = web.AppRunner(self.app)
         await self.runner.setup()
 
         self.site = HomeAssistantTCPSite(
diff --git a/tests/components/http/test_init.py b/tests/components/http/test_init.py
index 5a5bffe6748..97e39811cd8 100644
--- a/tests/components/http/test_init.py
+++ b/tests/components/http/test_init.py
@@ -5,8 +5,7 @@ from http import HTTPStatus
 from ipaddress import ip_network
 import logging
 from pathlib import Path
-import time
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -21,7 +20,6 @@ from homeassistant.util import dt as dt_util
 from homeassistant.util.ssl import server_context_intermediate, server_context_modern
 
 from tests.common import async_fire_time_changed
-from tests.test_util.aiohttp import AiohttpClientMockResponse
 from tests.typing import ClientSessionGenerator
 
 
@@ -501,22 +499,3 @@ async def test_logging(
     response = await client.get("/api/states/logging.entity")
     assert response.status == HTTPStatus.OK
     assert "GET /api/states/logging.entity" not in caplog.text
-
-
-async def test_hass_access_logger_at_info_level(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test that logging happens at info level."""
-    test_logger = logging.getLogger("test.aiohttp.logger")
-    logger = http.HomeAssistantAccessLogger(test_logger)
-    mock_request = MagicMock()
-    response = AiohttpClientMockResponse(
-        "POST", "http://127.0.0.1", status=HTTPStatus.OK
-    )
-    setattr(response, "body_length", 42)
-    logger.log(mock_request, response, time.time())
-    assert "42" in caplog.text
-    caplog.clear()
-    test_logger.setLevel(logging.WARNING)
-    logger.log(mock_request, response, time.time())
-    assert "42" not in caplog.text