Fix leftover missing self.server_name now that #18656 is merged

Author: MadLittleMods

synapse/http/request_metrics.py

@@ -239,7 +239,7 @@ def stop(self, time_sec: float, response_code: int, sent_bytes: int) -> None:
         response_timer.labels(
             code=response_code_str,
             **response_base_labels,
-            **{SERVER_NAME_LABEL: self.server_name},
+            **{SERVER_NAME_LABEL: self.our_server_name},
         ).observe(time_sec - self.start_ts)
 
         resource_usage = context.get_resource_usage()

synapse/util/ratelimitutils.py

@@ -287,7 +287,7 @@ async def _on_enter_with_tracing(self, request_id: object) -> None:
         if self.metrics_name:
             maybe_metrics_cm = queue_wait_timer.labels(
                 rate_limiter_name=self.metrics_name,
-                **{SERVER_NAME_LABEL: self.server_name},
+                **{SERVER_NAME_LABEL: self.our_server_name},
             ).time()
         with start_active_span("ratelimit wait"), maybe_metrics_cm:
             await self._on_enter(request_id)