Address PR feedback

src/rock.py

@@ -195,7 +195,7 @@ def update_mysql_router_exporter_service(
         )
         self._container.add_layer(self._EXPORTER_SERVICE_NAME, layer, combine=True)
         # `self._container.replan()` does not stop services that have been disabled
-        # Explicitly use `stop()` instead
+        # Use `restart()` and `stop()` instead
         if enabled:
             self._container.restart(self._EXPORTER_SERVICE_NAME)
         else:

tests/integration/test_exporter.py

@@ -109,8 +109,7 @@ async def test_exporter_endpoint(ops_test: OpsTest) -> None:
     unit_address = await get_unit_address(ops_test, unit.name)
 
     try:
-        with requests.Session() as session:
-            session.get(f"http://{unit_address}:49152/metrics", stream=False)
+        requests.get(f"http://{unit_address}:49152/metrics", stream=False)
     except requests.exceptions.ConnectionError as e:
         assert "[Errno 111] Connection refused" in str(e), "❌ expected connection refused error"
     else:
@@ -135,15 +134,12 @@ async def test_exporter_endpoint(ops_test: OpsTest) -> None:
         wait=tenacity.wait_fixed(10),
     ):
         with attempt:
-            with requests.Session() as session:
-                response = session.get(f"http://{unit_address}:49152/metrics", stream=False)
-                assert (
-                    response.status_code == 200
-                ), "❌ cannot connect to metrics endpoint with relation with cos"
-                assert "mysqlrouter_route_health" in str(
-                    response.text
-                ), "❌ did not find expected metric in response"
-                response.close()
+            response = requests.get(f"http://{unit_address}:49152/metrics", stream=False)
+            response.raise_for_status()
+            assert (
+                "mysqlrouter_route_health" in response.text
+            ), "❌ did not find expected metric in response"
+            response.close()
 
     logger.info("Removing relation between mysqlrouter and grafana agent")
     await mysqlrouter_app.remove_relation(
@@ -157,8 +153,7 @@ async def test_exporter_endpoint(ops_test: OpsTest) -> None:
     ):
         with attempt:
             try:
-                with requests.Session() as session:
-                    response = requests.get(f"http://{unit_address}:49152/metrics", stream=False)
+                requests.get(f"http://{unit_address}:49152/metrics", stream=False)
             except requests.exceptions.ConnectionError as e:
                 assert "[Errno 111] Connection refused" in str(
                     e

tests/integration/test_exporter_with_tls.py

@@ -151,8 +151,7 @@ async def test_exporter_endpoint(ops_test: OpsTest) -> None:
     ):
         with attempt:
             try:
-                with requests.Session() as session:
-                    response = session.get(f"http://{unit_address}:49152/metrics", stream=False)
+                requests.get(f"http://{unit_address}:49152/metrics", stream=False)
             except requests.exceptions.ConnectionError as e:
                 assert "[Errno 111] Connection refused" in str(
                     e
@@ -178,15 +177,12 @@ async def test_exporter_endpoint(ops_test: OpsTest) -> None:
         wait=tenacity.wait_fixed(10),
     ):
         with attempt:
-            with requests.Session() as session:
-                response = session.get(f"http://{unit_address}:49152/metrics", stream=False)
-                assert (
-                    response.status_code == 200
-                ), "❌ cannot connect to metrics endpoint with relation with cos"
-                assert "mysqlrouter_route_health" in str(
-                    response.text
-                ), "❌ did not find expected metric in response"
-                response.close()
+            response = requests.get(f"http://{unit_address}:49152/metrics", stream=False)
+            response.raise_for_status()
+            assert (
+                "mysqlrouter_route_health" in response.text
+            ), "❌ did not find expected metric in response"
+            response.close()
 
     for attempt in tenacity.Retrying(
         reraise=True,
@@ -216,8 +212,7 @@ async def test_exporter_endpoint(ops_test: OpsTest) -> None:
     ):
         with attempt:
             try:
-                with requests.Session() as session:
-                    session.get(f"http://{unit_address}:49152/metrics", stream=False)
+                requests.get(f"http://{unit_address}:49152/metrics", stream=False)
             except requests.exceptions.ConnectionError as e:
                 assert "[Errno 111] Connection refused" in str(
                     e